[Mobies-commit] [commit] r4272 - UDM/trunk/include

[endre at redhat3.isis.vanderbilt.edu]

Author: endre
Date: Sat Mar  8 02:21:14 2014
New Revision: 4272

Log:
UmlExt.h merge

Modified:
   UDM/trunk/include/UmlExt.h

Modified: UDM/trunk/include/UmlExt.h
==============================================================================
--- UDM/trunk/include/UmlExt.h	Sat Mar  8 02:21:10 2014	(r4271)
+++ UDM/trunk/include/UmlExt.h	Sat Mar  8 02:21:14 2014	(r4272)
@@ -184,8 +184,11 @@
 	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);
+    
+    // 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);
     
     //finds the only suitable AssociationRole to reach 'target_class' or 'assoc_cls' from c for the association with which has the name 'rolename' on C's side
     //if target_aclass is provided than peer_type is ignored, and only those assoc. roles are considered which are in an assoc. cls. based assoc.