EcoLab required modifications.

Author: highperformancecoder

RESTProcess_base.h

@@ -142,8 +142,8 @@ namespace classdesc
       }
       return r;
     }
-    RESTProcess_t list() const;
-    std::string type() const {return "overloaded function";}
+    RESTProcess_t list() const override;
+    std::string type() const override {return "overloaded function";}
   };
 
   inline void convert(char& y, const string& x)
@@ -498,9 +498,9 @@ namespace classdesc
   RPPtr makeRESTProcessValueObject(T&& obj)
   {return std::make_shared<RESTProcessValueObject<typename std::remove_reference<T>::type>>(std::forward<T>(obj));}
   // specialization for string and string vector to allow
-   RPPtr makeRESTProcessValueObject(const char* s)
+  inline RPPtr makeRESTProcessValueObject(const char* s)
   {return std::make_shared<RESTProcessValueObject<std::string>>(s);}
-  RPPtr makeRESTProcessValueObject(const std::initializer_list<std::string>& init)
+  inline RPPtr makeRESTProcessValueObject(const std::initializer_list<std::string>& init)
   {return std::make_shared<RESTProcessValueObject<std::vector<std::string>>>(init);}
 
   /// class that represents the void, or null object
@@ -515,10 +515,10 @@ namespace classdesc
     bool isConst() const override {return true;}
   };
 
-  RPPtr RESTProcessBase::getElem(const REST_PROCESS_BUFFER&)
+  inline RPPtr RESTProcessBase::getElem(const REST_PROCESS_BUFFER&)
   {return std::make_shared<RESTProcessVoid>();}
 
-  RPPtr RESTProcessBase::keys() const
+  inline RPPtr RESTProcessBase::keys() const
   {return std::make_shared<RESTProcessVoid>();}
 
   template <class T> T* RESTProcessBase::getObject()

RESTProcess_epilogue.h

@@ -51,6 +51,20 @@ namespace classdesc_access
   struct access_RESTProcess<T, cd::void_t<typename std::iterator_traits<T>::value_type>>:
     public cd::NullDescriptor<cd::RESTProcess_t> {};
 
+#ifdef CLASSDESC_OBJECT_H
+  template <>
+  struct access_RESTProcess<cd::object>: public cd::NullDescriptor<cd::RESTProcess_t> {};
+
+  template <class T, class B>
+  struct access_RESTProcess<cd::Object<T,B>>
+  {
+    template <class U>
+    void operator()(cd::RESTProcess_t& repo, const std::string& d, U& a)
+    {
+      ::RESTProcess(repo,d, cd::base_cast<B>::cast(a));
+    }
+  };
+#endif
 }
 
 namespace classdesc
@@ -110,7 +124,7 @@ namespace classdesc
     return map;
   }
 
-  RESTProcess_t RESTProcessOverloadedFunction::list() const {return {};}
+  inline RESTProcess_t RESTProcessOverloadedFunction::list() const {return {};}
 
   template <class T>
   RESTProcess_t RESTProcessSequence<T>::list() const {
@@ -165,7 +179,7 @@ namespace classdesc
     repo.add(d, new RESTProcessObject<T>(obj));
   }
 
-  RPPtr RESTProcessOverloadedFunction::process(const string& remainder, const REST_PROCESS_BUFFER& arguments)
+  inline RPPtr RESTProcessOverloadedFunction::process(const string& remainder, const REST_PROCESS_BUFFER& arguments)
   {
     // sort function overloads by best match
     auto cmp=[&](RESTProcessFunctionBase*x, RESTProcessFunctionBase*y)

json_pack_epilogue.h

@@ -259,6 +259,32 @@ void type(classdesc::json_unpack_t& targ, const classdesc::string& desc)
 }
 };
 
