[Mobies-commit] [commit] r3993 - in UDM/trunk: include src/UdmPython

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Tue Jan 24 11:39:31 2012
New Revision: 3993

Log:
Fix for broken compilers

Modified:
   UDM/trunk/include/UdmBase.h
   UDM/trunk/src/UdmPython/UdmPython.cpp

Modified: UDM/trunk/include/UdmBase.h
==============================================================================
--- UDM/trunk/include/UdmBase.h	Tue Jan 24 11:39:19 2012	(r3992)
+++ UDM/trunk/include/UdmBase.h	Tue Jan 24 11:39:31 2012	(r3993)
@@ -3361,7 +3361,7 @@
 	}
 
 	template<class CreateF>
-	void CreateNew(CreateF& f) {
+	void CreateNew_(CreateF& f) {
 		if(dn)
 			throw udm_exception("DataNetwork is already open"); 
 		dn = f(metaroot, pr);
@@ -3379,7 +3379,7 @@
 	}
 
 	template<class OpenF>
-	void OpenExisting(OpenF& f) {
+	void OpenExisting_(OpenF& f) {
 		if(dn)
 			throw udm_exception("DataNetwork is already open"); 
 		dn = f(metaroot, pr);

Modified: UDM/trunk/src/UdmPython/UdmPython.cpp
==============================================================================
--- UDM/trunk/src/UdmPython/UdmPython.cpp	Tue Jan 24 11:39:19 2012	(r3992)
+++ UDM/trunk/src/UdmPython/UdmPython.cpp	Tue Jan 24 11:39:31 2012	(r3993)
@@ -50,13 +50,13 @@
 	{
 		// OpenExisting calls AddRef
 		IUnknown* punk = object2IUnknown(systemname);
-
-		self.OpenExisting([&](const Udm::UdmDiagram &metaroot, Udm::UdmProject* pr) -> Udm::DataNetwork* {
-			std::auto_ptr<UdmGme::GmeDataNetwork> dn1(new UdmGme::GmeDataNetwork(metaroot, pr));
-			dn1->OpenExisting(punk, Udm::CHANGES_LOST_DEFAULT, true);
-			return dn1.release();
-		});
-		return;
+
+		self.OpenExisting_([&](const Udm::UdmDiagram &metaroot, Udm::UdmProject* pr) -> Udm::DataNetwork* {
+			std::auto_ptr<UdmGme::GmeDataNetwork> dn1(new UdmGme::GmeDataNetwork(metaroot, pr));
+			dn1->OpenExisting(punk, Udm::CHANGES_LOST_DEFAULT, true);
+			return dn1.release();
+		});
+		return;
 	}
 	throw runtime_error("Unrecognized type for systemname");
 }