Guard macros weren't guarding anything.

highperformancecoder · highperformancecoder · commit 656459c366d7 · 2024-12-02T17:47:03.000+11:00
diff --git a/classdesc.cc b/classdesc.cc
@@ -1073,7 +1073,7 @@ struct GuardMacro
     printf("\n#ifndef %s\n",macro.c_str());
     printf("#define %s\n",macro.c_str());
   }
-  ~GuardMacro() {printf("#endif\n");}
+  ~GuardMacro() {printf("\n#endif\n");}
 };
 
 string type_qualifier(const string& type)
@@ -1484,10 +1484,10 @@ int main(int argc, char* argv[])
           {
             /* 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);
+            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 */
               string n1;
diff --git a/pythonBuffer.h b/pythonBuffer.h
@@ -683,6 +683,7 @@ namespace classdesc
               attachRegistryObjects(result->list(),*r,".");
               return ref.release();
             }
+          default: break;
           }
         if (PyErr_Occurred())
           PyErr_Print();
diff --git a/test/00/baseClassTypeName.sh b/test/00/baseClassTypeName.sh
@@ -67,7 +67,6 @@ 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)
@@ -79,6 +78,8 @@ void type(classdesc::p_t& targ, const classdesc::string& desc)
 {
 }
 };
+
+#endif
 }
 #if defined(__GNUC__) && !defined(__ICC) && !defined(__clang__)
 #pragma GCC diagnostic pop
diff --git a/test/00/inheritedNested.sh b/test/00/inheritedNested.sh
@@ -67,7 +67,6 @@ 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)
@@ -79,6 +78,8 @@ void type(classdesc::p_t& targ, const classdesc::string& desc)
 {
 }
 };
+
+#endif
 }
 #if defined(__GNUC__) && !defined(__ICC) && !defined(__clang__)
 #pragma GCC diagnostic pop
diff --git a/test/00/qt.sh b/test/00/qt.sh
@@ -70,7 +70,6 @@ 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)
@@ -85,6 +84,8 @@ void type(classdesc::p_t& targ, const classdesc::string& desc)
 ::p_type<_CD_TYPE,class ::foo >(targ,desc+".mySlot2",&::foo::mySlot2);
 }
 };
+
+#endif
 }
 #if defined(__GNUC__) && !defined(__ICC) && !defined(__clang__)
 #pragma GCC diagnostic pop
diff --git a/test/00/t0015a.sh b/test/00/t0015a.sh
@@ -78,7 +78,6 @@ 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)
@@ -90,9 +89,9 @@ void type(classdesc::p_t& targ, const classdesc::string& desc)
 {
 }
 };
+#endif
 #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)
@@ -106,6 +105,7 @@ void type(classdesc::p_t& targ, const classdesc::string& desc)
 using namespace ::bar;
 }
 };
+#endif
 }
 #if defined(__GNUC__) && !defined(__ICC) && !defined(__clang__)
 #pragma GCC diagnostic pop
diff --git a/test/00/t0016a.sh b/test/00/t0016a.sh
@@ -65,7 +65,6 @@ 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)
@@ -77,6 +76,7 @@ void type(classdesc::p_t& targ, const classdesc::string& desc)
 {
 }
 };
+#endif
 }
 #if defined(__GNUC__) && !defined(__ICC) && !defined(__clang__)
 #pragma GCC diagnostic pop
diff --git a/test/00/t0019a.sh b/test/00/t0019a.sh
@@ -66,7 +66,6 @@ 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)
@@ -79,6 +78,8 @@ void type(classdesc::p_t& targ, const classdesc::string& desc)
 ::p_type<_CD_TYPE,class ::foo >(targ,desc+".b",&::foo::b);
 }
 };
+
+#endif
 }
 #if defined(__GNUC__) && !defined(__ICC) && !defined(__clang__)
 #pragma GCC diagnostic pop
diff --git a/test/00/t0020a.sh b/test/00/t0020a.sh
@@ -70,7 +70,6 @@ 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)
@@ -83,6 +82,8 @@ void type(classdesc::p_t& targ, const classdesc::string& desc)
 typedef typename ::x<T>::y y;
 }
 };
