Added a typeName for std::function

Do not call eval on a function whose argument is not copy constructible, even though the argument is a reference. See ticket #65.

Author: highperformancecoder

classdesc.h

@@ -69,6 +69,8 @@ namespace std
 #include <unordered_set>
 
 #include <type_traits>
+#include <functional>
+
 namespace classdesc
 {
   using std::true_type;
@@ -454,7 +456,14 @@ namespace classdesc
   template <class F>
   typename enable_if<is_function<F>,string>::T
   inline typeName() {return "<function>";}
-  
+
+#if defined(__cplusplus) && __cplusplus>=201103L
+  template <class F> struct tn<std::function<F>>
+  {
+    static string name() {return "std::function<"+typeName<F>()+">";}
+  };
+#endif
+
   template <class T> struct tn<T*>
   {
     static std::string name()

function.h

@@ -496,12 +496,16 @@ namespace classdesc
     template <> struct Result<void>: public ResultBase
     {};
 
+    template <class T>
+    struct is_default_and_copy_constructible:
+      And<is_default_constructible<T>,is_copy_constructible<T>> {};
+    
     template <class Buffer, class F, class R=typename Return<F>::T,
               int N=Arity<F>::value> class CallOnBuffer;
 
     /// extract an argument from buffer \a b, and run functional f on it 
     template <class F, class A, class R, class B>
-    typename enable_if<is_default_constructible<A>, R>::T
+    typename enable_if<is_default_and_copy_constructible<A>, R>::T
     eval(F f, B& b)
     {
       A a{};
@@ -510,14 +514,14 @@ namespace classdesc
     }
 
     template <class F, class A, class R, class B>
-    typename enable_if<Not<is_default_constructible<A>>, R>::T
+    typename enable_if<Not<is_default_and_copy_constructible<A>>, R>::T
     eval(F f, B& b)
     {
       throw std::runtime_error("unable to unpack into "+typeName<A>());
     }
 
     template <class F, class A, class B>
-    typename enable_if<is_default_constructible<A>, void>::T
+    typename enable_if<is_default_and_copy_constructible<A>, void>::T
     evalVoid(F f, B& b)
     {
       A a{};
@@ -526,7 +530,7 @@ namespace classdesc
     }
 
     template <class F, class A, class B>
-    typename enable_if<Not<is_default_constructible<A>>, void>::T
+    typename enable_if<Not<is_default_and_copy_constructible<A>>, void>::T
     evalVoid(F f, B& b)
     {eval<F,A,void,B>(f,b);}
 
@@ -541,7 +545,7 @@ namespace classdesc
     public:
       CallOnBuffer(Buffer& buffer, F f): buffer(buffer), f(f) {}
       Result<R> operator()() {
-        auto ff=[&](A1& a){return CallOnBuffer<Buffer, CurryFirst<F>, R, N-1>
+        auto ff=[&](typename Arg<F,1>::T a){return CallOnBuffer<Buffer, CurryFirst<F>, R, N-1>
             (buffer, CurryFirst<F>(f,a))();};
         return std::move(eval<decltype(ff),A1,Result<R>,Buffer>(ff, buffer));
        }

pack_base.h

@@ -301,6 +301,8 @@ namespace classdesc
 
   typedef pack_t unpack_t;
 
+  template <> inline string typeName<pack_t>() {return "classdesc::pack_t";}
+  
 #ifdef XDR_PACK
   const int BUFCHUNK=1024;  
 
@@ -337,6 +339,7 @@ namespace classdesc
       std::swap(input,xdr_other->output);
     }
   };
+  template <> inline string typeName<xdr_pack>() {return "classdesc::xdr_pack";}
 #else
   typedef pack_t xdr_pack;
 #endif