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

Author: highperformancecoder

classdesc.cc

@@ -1061,6 +1061,21 @@ class PrintNameSpace
   ~PrintNameSpace() {if (print) printf("}\n");}
 };
 
+// add a guard macro around code generated by this scope
+struct GuardMacro
+{
+  GuardMacro(string macro)
+  {
+    // replace all non-legal identifier characters with '_'.
+    for (unsigned i=0; i<macro.length(); ++i)
+      if (!isalnum(macro[i]))
+        macro[i]='_';
+    printf("\n#ifndef %s\n",macro.c_str());
+    printf("#define %s\n",macro.c_str());
+  }
+  ~GuardMacro() {printf("#endif\n");}
+};
+
 string type_qualifier(const string& type)
 {
   if (leadeq(type,"class")) return "class";
@@ -1466,10 +1481,12 @@ int main(int argc, char* argv[])
           }
 
         for (size_t i=0; i<actions.size(); i++)
-          {	  /* check if type has a #pragma associated */
+          {
+            /* check if type has a #pragma associated */
             bool is_treenode, is_graphnode;
             {
               string n=without_type_qualifier(actions[i].type);
+              GuardMacro guardMacro(string("CLASSDESC_")+action[k]+"_"+n);
 
               /* strip out template arguments, collapse multiple spaces, 
                  remove trailing space */

test/00/baseClassTypeName.sh

@@ -64,6 +64,10 @@ void p_type(p_t&,const string&,M);
 }
 using classdesc::p_type;
 namespace classdesc_access {
+
+#ifndef CLASSDESC_p___foo_N_
+#define CLASSDESC_p___foo_N_
+#endif
 template < class N >  struct access_p< struct ::foo<N> > {
 template <class _CD_ARG_TYPE>
 void operator()(classdesc::p_t& targ, const classdesc::string& desc,_CD_ARG_TYPE& arg)

test/00/inheritedNested.sh

@@ -64,6 +64,10 @@ void p_type(p_t&,const string&,M);
 }
 using classdesc::p_type;
 namespace classdesc_access {
+
+#ifndef CLASSDESC_p___FlowCounter
+#define CLASSDESC_p___FlowCounter
+#endif
 template <> struct access_p< struct ::FlowCounter > {
 template <class _CD_ARG_TYPE>
 void operator()(classdesc::p_t& targ, const classdesc::string& desc,_CD_ARG_TYPE& arg)

test/00/qt.sh

@@ -67,6 +67,10 @@ void p_type(p_t&,const string&,M);
 }
 using classdesc::p_type;
 namespace classdesc_access {
+
+#ifndef CLASSDESC_p___foo
+#define CLASSDESC_p___foo
+#endif
 template <> struct access_p< class ::foo > {
 template <class _CD_ARG_TYPE>
 void operator()(classdesc::p_t& targ, const classdesc::string& desc,_CD_ARG_TYPE& arg)

test/00/t0015a.sh

@@ -64,7 +64,6 @@ if test $? -ne 0; then fail; fi
 
 cat >testout1 <<EOF
 #include "classdesc.h"
-
 #if defined(__GNUC__) && !defined(__ICC) && !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-function"
@@ -77,6 +76,9 @@ void p_type(p_t&,const string&,M);
 }
 using classdesc::p_type;
 namespace classdesc_access {
+#ifndef CLASSDESC_p___foo
+#define CLASSDESC_p___foo
+#endif
 template <> struct access_p< class ::foo > {
 template <class _CD_ARG_TYPE>
 void operator()(classdesc::p_t& targ, const classdesc::string& desc,_CD_ARG_TYPE& arg)
@@ -88,6 +90,9 @@ void type(classdesc::p_t& targ, const classdesc::string& desc)
 {
 }
 };
+#ifndef CLASSDESC_p___bar__foo
+#define CLASSDESC_p___bar__foo
+#endif
 template <> struct access_p< class ::bar::foo > {
 template <class _CD_ARG_TYPE>
 void operator()(classdesc::p_t& targ, const classdesc::string& desc,_CD_ARG_TYPE& arg)

test/00/t0016a.sh

@@ -63,6 +63,9 @@ void p_type(p_t&,const string&,M);
 }
 using classdesc::p_type;
 namespace classdesc_access {
+#ifndef CLASSDESC_p___foo
+#define CLASSDESC_p___foo
+#endif
 template <> struct access_p< class ::foo > {
 template <class _CD_ARG_TYPE>
 void operator()(classdesc::p_t& targ, const classdesc::string& desc,_CD_ARG_TYPE& arg)

test/00/t0019a.sh

@@ -63,6 +63,10 @@ void p_type(p_t&,const string&,M);
 }
 using classdesc::p_type;
 namespace classdesc_access {
+
+#ifndef CLASSDESC_p___foo
+#define CLASSDESC_p___foo
+#endif
 template <> struct access_p< class ::foo > {
 template <class _CD_ARG_TYPE>
 void operator()(classdesc::p_t& targ, const classdesc::string& desc,_CD_ARG_TYPE& arg)

test/00/t0020a.sh

@@ -67,6 +67,10 @@ void p_type(p_t&,const string&,M);
 }
 using classdesc::p_type;
 namespace classdesc_access {
+
+#ifndef CLASSDESC_p___x_T_
+#define CLASSDESC_p___x_T_
+#endif
 template < class T >  struct access_p< struct ::x<T> > {
 template <class _CD_ARG_TYPE>
 void operator()(classdesc::p_t& targ, const classdesc::string& desc,_CD_ARG_TYPE& arg)
@@ -118,6 +122,10 @@ void p_type(p_t&,const string&,M);
 }
 using classdesc::p_type;
 namespace classdesc_access {
+
+#ifndef CLASSDESC_p___x_T_
+#define CLASSDESC_p___x_T_
+#endif
 }
 #if defined(__GNUC__) && !defined(__ICC) && !defined(__clang__)
 #pragma GCC diagnostic pop
@@ -158,6 +166,10 @@ void p_type(p_t&,const string&,M);
 }
 using classdesc::p_type;
 namespace classdesc_access {
+
+#ifndef CLASSDESC_p___x_T_
+#define CLASSDESC_p___x_T_
+#endif
 }
 #if defined(__GNUC__) && !defined(__ICC) && !defined(__clang__)
 #pragma GCC diagnostic pop

test/00/t0021a.sh

@@ -67,6 +67,10 @@ void p_type(p_t&,const string&,M);
 }
 using classdesc::p_type;
 namespace classdesc_access {
+
+#ifndef CLASSDESC_p___member_entry__void_____
+#define CLASSDESC_p___member_entry__void_____
+#endif
 }
 #if defined(__GNUC__) && !defined(__ICC) && !defined(__clang__)
 #pragma GCC diagnostic pop

test/00/t0023a.sh

@@ -62,6 +62,10 @@ void p_type(p_t&,const string&,M);
 }
 using classdesc::p_type;
 namespace classdesc_access {
+
+#ifndef CLASSDESC_p___foo
+#define CLASSDESC_p___foo
+#endif
 template <>
 struct access_p< class ::foo* >
 {