+
+#endif
 }
 #if defined(__GNUC__) && !defined(__ICC) && !defined(__clang__)
 #pragma GCC diagnostic pop
diff --git a/test/00/t0023a.sh b/test/00/t0023a.sh
@@ -65,7 +65,6 @@ namespace classdesc_access {
 
 #ifndef CLASSDESC_p___foo
 #define CLASSDESC_p___foo
-#endif
 template <>
 struct access_p< class ::foo* >
 {
@@ -84,6 +83,8 @@ void type(classdesc::p_t& targ, const classdesc::string& desc)
 {
 }
 };
+
+#endif
 }
 #if defined(__GNUC__) && !defined(__ICC) && !defined(__clang__)
 #pragma GCC diagnostic pop
diff --git a/test/00/t0061a.sh b/test/00/t0061a.sh
@@ -70,7 +70,6 @@ namespace classdesc_access {
 
 #ifndef CLASSDESC_p___foo_T_
 #define CLASSDESC_p___foo_T_
-#endif
 template < class T >  struct access_p< struct ::foo<T> > {
 template <class _CD_ARG_TYPE>
 void operator()(classdesc::p_t& targ, const classdesc::string& desc,_CD_ARG_TYPE& arg)
@@ -83,6 +82,8 @@ void type(classdesc::p_t& targ, const classdesc::string& desc)
 typedef typename ::foo<T>::bar bar;
 }
 };
+
+#endif
 }
 #if defined(__GNUC__) && !defined(__ICC) && !defined(__clang__)
 #pragma GCC diagnostic pop
diff --git a/test/00/t0065a.sh b/test/00/t0065a.sh
@@ -66,7 +66,6 @@ namespace classdesc_access {
 
 #ifndef CLASSDESC_p___foo
 #define CLASSDESC_p___foo
-#endif
 template <> struct access_p< struct ::foo > {
 template <class _CD_ARG_TYPE>
 void operator()(classdesc::p_t& targ, const classdesc::string& desc,_CD_ARG_TYPE& arg)
@@ -80,6 +79,8 @@ void type(classdesc::p_t& targ, const classdesc::string& desc)
 ::p<_CD_TYPE,bar >(targ,desc+"");
 }
 };
+
+#endif
 }
 #if defined(__GNUC__) && !defined(__ICC) && !defined(__clang__)
 #pragma GCC diagnostic pop
diff --git a/test/test_private.out b/test/test_private.out
@@ -13,7 +13,6 @@ 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)
@@ -27,9 +26,9 @@ void type(classdesc::p_t& targ, const classdesc::string& desc)
 {
 }
 };
+#endif
 #ifndef CLASSDESC_p___bar
 #define CLASSDESC_p___bar
-#endif
 template <> struct access_p< struct ::bar > {
 template <class _CD_ARG_TYPE>
 void operator()(classdesc::p_t& targ, const classdesc::string& desc,_CD_ARG_TYPE& arg)
@@ -41,9 +40,9 @@ void type(classdesc::p_t& targ, const classdesc::string& desc)
 {
 }
 };
+#endif
 #ifndef CLASSDESC_p_bamboo
 #define CLASSDESC_p_bamboo
-#endif
 template <> struct access_p<  bamboo > {
 template <class _CD_ARG_TYPE>
 void operator()(classdesc::p_t& targ, const classdesc::string& desc,_CD_ARG_TYPE& arg)
@@ -56,6 +55,7 @@ void type(classdesc::p_t& targ, const classdesc::string& desc)
 {
 }
 };
+#endif
 }
 #if defined(__GNUC__) && !defined(__ICC) && !defined(__clang__)
 #pragma GCC diagnostic pop
diff --git a/test/test_private.private.out b/test/test_private.private.out
@@ -13,7 +13,6 @@ 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)
@@ -25,9 +24,9 @@ void type(classdesc::p_t& targ, const classdesc::string& desc)
 {
 }
 };
+#endif
 #ifndef CLASSDESC_p___bar
 #define CLASSDESC_p___bar
