Merge branch 'return-restprocess-object-refactor' of github.com:highperformancecoder/classdesc into return-restprocess-object-refactor

Author: highperformancecoder

Makefile

@@ -5,8 +5,8 @@ CPLUSPLUS=g++
 # -I/usr/include/tirpc is needed for Fedora
 FLAGS=-g -I. -I/usr/include/tirpc
 
-CDHEADERS=multiArray object poly polyBase polyRESTProcess polyRESTProcessBase polyXMLBase RESTProcess_base signature stringKeyMap xml_pack_base xml_unpack_base
-DESCRIPTORS=dump pack json_pack random_init RESTProcess xml_pack typeName
+CDHEADERS=multiArray object poly polyBase polyRESTProcess polyRESTProcessBase polyXMLBase RESTProcess_base signature stringKeyMap xml_pack_base xml_unpack_base xml_common
+DESCRIPTORS=dump pack json_pack random_init RESTProcess xml_pack xsd_generate typeName
 CDFILES=$(foreach d,$(DESCRIPTORS),$(foreach h,$(CDHEADERS),$(h)-$(d).cd))
 
 ifdef GCOV
@@ -206,6 +206,9 @@ $(DESCRIPTORS:%=%-allCDs.h): Makefile createCDs.sh
 %-xml_pack.cd: %.h classdesc 
 	./classdesc  -nodef -onbase -respect_private -i $< xml_pack xml_unpack >$@
 
+%-xsd_generate.cd: %.h classdesc 
+	./classdesc  -nodef -onbase -respect_private -i $< xsd_generate >$@
+
 %-random_init.cd: %.h classdesc
 	./classdesc  -nodef -onbase -i $< random_init >$@
 

RESTProcess-allCDs.h

@@ -36,4 +36,7 @@
 #ifdef CLASSDESC_XML_UNPACK_BASE_H
 #include "xml_unpack_base-RESTProcess.cd"
 #endif
+#ifdef CLASSDESC_XML_COMMON_H
+#include "xml_common-RESTProcess.cd"
+#endif
 #endif

RESTProcessExample/RESTProcessExample.h

