Remove experimental c++ trait-detection

Author: cmaglie

src/MsgPack/Packer.h

@@ -360,10 +360,10 @@ namespace msgpack {
 
         // ---------- CUSTOM format ----------
 
-        template <typename C>
-        auto pack(const C& c) -> typename std::enable_if<has_to_msgpack<C, Packer&>::value>::type {
-            c.to_msgpack(*this);
-        }
+        // template <typename C>
+        // auto pack(const C& c) -> typename std::enable_if<has_to_msgpack<C, Packer&>::value>::type {
+        //     c.to_msgpack(*this);
+        // }
 
         // ---------- Array/Map Size format ----------
 

src/MsgPack/Types.h

@@ -257,17 +257,17 @@ namespace msgpack {
         MAP4 = 0x0F,  // same as FIXMAP
     };
 
-    template <typename ClassType, typename ArgType>
-    using has_to_msgpack_impl = typename std::enable_if<
-        std::is_same<decltype(&ClassType::to_msgpack), void (ClassType::*)(ArgType) const>::value>::type;
-    template <typename ClassType, typename ArgType>
-    using has_to_msgpack = arx::is_detected<has_to_msgpack_impl, ClassType, ArgType>;
+    // template <typename ClassType, typename ArgType>
+    // using has_to_msgpack_impl = typename std::enable_if<
+    //     std::is_same<decltype(&ClassType::to_msgpack), void (ClassType::*)(ArgType) const>::value>::type;
+    // template <typename ClassType, typename ArgType>
+    // using has_to_msgpack = arx::is_detected<has_to_msgpack_impl, ClassType, ArgType>;
 
-    template <typename ClassType, typename ArgType>
-    using has_from_msgpack_impl = typename std::enable_if<
-        std::is_same<decltype(&ClassType::from_msgpack), void (ClassType::*)(ArgType)>::value>::type;
-    template <typename ClassType, typename ArgType>
-    using has_from_msgpack = arx::is_detected<has_from_msgpack_impl, ClassType, ArgType>;
+    // template <typename ClassType, typename ArgType>
+    // using has_from_msgpack_impl = typename std::enable_if<
+    //     std::is_same<decltype(&ClassType::from_msgpack), void (ClassType::*)(ArgType)>::value>::type;
+    // template <typename ClassType, typename ArgType>
+    // using has_from_msgpack = arx::is_detected<has_from_msgpack_impl, ClassType, ArgType>;
 
 }  // namespace msgpack
 }  // namespace arduino

src/MsgPack/Unpacker.h

@@ -438,11 +438,11 @@ namespace msgpack {
 
         // ---------- CUSTOM format ----------
 
-        template <typename C>
-        auto unpack(C& c) -> typename std::enable_if<has_from_msgpack<C, Unpacker&>::value, bool>::type {
-            c.from_msgpack(*this);
-            return b_decode_success;
-        }
+        // template <typename C>
+        // auto unpack(C& c) -> typename std::enable_if<has_from_msgpack<C, Unpacker&>::value, bool>::type {
+        //     c.from_msgpack(*this);
+        //     return b_decode_success;
+        // }
 
         // ---------- Array/Map Size format ----------
 

src/dispatcher.h

@@ -52,7 +52,7 @@ class RpcFunctionDispatcher {
 
         // handler not found
         MsgPack::object::nil_t nil;
-        packer.serialize(RpcError(FUNCTION_NOT_FOUND_ERR, name), nil);
+        RpcError(FUNCTION_NOT_FOUND_ERR, name).to_msgpack(packer);
         return false;
     }
 

src/error.h

@@ -21,7 +21,12 @@ struct RpcError {
     RpcError(int c, const MsgPack::str_t& tb)
         : code(c), traceback(tb) {}
 
-    MSGPACK_DEFINE(code, traceback); // -> [code, traceback]
+    void to_msgpack(MsgPack::Packer& packer) const {
+        packer.to_array(code, traceback);
+    }
+    void from_msgpack(MsgPack::Unpacker& unpacker) {
+        unpacker.from_array(code, traceback);
+    }
 };
 
 #endif

src/wrapper.h

@@ -37,7 +37,7 @@ class RpcFunctionWrapper: public IFunctionWrapper {
         // First check the parameters size
         if (!unpacker.isArray()){
             RpcError error(MALFORMED_CALL_ERR, "Unserializable parameters array");
-            packer.serialize(error, nil);
+            error.to_msgpack(packer);
             return false;
         }
 
@@ -46,13 +46,13 @@ class RpcFunctionWrapper: public IFunctionWrapper {
         unpacker.deserialize(param_size);
         if (param_size.size() < sizeof...(Args)){
             RpcError error(MALFORMED_CALL_ERR, "Missing call parameters (WARNING: Default param resolution is not implemented)");
-            packer.serialize(error, nil);
+            error.to_msgpack(packer);
             return false;
         }
 
         if (param_size.size() > sizeof...(Args)){
             RpcError error(MALFORMED_CALL_ERR, "Too many parameters");
-            packer.serialize(error, nil);
+            error.to_msgpack(packer);
             return false;
         }