Marshalling cleanup #246

NilFoundation · Jan 7, 2025 · 45613f2 · 45613f2
1 parent 973ed5e
commit 45613f2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 58 deletions.
diff --git a/crypto3/libs/marshalling/core/include/nil/marshalling/algorithms/pack.hpp b/crypto3/libs/marshalling/core/include/nil/marshalling/algorithms/pack.hpp
@@ -24,8 +24,8 @@
 // SOFTWARE.
 //---------------------------------------------------------------------------//
 
-#ifndef MARSHALLING_REPACK_NEW_HPP
-#define MARSHALLING_REPACK_NEW_HPP
+#ifndef MARSHALLING_PACK_HPP
+#define MARSHALLING_PACK_HPP
 
 #include <nil/marshalling/detail/repack_value.hpp>
 
@@ -287,4 +287,4 @@ namespace nil::crypto3 {
     }    // namespace marshalling
 }    // namespace nil
 
-#endif    // MARSHALLING_REPACK_NEW_HPP
+#endif    // MARSHALLING_PACK_HPP
diff --git a/crypto3/libs/marshalling/core/include/nil/marshalling/compile_control.hpp b/crypto3/libs/marshalling/core/include/nil/marshalling/compile_control.hpp
diff --git a/crypto3/libs/marshalling/core/include/nil/marshalling/types/detail/options_parser.hpp b/crypto3/libs/marshalling/core/include/nil/marshalling/types/detail/options_parser.hpp
@@ -28,7 +28,6 @@
 
 #include <tuple>
 #include <nil/marshalling/options.hpp>
-#include <nil/marshalling/compile_control.hpp>
 
 namespace nil::crypto3 {
     namespace marshalling {

diff --git a/crypto3/libs/marshalling/core/include/nil/marshalling/types/integral/basic_type.hpp b/crypto3/libs/marshalling/core/include/nil/marshalling/types/integral/basic_type.hpp
@@ -35,9 +35,11 @@ namespace nil::crypto3 {
         namespace types {
             namespace detail {
 
+                template<typename TFieldBase, typename T, typename Enable = void>
+                class basic_integral;
+
                 template<typename TFieldBase, typename T>
-                class basic_integral : public TFieldBase {
-                    static_assert(std::is_integral<T>::value, "T must be integral value");
+                class basic_integral<TFieldBase, T, std::enable_if_t<std::is_integral_v<T>>> : public TFieldBase {
 
                     using base_impl_type = TFieldBase;