@@ -90,7 +90,7 @@ struct Bar: Foo
 {
   enum BarE {a, b};
   Bar(const Bar&)=delete;
-  int f;
+  int f=20;
   EnumFoo barfoo;
   std::vector<Foo> vFoo;
   std::map<std::string,Foo> mFoo;
@@ -101,7 +101,7 @@ struct Bar: Foo
   BarE barE() const {return a;}
   GlobE globE() const {return ga;}
   Bar() {}
-  Bar(int i): Foo(i), f(20), barfoo(eb), vFoo(3,1) {mFoo["foo"]=Foo(2);}
+  Bar(int i): Foo(i), barfoo(eb), vFoo(3,1) {mFoo["foo"]=Foo(2);}
 
   // overload triggers bug
   void rvalueRef(Foo&& f) {}
@@ -164,7 +164,7 @@ struct IPoly: public PolyRESTProcess<IPoly> {};
 
 struct Poly: public PolyRESTProcess<Poly, IPoly>
 {
-  int a;
+  int a=5;
 };
 
 // root type

RESTProcessExample/RESTProcessExpected.txt

@@ -1,4 +1,4 @@
-/root=>{"bar":{"a":0.1,"af":0.2000000029802322,"b":3,"barfoo":"eb","bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","f":20,"h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"mFoo":[{"first":"foo","second":{"a":0.1,"af":0.2000000029802322,"b":2,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vs":[" hello"," hello"]}}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vFoo":[{"a":0.1,"af":0.2000000029802322,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vs":[" hello"," hello"]},{"a":0.1,"af":0.2000000029802322,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vs":[" hello"," hello"]},{"a":0.1,"af":0.2000000029802322,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vs":[" hello"," hello"]}],"vs":[" hello"," hello"]},"bar1":{"barfoo":"ec","f":{"a":0.1,"af":0.2000000029802322,"b":2,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vs":[" hello"," hello"]},"fp":{"a":0,"af":0,"b":0,"bf":false,"bt":false,"c":"","c1":[],"ch":"\u0000","d":[0,0,0],"d1":[[0,0],[0,0],[0,0]],"ef":"ea","h":[],"l":[],"llex":[],"m":[],"m_rotation":0,"sef":{},"sm":{},"ss":[],"um":[],"vs":[]},"g":2,"vFoo":[{"a":0.1,"af":0.2000000029802322,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vs":[" hello"," hello"]},{"a":0.1,"af":0.2000000029802322,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vs":[" hello"," hello"]}]},"defaultless":{},"sbar":{"a":0,"af":0,"b":0,"barfoo":"ea","bf":false,"bt":false,"c":"","c1":[],"ch":"\u0000","d":[0,0,0],"d1":[[0,0],[0,0],[0,0]],"ef":"ea","f":0,"h":[],"l":[],"llex":[],"m":[],"mFoo":[],"m_rotation":0,"sef":{},"sm":{},"ss":[],"um":[],"vFoo":[],"vs":[]},"spoly":{"base___classdesc__PolyRESTProcessBase":{}}}
+/root=>{"bar":{"a":0.1,"af":0.2000000029802322,"b":3,"barfoo":"eb","bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","f":20,"h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"mFoo":[{"first":"foo","second":{"a":0.1,"af":0.2000000029802322,"b":2,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vs":[" hello"," hello"]}}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vFoo":[{"a":0.1,"af":0.2000000029802322,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vs":[" hello"," hello"]},{"a":0.1,"af":0.2000000029802322,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vs":[" hello"," hello"]},{"a":0.1,"af":0.2000000029802322,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vs":[" hello"," hello"]}],"vs":[" hello"," hello"]},"bar1":{"barfoo":"ec","f":{"a":0.1,"af":0.2000000029802322,"b":2,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vs":[" hello"," hello"]},"fp":{"a":0,"af":0,"b":0,"bf":false,"bt":false,"c":"","c1":[],"ch":"\u0000","d":[0,0,0],"d1":[[0,0],[0,0],[0,0]],"ef":"ea","h":[],"l":[],"llex":[],"m":[],"m_rotation":0,"sef":{},"sm":{},"ss":[],"um":[],"vs":[]},"g":2,"vFoo":[{"a":0.1,"af":0.2000000029802322,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vs":[" hello"," hello"]},{"a":0.1,"af":0.2000000029802322,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"m_rotation":0,"sef":"ea","sm":{},"ss":[],"um":[],"vs":[" hello"," hello"]}]},"defaultless":{},"sbar":{"a":0,"af":0,"b":0,"barfoo":"ea","bf":false,"bt":false,"c":"","c1":[],"ch":"\u0000","d":[0,0,0],"d1":[[0,0],[0,0],[0,0]],"ef":"ea","f":20,"h":[],"l":[],"llex":[],"m":[],"mFoo":[],"m_rotation":0,"sef":{},"sm":{},"ss":[],"um":[],"vFoo":[],"vs":[]},"spoly":{"base___classdesc__PolyRESTProcessBase":{}}}
 /root/bar/csi=>20
 /root/bar/csi=>Exception: attempt to alter a const variable
 /root/bar/si=>0

RESTProcessExample/example.py

@@ -57,9 +57,9 @@ def expectThrow(f):
 assert root.bar.c()=='hello world'
 
 assert root.bar.c1()==['\r','\r']
-assert root.bar.c1[0]()=='\r'
+assert root.bar.c1[0]=='\r'
 root.bar.c1[0]='x'
-assert root.bar.c1[0]()=='x'
+assert root.bar.c1[0]=='x'
 
 assert root.bar.ef()=='ea'
 assert root.bar.ef('eb')=='eb'
@@ -72,21 +72,21 @@ def expectThrow(f):
 
 assert root.bar.d()==[0,1,2]
 assert len(root.bar.d)==3
-assert root.bar.d[1]()==1
+assert root.bar.d[1]==1
 root.bar.d[1]=5
-assert root.bar.d[1]()==5
+assert root.bar.d[1]==5
 
 assert len(root.bar.d1)==2
 assert root.bar.d1[1]()==[3,4,5]
 root.bar.d1[1]=[6,7,8]
 assert root.bar.d1[1]()==[6,7,8]
 assert root.bar.d1()==[[0,1,2],[6,7,8]]
 root.bar.d1[1][2]=10
-assert root.bar.d1[1][2]()==10
+assert root.bar.d1[1][2]==10
 assert root.bar.h()==[2,2,2]