+#ifdef CLASSDESC_OBJECT_H
+  template <>
+  struct access_json_pack<cd::object>: public cd::NullDescriptor<cd::json_pack_t> {};
+  template <>
+  struct access_json_unpack<cd::object>: public cd::NullDescriptor<cd::json_unpack_t> {};
+
+  template <class T, class B>
+  struct access_json_pack<cd::Object<T,B>>
+  {
+    template <class U>
+    void operator()(cd::json_pack_t& repo, const std::string& d, U& a)
+    {
+      ::json_pack(repo,d, cd::base_cast<B>::cast(a));
+    }
+  };
+
+  template <class T, class B>
+  struct access_json_unpack<cd::Object<T,B>>
+  {
+    template <class U>
+    void operator()(cd::json_unpack_t& repo, const std::string& d, U& a)
+    {
+      ::json_unpack(repo,d, cd::base_cast<B>::cast(a));
+    }
+  };
+#endif
 
 }  
 

object.h

@@ -6,8 +6,8 @@
   Open source licensed under the MIT license. See LICENSE for details.
 */
 
-#ifndef OBJECT_H
-#define OBJECT_H
+#ifndef CLASSDESC_OBJECT_H
+#define CLASSDESC_OBJECT_H
 #include "classdesc.h"
 #include "pack_base.h"
 
@@ -102,7 +102,7 @@ namespace classdesc
 
   template <> struct tn<object> {static string name() {return "object";}};
   template <class T, class B> struct tn<Object<T,B>>
-  {std:: string name() {return "Object<"+typeName<T>()+">"+typeName<B>+">";}};
+  {static std:: string name() {return "Object<"+typeName<T>()+">"+typeName<B>()+">";}};
 
 }
 
@@ -156,31 +156,6 @@ unpack(classdesc::unpack_t& b, const classdesc::string& d, const classdesc::shar
 }
 
 
-namespace classdesc_access
-{
-  namespace cd=classdesc;
-
-  template <> struct access_pack<classdesc::object>: public cd::NullDescriptor<cd::pack_t>{};
-  template <> struct access_unpack<classdesc::object>: public cd::NullDescriptor<cd::pack_t>{};
-
-  template <class T, class B> 
-  struct access_pack<classdesc::Object<T, B> >
-  {
-    template <class U>
-    void operator()(cd::pack_t& b, const cd::string& d, U& a) 
-    {pack(b,d,cd::base_cast<B>::cast(a));}
-  };
-
-  template <class T, class B> 
-  struct access_unpack<classdesc::Object<T, B> >
-  {
-    template <class U>
-    void operator()(cd::unpack_t& b, const cd::string& d, U& a) 
-    {unpack(b,d,cd::base_cast<B>::cast(a));}
-  };
-
-}
-
 #ifdef _CLASSDESC
 #pragma omit pack classdesc::object
 #pragma omit unpack classdesc::object

pack_epilogue.h

@@ -19,6 +19,29 @@ namespace classdesc_access
 {
   namespace cd=classdesc;
 
+#ifdef CLASSDESC_OBJECT_H
+    template <> struct access_pack<classdesc::object>: public cd::NullDescriptor<cd::pack_t>{};
+  template <> struct access_unpack<classdesc::object>: public cd::NullDescriptor<cd::pack_t>{};
+
+  template <class T, class B> 
+  struct access_pack<classdesc::Object<T, B> >
+  {
+    template <class U>
+    void operator()(cd::pack_t& b, const cd::string& d, U& a) 
+    {pack(b,d,cd::base_cast<B>::cast(a));}
+  };
+
+  template <class T, class B> 
+  struct access_unpack<classdesc::Object<T, B> >
+  {
+    template <class U>
+    void operator()(cd::unpack_t& b, const cd::string& d, U& a) 
+    {unpack(b,d,cd::base_cast<B>::cast(a));}
+  };
+
+
+#endif
+  
   // const arg versions
   template <class T>
   struct access_pack<const T>
@@ -153,6 +176,7 @@ namespace classdesc_access
       unpack(b,d,a.fmap);
     }
   };
+
 #endif
 
 }