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

Author: cmaglie

src/wrapper.h

@@ -9,10 +9,7 @@ using namespace RpcUtils::detail;
 #ifdef HANDLE_RPC_ERRORS
 #include <stdexcept>
 #endif
-
-
-template<typename F>
-class RpcFunctionWrapper;
+#include <functional>
 
 class IFunctionWrapper {
     public:
@@ -21,7 +18,7 @@ class IFunctionWrapper {
     };
 
 template<typename R, typename... Args>
-class RpcFunctionWrapper<std::function<R(Args...)>>: public IFunctionWrapper {
+class RpcFunctionWrapper: public IFunctionWrapper {
 public:
     RpcFunctionWrapper(std::function<R(Args...)> func) : _func(func) {}
 
@@ -102,9 +99,8 @@ class RpcFunctionWrapper<std::function<R(Args...)>>: public IFunctionWrapper {
 
 
 template<typename F>
-auto wrap(F&& f) -> RpcFunctionWrapper<typename arx::function_traits<typename std::decay<F>::type>::function_type> {
-    using Signature = typename arx::function_traits<typename std::decay<F>::type>::function_type;
-    return RpcFunctionWrapper<Signature>(std::forward<F>(f));
+auto wrap(F&& f) {
+    return RpcFunctionWrapper(std::function(std::forward<F>(f)));
 };
 
 #endif