-assert root.bar.h[1]()==2
+assert root.bar.h[1]==2
 root.bar.h[1]=3
-assert root.bar.h[1]()==3
+assert root.bar.h[1]==3
 root.bar.h.insert(5)
 assert root.bar.h()==[2,3,2,5]
 root.bar.h.erase(1)
@@ -96,25 +96,25 @@ def expectThrow(f):
 assert root.bar.h._list()==[".@elem",".@elemNoThrow",".@erase",".@insert",".@size"]
 
 assert root.bar.l()==[2,2,2]
-assert root.bar.l[1]()==2
+assert root.bar.l[1]==2
 root.bar.l[1]=3
-assert root.bar.l[1]()==3
+assert root.bar.l[1]==3
 root.bar.l.insert(5)
 assert root.bar.l()==[2,3,2,5]
 assert root.bar.l([2,2,2,2])()==[2,2,2,2]
 
 assert root.bar.m()==[{"first":0,"second":5},{"first":3,"second":2}]
 assert len(root.bar.m)==2
 assert root.bar.m._signature()==[{"args":[],"ret":"std::map<int,int>"},{"args":["std::map<int,int>"],"ret":"std::map<int,int>"}]
-assert root.bar.m[3]()==2
+assert root.bar.m[3]==2
 root.bar.m[3]=5
-assert root.bar.m[3]()==5
+assert root.bar.m[3]==5
 
 root.bar.m.insert({"first":1,"second":2})
-assert root.bar.m[1]()==2
+assert root.bar.m[1]==2
 assert root.bar.m.contains(1)
 root.bar.m[10]=2
-assert root.bar.m[10]()==2
+assert root.bar.m[10]==2
 assert root.bar.m.contains(10)
 assert root.bar.m._type()=="std::map<int,int>"
 assert root.bar.m._list()==[".@elem",".@elemNoThrow",".@erase",".@insert",".@keys",".@size"]
@@ -129,14 +129,14 @@ def expectThrow(f):
 root.bar.um.insert({"first":1,"second":3})
 assert root.bar.um()==[{"first":1,"second":3}]
 root.bar.um[1]=5
-assert root.bar.um[1]()==5
+assert root.bar.um[1]==5
 
 assert root.bar.llex()==[["hello","hello"],["hello","hello"]]
 root.bar.llex[1]=["baa","baa","blacksheep"]
 assert root.bar.llex[1]()==["baa","baa","blacksheep"]
 assert root.bar.llex()==[["hello","hello"],["baa","baa","blacksheep"]]
 assert root.bar.llex._signature()==[{"args":[],"ret":"std::list<std::list<std::string>>"},{"args":["std::list<std::list<std::string>>"],"ret":"std::list<std::list<std::string>>"}]
-assert root.bar.llex[1][1]()=="baa"
+assert root.bar.llex[1][1]=="baa"
 
 # Should fail
 expectThrow(lambda: root.bar.iex())
@@ -161,9 +161,12 @@ def expectThrow(f):
 assert root.bar1.fooRef().b()==2
 assert root.bar1.f.name()=='Foo'
 
-assert root.bar1.vFoo[1]._properties()['b']==1
+assert root.bar1.vFoo[1]()['b']==1
+assert root.bar1.vFoo[1].b()==1
 expectThrow(lambda: root.bar1.vFoo[10])
 
+assert root.bar.mFoo['foo'].b()==2
+
 assert root.bar1.foo().b(3)==3
 assert root.bar1.foo().b()==2
 assert root.bar1.fooRef().b(3)==3
@@ -191,7 +194,7 @@ def expectThrow(f):
 assert root.bar.sm({"foo":1,"bar":2})._properties()=={"foo":1,"bar":2}
 assert root.bar.sm()=={"foo":1,"bar":2}
 assert root.bar.sm({"foo":1,"foobar":3})._properties()=={"foo":1,"foobar":3}
-assert root.bar.sm['foo']()==1
+assert root.bar.sm['foo']==1
 assert root.bar.sm.contains("foobar")
 root.bar.sm.erase("foobar")
 assert not root.bar.sm.contains("foobar")
@@ -217,3 +220,7 @@ def expectThrow(f):
 fb=FooBar1()
 assert foo.b()==2
 assert fb.f.b()==0
