[Mobies-commit] [commit] r3639 - UDM/trunk/src/Udm

[endre at redhat1.isis.vanderbilt.edu]

Author: endre
Date: Mon Feb 14 09:59:46 2011
New Revision: 3639

Log:
Really enclose IsDescendant type and specializations with PARADIGM_HAS_DESCENDANT_PAIRS macro guard

Modified:
   UDM/trunk/src/Udm/DiagramGen.cpp

Modified: UDM/trunk/src/Udm/DiagramGen.cpp
==============================================================================
--- UDM/trunk/src/Udm/DiagramGen.cpp	Mon Feb 14 09:57:21 2011	(r3638)
+++ UDM/trunk/src/Udm/DiagramGen.cpp	Mon Feb 14 09:59:46 2011	(r3639)
@@ -322,9 +322,7 @@
 		return;
 
 	out << boost::format("\
-#ifndef PARADIGM_HAS_DESCENDANT_PAIRS\n\
-#define PARADIGM_HAS_DESCENDANT_PAIRS\n\
-#endif // PARADIGM_HAS_DESCENDANT_PAIRS\n\
+#ifdef PARADIGM_HAS_DESCENDANT_PAIRS\n\
 \n\
 \tstruct _False_ { enum { value = 0 }; };\n\
 \tstruct _True_  { enum { value = 1 }; };\n\
@@ -336,6 +334,11 @@
 	for (vector<boost::format>::const_iterator i = is_descendant_pairs.begin(); i != is_descendant_pairs.end(); i++)
 		out << "\t" << *i << endl;
 
+	out << boost::format("\
+\n\
+#endif // PARADIGM_HAS_DESCENDANT_PAIRS\n\
+\n");
+
 	out << endl;
 }