[Mobies-commit] [commit] r4267 - in UDM/trunk: include src/UdmBase

[ksmyth at redhat3.isis.vanderbilt.edu]

Author: ksmyth
Date: Thu Mar  6 10:51:34 2014
New Revision: 4267

Log:
Fix backwards compat

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

Modified: UDM/trunk/include/UmlExt.h
==============================================================================
--- UDM/trunk/include/UmlExt.h	Thu Mar  6 10:51:23 2014	(r4266)
+++ UDM/trunk/include/UmlExt.h	Thu Mar  6 10:51:34 2014	(r4267)
@@ -184,9 +184,12 @@
 	UDM_DLL set<Attribute> AncestorAttributes(const Class &c);
 
 // find the single way a class can be contained by another, return NULL none or if multiple roles are found
-// addtionally, names of the child and parent roles can be provided to constraint the possible compositions.
-	UDM_DLL Composition matchChildToParent(Class c, Class p, const char * crole = NULL, const char * prole = NULL);
-
+	UDM_DLL Composition matchChildToParent(Class c, Class p);
+
+	// find the single way a class can be contained by another, return NULL none or if multiple roles are found
+	// addtionally, names of the child and parent roles can be provided to constraint the possible compositions.
+	UDM_DLL Composition matchChildToParent(Class c, Class p, const char * crole, const char * prole = NULL);
+
     // returns true if derived = base
 	UDM_DLL bool IsDerivedFrom(const Class &derived, const Class &base);
 	UDM_DLL bool IsAssocClass(const Class &cl);

Modified: UDM/trunk/src/UdmBase/UmlExt.cpp
==============================================================================
--- UDM/trunk/src/UdmBase/UmlExt.cpp	Thu Mar  6 10:51:23 2014	(r4266)
+++ UDM/trunk/src/UdmBase/UmlExt.cpp	Thu Mar  6 10:51:34 2014	(r4267)
@@ -565,6 +565,11 @@
 		return attributes;
 	}
 
+	UDM_DLL Composition matchChildToParent(Class c, Class p)
+	{
+		return matchChildToParent(c, p, NULL);
+	}
+
 	UDM_DLL Composition matchChildToParent(Class c, Class p, const char * crole, const char * prole)
 	{
 		Composition comp;