Remove experimental c++ trait-detection

Author: cmaglie

src/MsgPack/Packer.h

@@ -365,10 +365,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

@@ -260,17 +260,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
@@ -279,16 +279,16 @@ namespace msgpack {
     void to_msgpack(MsgPack::Packer& packer) const { \
         packer.to_array(__VA_ARGS__);                \
     }                                                \
-    void from_msgpack(MsgPack::Unpacker& unpacker) { \
-        unpacker.from_array(__VA_ARGS__);            \
+    bool from_msgpack(MsgPack::Unpacker& unpacker) { \
+        return unpacker.from_array(__VA_ARGS__);     \
     }
 
 #define MSGPACK_DEFINE_MAP(...)                      \
     void to_msgpack(MsgPack::Packer& packer) const { \
         packer.to_map(__VA_ARGS__);                  \
     }                                                \
-    void from_msgpack(MsgPack::Unpacker& unpacker) { \
-        unpacker.from_map(__VA_ARGS__);              \
+    bool from_msgpack(MsgPack::Unpacker& unpacker) { \
+        return unpacker.from_map(__VA_ARGS__);       \
     }
 
 #define MSGPACK_BASE(base) (*const_cast<base*>(static_cast<base const*>(this)))

src/MsgPack/Unpacker.h

@@ -443,11 +443,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/decoder.h

@@ -79,8 +79,10 @@ class RpcDecoder {
         MsgPack::object::nil_t nil;
         if (unpacker.unpackable(nil)){  // No error
             if (!unpacker.deserialize(nil, result)) return false;
-        } else {                        // RPC returned an error
-            if (!unpacker.deserialize(error, nil)) return false;
+        } else {
+            // RPC returned an error
+            if (!error.from_msgpack(unpacker)) return false;
+            if (!unpacker.deserialize(nil)) return false;
         }
 
         reset_packet();

src/dispatcher.h

@@ -61,7 +61,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/wrapper.h

@@ -58,7 +58,7 @@ class RpcFunctionWrapper<std::function<R(Args...)>>: 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;
         }
 
@@ -67,13 +67,13 @@ class RpcFunctionWrapper<std::function<R(Args...)>>: 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;
         }