Auto-detect RpcFunctionWrapper type using std::function guides (c++17)

Author: cmaglie

src/wrapper.h

@@ -20,18 +20,25 @@ using namespace RpcUtils::detail;
 #ifdef HANDLE_RPC_ERRORS
 #include <stdexcept>
 #endif
+#ifdef ARDUINO_ARCH_ZEPHYR
+#include <functional>
+#endif
 
 class IFunctionWrapper {
 public:
     virtual ~IFunctionWrapper() {}
     virtual bool operator()(MsgPack::Unpacker& unpacker, MsgPack::Packer& packer) = 0;
 };
 
+#ifdef ARDUINO_ARCH_ZEPHYR
+class RpcFunctionWrapper: public IFunctionWrapper {
+#else
 template<typename F>
 class RpcFunctionWrapper;
 
 template<typename R, typename... Args>
 class RpcFunctionWrapper<std::function<R(Args...)>>: public IFunctionWrapper {
+#endif
 public:
     RpcFunctionWrapper(std::function<R(Args...)> func) : _func(func) {}
 
@@ -110,9 +117,16 @@ class RpcFunctionWrapper<std::function<R(Args...)>>: public IFunctionWrapper {
     }
 };
 
+#ifdef ARDUINO_ARCH_ZEPHYR
+template<typename F>
+auto wrap(F&& f) {
+    return new RpcFunctionWrapper(std::function(std::forward<F>(f)));
+};
+#else
 template<typename F, typename Signature = typename arx::function_traits<typename std::decay<F>::type>::function_type>
 auto wrap(F&& f) -> RpcFunctionWrapper<Signature>* {
     return new RpcFunctionWrapper<Signature>(std::forward<F>(f));
 };
+#endif
 
 #endif