[Mobies-commit] [commit] r3698 - in GReAT/trunk: Libraries/Engine Tools/CodeGenerator/CodeGenerator

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Fri Apr 29 17:32:18 2011
New Revision: 3698

Log:
assert instead of ASSERT

Modified:
   GReAT/trunk/Libraries/Engine/Effector.cpp
   GReAT/trunk/Libraries/Engine/GroupEffector.cpp
   GReAT/trunk/Tools/CodeGenerator/CodeGenerator/GroupEffector.cpp

Modified: GReAT/trunk/Libraries/Engine/Effector.cpp
==============================================================================
--- GReAT/trunk/Libraries/Engine/Effector.cpp	Fri Apr 29 16:14:42 2011	(r3697)
+++ GReAT/trunk/Libraries/Engine/Effector.cpp	Fri Apr 29 17:32:18 2011	(r3698)
@@ -159,7 +159,7 @@
 		const GR::ObjectWrapper& dstCO = clink.dst_end();
 		const GR::ObjectWrapper& srcCO = clink.src_end();
 
-		ASSERT((string)dstCO.type().name()==(string)srcCO.type().name());
+		assert((string)dstCO.type().name()==(string)srcCO.type().name());
 
 		//1-2-04
 		//Bug found here, consider the issue that the composition maybe "0"

Modified: GReAT/trunk/Libraries/Engine/GroupEffector.cpp
==============================================================================
--- GReAT/trunk/Libraries/Engine/GroupEffector.cpp	Fri Apr 29 16:14:42 2011	(r3697)
+++ GReAT/trunk/Libraries/Engine/GroupEffector.cpp	Fri Apr 29 17:32:18 2011	(r3698)
@@ -213,7 +213,7 @@
 		const GR::ObjectWrapper& dstCO = clink.dst_end();
 		const GR::ObjectWrapper& srcCO = clink.src_end();
 
-		ASSERT((string)dstCO.type().name()==(string)srcCO.type().name());
+		assert((string)dstCO.type().name()==(string)srcCO.type().name());
 
 		map<GR::ObjectWrapper, list<Udm::Object> >::iterator dpos = boundObjs.find(dstCO);
 		map<GR::ObjectWrapper, list<Udm::Object> >::iterator spos = boundObjs.find(srcCO);

Modified: GReAT/trunk/Tools/CodeGenerator/CodeGenerator/GroupEffector.cpp
==============================================================================
--- GReAT/trunk/Tools/CodeGenerator/CodeGenerator/GroupEffector.cpp	Fri Apr 29 16:14:42 2011	(r3697)
+++ GReAT/trunk/Tools/CodeGenerator/CodeGenerator/GroupEffector.cpp	Fri Apr 29 17:32:18 2011	(r3698)
@@ -666,7 +666,7 @@
 	srcLink = *(srcLinks.begin());
 	
 	set<GR::ObjectLink> dstLinks = assocCls.dst();
-	ASSERT(!dstLinks.empty());
+	assert(!dstLinks.empty());
 	for(set<GR::ObjectLink>::iterator dlinks_it=dstLinks.begin();dlinks_it!=dstLinks.end();++dlinks_it)
 	{
 		if((string)((*dlinks_it).name())=="Dst")