-#endif
 template <> struct access_p< struct ::bar > {
 template <class _CD_ARG_TYPE>
 void operator()(classdesc::p_t& targ, const classdesc::string& desc,_CD_ARG_TYPE& arg)
@@ -39,9 +38,9 @@ void type(classdesc::p_t& targ, const classdesc::string& desc)
 {
 }
 };
+#endif
 #ifndef CLASSDESC_p_bamboo
 #define CLASSDESC_p_bamboo
-#endif
 template <> struct access_p<  bamboo > {
 template <class _CD_ARG_TYPE>
 void operator()(classdesc::p_t& targ, const classdesc::string& desc,_CD_ARG_TYPE& arg)
@@ -53,6 +52,7 @@ void type(classdesc::p_t& targ, const classdesc::string& desc)
 {
 }
 };
+#endif
 }
 #if defined(__GNUC__) && !defined(__ICC) && !defined(__clang__)
 #pragma GCC diagnostic pop

Original file line number	Diff line number	Diff line change
`@@ -683,6 +683,7 @@ namespace classdesc`
`683`	`683`	`attachRegistryObjects(result->list(),*r,".");`
`684`	`684`	`return ref.release();`
`685`	`685`	`}`
	`686`	`+ default: break;`
`686`	`687`	`}`
`687`	`688`	`if (PyErr_Occurred())`
`688`	`689`	`PyErr_Print();`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,6 @@ namespace classdesc_access {`
`67`	`67`
`68`	`68`	`#ifndef CLASSDESC_p___foo_N_`
`69`	`69`	`#define CLASSDESC_p___foo_N_`
`70`		`-#endif`
`71`	`70`	`template < class N > struct access_p< struct ::foo<N> > {`
`72`	`71`	`template <class _CD_ARG_TYPE>`
`73`	`72`	`void operator()(classdesc::p_t& targ, const classdesc::string& desc,_CD_ARG_TYPE& arg)`
`@@ -79,6 +78,8 @@ void type(classdesc::p_t& targ, const classdesc::string& desc)`
`79`	`78`	`{`
`80`	`79`	`}`
`81`	`80`	`};`
	`81`	`+`
	`82`	`+#endif`
`82`	`83`	`}`
`83`	`84`	`#if defined(__GNUC__) && !defined(__ICC) && !defined(__clang__)`
`84`	`85`	`#pragma GCC diagnostic pop`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,6 @@ using classdesc::p_type;`
`65`	`65`	`namespace classdesc_access {`
`66`	`66`	`#ifndef CLASSDESC_p___foo`
`67`	`67`	`#define CLASSDESC_p___foo`
`68`		`-#endif`
`69`	`68`	`template <> struct access_p< class ::foo > {`
`70`	`69`	`template <class _CD_ARG_TYPE>`
`71`	`70`	`void operator()(classdesc::p_t& targ, const classdesc::string& desc,_CD_ARG_TYPE& arg)`
`@@ -77,6 +76,7 @@ void type(classdesc::p_t& targ, const classdesc::string& desc)`
`77`	`76`	`{`
`78`	`77`	`}`
`79`	`78`	`};`
	`79`	`+#endif`
`80`	`80`	`}`
`81`	`81`	`#if defined(__GNUC__) && !defined(__ICC) && !defined(__clang__)`
`82`	`82`	`#pragma GCC diagnostic pop`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,6 @@ namespace classdesc_access {`
`65`	`65`
`66`	`66`	`#ifndef CLASSDESC_p___foo`
`67`	`67`	`#define CLASSDESC_p___foo`
`68`		`-#endif`
`69`	`68`	`template <>`
`70`	`69`	`struct access_p< class ::foo* >`
`71`	`70`	`{`
`@@ -84,6 +83,8 @@ void type(classdesc::p_t& targ, const classdesc::string& desc)`
`84`	`83`	`{`
`85`	`84`	`}`
`86`	`85`	`};`
	`86`	`+`
	`87`	`+#endif`
`87`	`88`	`}`
`88`	`89`	`#if defined(__GNUC__) && !defined(__ICC) && !defined(__clang__)`
`89`	`90`	`#pragma GCC diagnostic pop`