[Mobies-commit] [commit] r3781 - in UDM/trunk: include src/UdmBase src/UdmDom src/UdmGme

ksmyth at redhat1.isis.vanderbilt.edu ksmyth at redhat1.isis.vanderbilt.edu
Wed Jul 6 10:28:06 CDT 2011


Author: ksmyth
Date: Wed Jul  6 10:28:06 2011
New Revision: 3781

Log:
Revert const change on __getdn() from r3773 because it breaks backwards compatibility

Modified:
   UDM/trunk/include/UdmBase.h
   UDM/trunk/include/UdmStatic.h
   UDM/trunk/src/UdmBase/UdmStatic.cpp
   UDM/trunk/src/UdmDom/UdmDom.cpp
   UDM/trunk/src/UdmGme/GmeObject.h
   UDM/trunk/src/UdmGme/UdmGme.cpp

Modified: UDM/trunk/include/UdmBase.h
==============================================================================
--- UDM/trunk/include/UdmBase.h	Wed Jul  6 10:03:48 2011	(r3780)
+++ UDM/trunk/include/UdmBase.h	Wed Jul  6 10:28:06 2011	(r3781)
@@ -296,7 +296,7 @@
 	public:
 		virtual ObjectImpl *clone() = 0;
 		virtual void release() = 0;
-		virtual DataNetwork *__getdn() const = 0;
+		virtual DataNetwork *__getdn() = 0;
 
 	// --- type
 
@@ -597,7 +597,7 @@
 		// in Object::Object(...) we assume this refererence counting behaviour
 		virtual ObjectImpl *clone() { return this; }
 		virtual void release() { } 
-		virtual DataNetwork *__getdn() const { throw e; }
+		virtual DataNetwork *__getdn() { throw e; }
 		virtual string toString() const { return "NullObject"; }
 
 		virtual const ::Uml::Class &type() const { throw e; }

Modified: UDM/trunk/include/UdmStatic.h
==============================================================================
--- UDM/trunk/include/UdmStatic.h	Wed Jul  6 10:03:48 2011	(r3780)
+++ UDM/trunk/include/UdmStatic.h	Wed Jul  6 10:28:06 2011	(r3781)
@@ -238,7 +238,7 @@
 
 		ObjectImpl *clone();
 		void release();
-		Udm::DataNetwork *__getdn() const;
+		Udm::DataNetwork *__getdn();
 		const ::Uml::Class &m_type;
 		bool m_type_is_safetype;
 	

Modified: UDM/trunk/src/UdmBase/UdmStatic.cpp
==============================================================================
--- UDM/trunk/src/UdmBase/UdmStatic.cpp	Wed Jul  6 10:03:48 2011	(r3780)
+++ UDM/trunk/src/UdmBase/UdmStatic.cpp	Wed Jul  6 10:28:06 2011	(r3781)
@@ -394,7 +394,7 @@
 	}
 
 
-	Udm::DataNetwork * StaticObject::__getdn() const
+	Udm::DataNetwork * StaticObject::__getdn() 
 	{ 
 #ifdef _DEBUG
 		if (!mydn)

Modified: UDM/trunk/src/UdmDom/UdmDom.cpp
==============================================================================
--- UDM/trunk/src/UdmDom/UdmDom.cpp	Wed Jul  6 10:03:48 2011	(r3780)
+++ UDM/trunk/src/UdmDom/UdmDom.cpp	Wed Jul  6 10:28:06 2011	(r3781)
@@ -691,7 +691,7 @@
 			return !isSubtype();
 		}
 
-		Udm::DataNetwork *__getdn() const
+		Udm::DataNetwork *__getdn() 
 		{
 			return const_cast<Udm::DataNetwork*>(mydn);
 		}//eo __getdn();

Modified: UDM/trunk/src/UdmGme/GmeObject.h
==============================================================================
--- UDM/trunk/src/UdmGme/GmeObject.h	Wed Jul  6 10:03:48 2011	(r3780)
+++ UDM/trunk/src/UdmGme/GmeObject.h	Wed Jul  6 10:28:06 2011	(r3781)
@@ -79,7 +79,7 @@
 
 		virtual ObjectImpl *clone();
 		virtual void release();
-		virtual Udm::DataNetwork *__getdn() const;
+		virtual Udm::DataNetwork *__getdn();
 
 	// --- lookup
 

Modified: UDM/trunk/src/UdmGme/UdmGme.cpp
==============================================================================
--- UDM/trunk/src/UdmGme/UdmGme.cpp	Wed Jul  6 10:03:48 2011	(r3780)
+++ UDM/trunk/src/UdmGme/UdmGme.cpp	Wed Jul  6 10:28:06 2011	(r3781)
@@ -2804,7 +2804,7 @@
 	
 
 
-	Udm::DataNetwork * GmeObject::__getdn() const
+	Udm::DataNetwork * GmeObject::__getdn()
 	{ 
 		if (mydn) return const_cast<Udm::DataNetwork*>(mydn);
 		throw udm_exception("Data Network is NULL in constructor! GmeObject without a data network ?!");


More information about the Mobies-commit mailing list