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

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Fri Nov 18 11:22:45 2011
New Revision: 3954

Log:
<: is a digraph, use spaces in generated code for gcc compat

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

Modified: UDM/trunk/src/Udm/ClassGen.cpp
==============================================================================
--- UDM/trunk/src/Udm/ClassGen.cpp	Fri Nov 18 11:02:17 2011	(r3953)
+++ UDM/trunk/src/Udm/ClassGen.cpp	Fri Nov 18 11:22:45 2011	(r3954)
@@ -889,7 +889,7 @@
 			meth_defs.push_back( boost::format("::Udm::ParentAttr< %1%> parent() const { return ::Udm::ParentAttr< %1%>(impl, ::Udm::NULLPARENTROLE); }") % UmlClassCPPName(ans_class) );
 		} else {
 			// Udm::ParentAttr<Udm::Object> parent() const { return Udm::ParentAttr<Udm::Object>(impl, Udm::NULLPARENTROLE); }
-			meth_defs.push_back( boost::format("::Udm::ParentAttr<::Udm::Object> parent() const { return ::Udm::ParentAttr<::Udm::Object>(impl, ::Udm::NULLPARENTROLE); }") );
+			meth_defs.push_back( boost::format("::Udm::ParentAttr< ::Udm::Object> parent() const { return ::Udm::ParentAttr< ::Udm::Object>(impl, ::Udm::NULLPARENTROLE); }") );
 
 			for(set< ::Uml::Class>::iterator ccc = ans.begin(); ccc != ans.end(); ccc++) 
 			{
@@ -945,7 +945,7 @@
 
 				::Uml::AssociationRole orp_helper = the_other.rp_helper();
 				if (orp_helper) {
-					typedefs.push_back( boost::format("typedef std::pair< %1%, std::vector<::Udm::Object> > %2%_chain_t") % tclass_cpp_name % rel_name );
+					typedefs.push_back( boost::format("typedef std::pair< %1%, std::vector< ::Udm::Object> > %2%_chain_t") % tclass_cpp_name % rel_name );
 					meth_defs.push_back( boost::format("::Udm::AssocEndChainAttr< %1%, %2%_chain_t > %2%_chain() const { return ::Udm::AssocEndChainAttr< %1%, %2%_chain_t >(impl, meta_%2%_end_); }") % tclass_cpp_name % rel_name );
 
 					string orp_helper_name = ::Uml::MakeRoleName(orp_helper);