Merge branch 'master' into return-restprocess-object-refactor

Author: highperformancecoder

RESTProcess_base.h

@@ -1017,6 +1017,7 @@ namespace classdesc
       REST_PROCESS_BUFFER r;
       return ptr? (r<<*ptr): r;
     }
+    bool isObject() const override {return true;}
   };
 
   template <class T>
@@ -1041,6 +1042,12 @@ namespace classdesc
       auto p=ptr.lock();
       return p? getClassdescObjectImpl(*p): nullptr;
     }
+    REST_PROCESS_BUFFER asBuffer() const override {
+      REST_PROCESS_BUFFER r;
+      auto p=ptr.lock();
+      return p? (r<<*p): r;
+    }
+    bool isObject() const override {return true;}
   };
 
 
@@ -1429,7 +1436,7 @@ namespace classdesc
         Not<is_void<U>>
         >,RESTProcess_t>::T
     slist() const {
-      typename remove_reference<U>::type x{};
+      typename remove_const<typename remove_reference<U>::type>::type x;
       return RESTProcessObject<U>(x).list();
     }
     // for now, we cannot extract the lists of a non-default constructible return type

RESTProcess_epilogue.h

@@ -370,7 +370,7 @@ namespace classdesc
     if (ptr)
       return rProcess(*ptr, remainder, arguments);
     else
-      return {};
+      return std::make_shared<RESTProcessVoid>();
   }
 
   template <class E>
@@ -389,7 +389,7 @@ namespace classdesc
     if (auto p=ptr.lock())
       return rProcess(*p, remainder, arguments);
     else
-      return {};
+      return std::make_shared<RESTProcessVoid>();
   }
 
   inline RPPtr RESTProcess_t::process(const std::string& query, const REST_PROCESS_BUFFER& jin)

classdesc.cc

@@ -184,6 +184,25 @@ struct type_defined_t: hash_map<string,int>
 
 std::map<std::string, std::vector<std::string> > enum_keys;
 
+// insert a typename keyword on types with :: qualification
+string insertTypename(string type)
+{
+  // replace whitespace characters with space
+  for (size_t i=0; i<type.size(); ++i)
+    if (isspace(type[i]))
+      type[i]=' ';
+  if (type.find("::")==string::npos || type.find("typename ")!=string::npos)
+    return type; // nothing needs to be done
+  
+  type=trimWS(type);
+  static const int constSize=strlen("const ");
+  if (type.find("const ")==0)
+    // insert typename between const and type
+    return "const typename "+type.substr(constSize);
+  else
+    return "typename "+type;
+}
+
 // overloaded member database
 struct MemberSig
 {
@@ -193,16 +212,14 @@ struct MemberSig
   MemberSig(string d, string r, string a, string p, string n, Type t):
     declName(d), returnType(r), argList(a), prefix(p), name(n), type(t) {}
   string declare() {
-    // If qualified type, the typename qualifier required
-    string rType=returnType.find("::")!=string::npos && returnType.find("typename ")==string::npos? "typename "+returnType: returnType;
     switch (type)
       {
       case none:
-        return rType+"("+prefix+"*"+declName+")("+argList+")=&"+prefix+name+";";
+        return insertTypename(returnType)+"("+prefix+"*"+declName+")("+argList+")=&"+prefix+name+";";
       case is_const:
-        return rType+"("+prefix+"*"+declName+")("+argList+") const=&"+prefix+name+";";
+        return insertTypename(returnType)+"("+prefix+"*"+declName+")("+argList+") const=&"+prefix+name+";";
       case is_static:
-        return rType+"(*"+declName+")("+argList+")=&"+prefix+name+";";
+        return insertTypename(returnType)+"(*"+declName+")("+argList+")=&"+prefix+name+";";
       case is_constructor:
         return "void (*"+declName+")("+argList+")=0;";
       default: assert(false); return ""; // should never be executed, - statement to silence warning

classdesc.h

@@ -1063,6 +1063,10 @@ namespace classdesc
     bool operator!() const {return !val;}  
   };                                               
 
+  template <class T> struct is_excluded: public false_type {};
+  template <class T> struct is_excluded<Exclude<T> >: public true_type {};
+  
+  
   /// @}
 
   template <class T>

object.h

@@ -16,11 +16,11 @@
 namespace classdesc
 {
   struct object;
-  typedef std::vector<shared_ptr<object> > Factory;
-  inline Factory& factory()
+  typedef std::vector<shared_ptr<object> > ObjectFactory;
+  inline ObjectFactory& factory()
   {
     // ensure factory is initialised on first use
-    static Factory f;
+    static ObjectFactory f;
     return f;
   }
 

pack_base.h

@@ -477,7 +477,13 @@ namespace classdesc
   /// for use in metaprogramming support. Indicate that a given type
   /// is supported explicitly
   template <class T> struct pack_supported: 
-    public Or<is_fundamental<T>,is_container<T> > {};
+    public Or<
+    Or<
+      is_fundamental<T>,
+      is_container<T>
+      >,
+    is_excluded<T>
+    > {};
 
 #ifndef THROW_PTR_EXCEPTION
   template <class T>
@@ -755,6 +761,9 @@ namespace classdesc
     a=x;
   }
 
+  template <class T> void pack(pack_t&, const string&, const Exclude<T>&) {}
+  template <class T> void unpack(pack_t&, const string&, const Exclude<T>&) {}
+  
 }
 
 #include "use_mbr_pointers.h"