+
+# shared pointer support
+assert root.sbar.f()==20
+assert root.spoly.a()==5

RESTProcess_base.h

@@ -333,7 +333,7 @@ namespace classdesc
   }
 
   template <class E>
-  typename enable_if<is_enum<E>,void>::T
+  typename enable_if<And<is_enum<E>,Not<is_const<E>>>, void>::T
   convert(E& x, const REST_PROCESS_BUFFER& j)
   {
     string tmp; j>>tmp;
@@ -343,7 +343,7 @@ namespace classdesc
   template <class X>
   void convert(const X* x, const REST_PROCESS_BUFFER& j)
   {}
-
+  
   template <class F, int N> struct DefineFunctionArgTypes;
 
   /// REST processor registry 
@@ -393,7 +393,8 @@ namespace classdesc
           functs->overloadedFunctions.emplace_back(rp);
           i->second=functs;
         }
-      else {assert(false);/* should not be here */} 
+      else  // overloading something that is not a function
+        i->second.reset(rp);
     }
 
     inline RPPtr process(const std::string& query, const REST_PROCESS_BUFFER& jin);
@@ -884,7 +885,14 @@ namespace classdesc
   template <class T, class Enable=void> struct MappedType;
   template <class T> struct MappedType // for maps
   <T, typename enable_if<is_pair<typename T::value_type>, void>::T>
-  {using type=typename T::value_type::second_type;};
+  {
+    using type=typename transfer_const<
+      T,
+      typename T::value_type::second_type,
+      Or<is_const<T>, is_const<typename T::value_type>,
+         is_const<typename T::value_type::second_type>>::value
+      >::type;
+  };
 
   template <class T> struct MappedType // for sets
   <T, typename enable_if<Not<is_pair<typename T::value_type>>, void>::T>
@@ -904,7 +912,17 @@ namespace classdesc
 
     /// get element if a map
     template <class I>
-    typename enable_if<is_pair<typename std::iterator_traits<I>::value_type>, typename std::iterator_traits<I>::value_type::second_type&>::T
+    typename enable_if<
+      is_pair<typename std::iterator_traits<I>::value_type>,
+      // in C++20, std::iterator_traits<I>::value_type has any const
+      // attribute stripped off, hence this convoluted mouthful
+      typename transfer_const<
+        typename std::remove_reference<
+          typename std::iterator_traits<I>::reference
+          >::type,
+        typename std::iterator_traits<I>::value_type::second_type
+        >::type&
+      >::T
     elem_of(const I& i) const {return i->second;}
 
     /// get element if a set
@@ -1017,6 +1035,7 @@ namespace classdesc
       REST_PROCESS_BUFFER r;
       return ptr? (r<<*ptr): r;
     }
+    bool isObject() const override {return true;}
   };
 
   template <class T>
@@ -1041,6 +1060,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;}
   };
 
 
@@ -1282,8 +1307,8 @@ namespace classdesc
   template <class T>
   typename enable_if<
     And<
-      Not<is_floating_point<typename remove_reference<T>::type> >,
-      Not<is_container<T> >,
+      Not<is_floating_point<T>>,
+      Not<is_container<T>>,
       Not<And<is_reference<T>,is_const<typename remove_reference<T>::type>>>
       >, bool>::T
   partiallyMatchable(const REST_PROCESS_BUFFER& x);
@@ -1304,8 +1329,8 @@ namespace classdesc
   template <class T>
   typename enable_if<
     And<
-      Not<is_floating_point<typename remove_reference<T>::type> >,
-      Not<is_container<T> >,
+      Not<is_floating_point<T>>,
+      Not<is_container<T>>,
       Not<And<is_reference<T>,is_const<typename remove_reference<T>::type>>>
       >, bool>::T
   partiallyMatchable(const REST_PROCESS_BUFFER& x)
@@ -1429,7 +1454,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>

classdesc_epilogue.h

@@ -34,6 +34,10 @@ namespace
 #include "xml_pack_epilogue.h"
 #endif
 
+#ifdef CLASSDESC_XSD_GENERATE_BASE_H
+#include "xsd_generate-allCDs.h"
+#endif
+
 #ifdef CLASSDESC_DUMP_BASE_H
 #include "dump_epilogue.h"
 #endif