[GME-commit] GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep Any.cpp,1.11,1.12 AspectRep.cpp,1.12,1.13 Broker.cpp,1.7,1.8 ConnJoint.cpp,1.10,1.11 ConnectionRep.cpp,1.8,1.9 Dumper.cpp,1.27,1.28 FCO.cpp,1.11,1.12 FolderRep.cpp,1.9,1.10 ModelRep.cpp,1.15,1.16 ReferenceRep.cpp,1.11,1.12 RootFolder.cpp,1.3,1.4 SetRep.cpp,1.6,1.7 Sheet.cpp,1.9,1.10

[gme-commit at list.isis.vanderbilt.edu]

Update of /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep
In directory braindrain:/tmp/cvs-serv19193/Paradigms/MetaGME/MetaInterpreter2004/Rep

Modified Files:
	Any.cpp AspectRep.cpp Broker.cpp ConnJoint.cpp 
	ConnectionRep.cpp Dumper.cpp FCO.cpp FolderRep.cpp 
	ModelRep.cpp ReferenceRep.cpp RootFolder.cpp SetRep.cpp 
	Sheet.cpp 
Log Message:
Checkin for VC7.1 upgrade


CVS User: zolmol

Index: Any.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/Any.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Any.cpp	30 Jul 2004 00:10:23 -0000	1.11
--- Any.cpp	26 Jan 2005 17:31:06 -0000	1.12
***************
*** 69,73 ****
  	// try to find one among the equivalent classes which is in the root folder
  	std::set< BON::FCO >::const_iterator it = m_equivs.begin();
! 	for ( ; !m_isInRootFolder && it != m_equivs.end(); ++it)
  	{
  		if ( *it == m_ptr) continue;
--- 69,74 ----
  	// try to find one among the equivalent classes which is in the root folder
  	std::set< BON::FCO >::const_iterator it = m_equivs.begin();
! 	std::set< BON::FCO >::const_iterator en = m_equivs.end();
! 	for ( ; !m_isInRootFolder && it != en; ++it)
  	{
  		if ( *it == m_ptr) continue;
***************
*** 262,266 ****
  {
  	ConstraintRepPtrList_ConstIterator it = list.begin();
! 	for( ; it != list.end(); ++it)
  		addFinalConstraint( *it);
  }
--- 263,268 ----
  {
  	ConstraintRepPtrList_ConstIterator it = list.begin();
! 	ConstraintRepPtrList_ConstIterator en = list.end();
! 	for( ; it != en; ++it)
  		addFinalConstraint( *it);
  }
***************
*** 276,280 ****
  
  	ConstraintRepPtrList_ConstIterator c_i = m_finalConstraintList.begin();
! 	for( ; c_i != m_finalConstraintList.end(); ++c_i)
  	{
  		mmm += ( *c_i)->doDump();
--- 278,283 ----
  
  	ConstraintRepPtrList_ConstIterator c_i = m_finalConstraintList.begin();
! 	ConstraintRepPtrList_ConstIterator c_e = m_finalConstraintList.end();
! 	for( ; c_i != c_e; ++c_i)
  	{
  		mmm += ( *c_i)->doDump();

Index: AspectRep.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/AspectRep.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** AspectRep.cpp	19 Aug 2004 18:29:52 -0000	1.12
--- AspectRep.cpp	26 Jan 2005 17:31:06 -0000	1.13
***************
*** 221,226 ****
  {
  	std::vector<RoleRep>::const_iterator it = m_roleFinalList.begin();
  	bool found = false;
! 	while ( it != m_roleFinalList.end() && !found)
  	{
  		if ( a_role.getFCOPtr() == it->getFCOPtr() &&
--- 221,227 ----
  {
  	std::vector<RoleRep>::const_iterator it = m_roleFinalList.begin();
+ 	std::vector<RoleRep>::const_iterator en = m_roleFinalList.end();
  	bool found = false;
! 	while ( it != en && !found)
  	{
  		if ( a_role.getFCOPtr() == it->getFCOPtr() &&
***************
*** 263,267 ****
  
  	std::vector<FCO*>::iterator init_it = m_fcoInitialList.begin();
! 	for( ; init_it != m_fcoInitialList.end(); ++init_it)
  	{
  		FCO* fco_ptr = *init_it;
--- 264,269 ----
  
  	std::vector<FCO*>::iterator init_it = m_fcoInitialList.begin();
! 	std::vector<FCO*>::iterator init_en = m_fcoInitialList.end();
! 	for( ; init_it != init_en; ++init_it)
  	{
  		FCO* fco_ptr = *init_it;
***************
*** 279,283 ****
  	// a task similar to ModelRep::inherit needs to be done
  	std::vector< RoleRep>::iterator r_init_it = m_roleInitialList.begin();
! 	for( ; r_init_it != m_roleInitialList.end(); ++r_init_it)
  	{
  		FCO* fco_ptr = r_init_it->getFCOPtr();
--- 281,286 ----
  	// a task similar to ModelRep::inherit needs to be done
  	std::vector< RoleRep>::iterator r_init_it = m_roleInitialList.begin();
! 	std::vector< RoleRep>::iterator r_init_en = m_roleInitialList.end();
! 	for( ; r_init_it != r_init_en; ++r_init_it)
  	{
  		FCO* fco_ptr = r_init_it->getFCOPtr();
***************
*** 321,325 ****
  	PartCompare partCompare;
  	ModelPartsMap_Iterator it = m_partsMap.begin();
! 	for( ; it != m_partsMap.end(); ++it)
  	{
  		PartRepSeries &p = it->second;
--- 324,329 ----
  	PartCompare partCompare;
  	ModelPartsMap_Iterator it = m_partsMap.begin();
! 	ModelPartsMap_Iterator en = m_partsMap.end();
! 	for( ; it != en; ++it)
  	{
  		PartRepSeries &p = it->second;

Index: Broker.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/Broker.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Broker.cpp	16 Jul 2004 22:39:07 -0000	1.7
--- Broker.cpp	26 Jan 2005 17:31:06 -0000	1.8
***************
*** 102,106 ****
  	std::set<BON::RegistryNode> children = reg_node->getChildren();
  	std::set<BON::RegistryNode>::iterator c_it = children.begin();
! 	for(; c_it != children.end(); ++c_it)
  		initFromRegistry( obj, folder, *c_it);
  }
--- 102,107 ----
  	std::set<BON::RegistryNode> children = reg_node->getChildren();
  	std::set<BON::RegistryNode>::iterator c_it = children.begin();
! 	std::set<BON::RegistryNode>::iterator c_en = children.end();
! 	for(; c_it != c_en; ++c_it)
  		initFromRegistry( obj, folder, *c_it);
  }
***************
*** 114,118 ****
  
  	MetaRefDB_Iterator it = m_metaRefDB.begin();
! 	for( ; it != m_metaRefDB.end(); ++it)
  	{
  		MetaRefNode node = *it;
--- 115,120 ----
  
  	MetaRefDB_Iterator it = m_metaRefDB.begin();
! 	MetaRefDB_Iterator en = m_metaRefDB.end();
! 	for( ; it != en; ++it)
  	{
  		MetaRefNode node = *it;

Index: ConnJoint.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/ConnJoint.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ConnJoint.cpp	5 Nov 2004 21:25:08 -0000	1.10
--- ConnJoint.cpp	26 Jan 2005 17:31:06 -0000	1.11
***************
*** 135,139 ****
  { 
  	RoleRep::RoleRepSeries_ConstIterator r_it = new_role_series.begin();
! 	for( ; r_it != new_role_series.end(); ++r_it)
  		addTargetItem( i, model, *r_it);
  }
--- 135,140 ----
  { 
  	RoleRep::RoleRepSeries_ConstIterator r_it = new_role_series.begin();
! 	RoleRep::RoleRepSeries_ConstIterator r_en = new_role_series.end();
! 	for( ; r_it != r_en; ++r_it)
  		addTargetItem( i, model, *r_it);
  }
***************
*** 155,164 ****
  	std::vector<ReferenceRep*> inner_modelreferences = mod_ptr->getInnerModelReferencesFinal();
  	std::vector<ReferenceRep*>::iterator model_ref_it = inner_modelreferences.begin();
! 	for( ; model_ref_it != inner_modelreferences.end(); ++model_ref_it)
  	{
  		std::string m_r_n = (*model_ref_it)->getName();//t
  		std::vector<const ModelRep *> models_ref_refers = (*model_ref_it)->getModelRefVector(); // all models the reference refers to
  		std::vector<const ModelRep *>::iterator ref_model_it = models_ref_refers.begin();
! 		for( ; ref_model_it != models_ref_refers.end(); ++ref_model_it)
  		{
  			std::string r_m_n = (*ref_model_it)->getName();
--- 156,167 ----
  	std::vector<ReferenceRep*> inner_modelreferences = mod_ptr->getInnerModelReferencesFinal();
  	std::vector<ReferenceRep*>::iterator model_ref_it = inner_modelreferences.begin();
! 	std::vector<ReferenceRep*>::iterator model_ref_en = inner_modelreferences.end();
! 	for( ; model_ref_it != model_ref_en; ++model_ref_it)
  	{
  		std::string m_r_n = (*model_ref_it)->getName();//t
  		std::vector<const ModelRep *> models_ref_refers = (*model_ref_it)->getModelRefVector(); // all models the reference refers to
  		std::vector<const ModelRep *>::iterator ref_model_it = models_ref_refers.begin();
! 		std::vector<const ModelRep *>::iterator ref_model_en = models_ref_refers.end();
! 		for( ; ref_model_it != ref_model_en; ++ref_model_it)
  		{
  			std::string r_m_n = (*ref_model_it)->getName();
***************
*** 207,211 ****
  
  					std::vector<const ModelRep*>::iterator sub_mod_it = inner_models.begin();
! 					for(; sub_mod_it != inner_models.end(); ++sub_mod_it)
  					{
  						const ModelRep * sub_model = *sub_mod_it;
--- 210,215 ----
  
  					std::vector<const ModelRep*>::iterator sub_mod_it = inner_models.begin();
! 					std::vector<const ModelRep*>::iterator sub_mod_en = inner_models.end();
! 					for(; sub_mod_it != sub_mod_en; ++sub_mod_it)
  					{
  						const ModelRep * sub_model = *sub_mod_it;
***************
*** 215,219 ****
  						bool has_some = sub_model->getFinalRoles( fco, roles_in_sub_model);
  						RoleRep::RoleRepSeries_ConstIterator r_it = roles_in_sub_model.begin();
! 						for( ; has_some && r_it != roles_in_sub_model.end(); ++r_it) // if (!roles_in_sub_model.empty())
  						{
  							RoleRep sub_role = *r_it;	//TOF("    pe sub_role: " + sub_role.getSmartRoleName() + " in " + sub_model->getName());
--- 219,224 ----
  						bool has_some = sub_model->getFinalRoles( fco, roles_in_sub_model);
  						RoleRep::RoleRepSeries_ConstIterator r_it = roles_in_sub_model.begin();
! 						RoleRep::RoleRepSeries_ConstIterator r_en = roles_in_sub_model.end();
! 						for( ; has_some && r_it != r_en; ++r_it) // if (!roles_in_sub_model.empty())
  						{
  							RoleRep sub_role = *r_it;	//TOF("    pe sub_role: " + sub_role.getSmartRoleName() + " in " + sub_model->getName());
***************
*** 227,231 ****
  									bool has_some_subm = mod_ptr->getFinalRoles( sub_model, sub_model_roles_in_model ); // if the model contains sub_model with some roles
  									RoleRep::RoleRepSeries_ConstIterator r_it_sm = sub_model_roles_in_model.begin();
! 									for( ; has_some_subm && r_it_sm != sub_model_roles_in_model.end(); ++r_it_sm )
  									{
  										std::string desc_sub_model_role_name = r_it_sm->getSmartRoleName();
--- 232,237 ----
  									bool has_some_subm = mod_ptr->getFinalRoles( sub_model, sub_model_roles_in_model ); // if the model contains sub_model with some roles
  									RoleRep::RoleRepSeries_ConstIterator r_it_sm = sub_model_roles_in_model.begin();
! 									RoleRep::RoleRepSeries_ConstIterator r_en_sm = sub_model_roles_in_model.end();
! 									for( ; has_some_subm && r_it_sm != r_en_sm; ++r_it_sm )
  									{
  										std::string desc_sub_model_role_name = r_it_sm->getSmartRoleName();
***************
*** 236,240 ****
  									const FCO::ReferenceRepList &ref_list = sub_model->getTransitiveReferencesToMe(); //if you allow conns for transitive references //references may point to submodel
  									FCO::ReferenceRepList_ConstIterator ref_it = ref_list.begin();
! 									for( ; ref_it != ref_list.end(); ++ref_it)
  									{
  										if( !(*ref_it)->isAbstract() && (*ref_it)->amIPartOfFinal( mod_ptr) ) // if model may contain the reference
--- 242,247 ----
  									const FCO::ReferenceRepList &ref_list = sub_model->getTransitiveReferencesToMe(); //if you allow conns for transitive references //references may point to submodel
  									FCO::ReferenceRepList_ConstIterator ref_it = ref_list.begin();
! 									FCO::ReferenceRepList_ConstIterator ref_en = ref_list.end();
! 									for( ; ref_it != ref_en; ++ref_it)
  									{
  										if( !(*ref_it)->isAbstract() && (*ref_it)->amIPartOfFinal( mod_ptr) ) // if model may contain the reference
***************
*** 243,247 ****
  											bool ref_has_roles = mod_ptr->getFinalRoles( *ref_it, sub_ref_roles_in_model ); // if the model contains reference with some roles
  											RoleRep::RoleRepSeries_ConstIterator r_it_ref = sub_ref_roles_in_model.begin();
! 											for( ; ref_has_roles && r_it_ref != sub_ref_roles_in_model.end(); ++r_it_ref )
  											{
  												std::string desc_sub_ref_role_name = r_it_ref->getSmartRoleName();
--- 250,255 ----
  											bool ref_has_roles = mod_ptr->getFinalRoles( *ref_it, sub_ref_roles_in_model ); // if the model contains reference with some roles
  											RoleRep::RoleRepSeries_ConstIterator r_it_ref = sub_ref_roles_in_model.begin();
! 											RoleRep::RoleRepSeries_ConstIterator r_en_ref = sub_ref_roles_in_model.end();
! 											for( ; ref_has_roles && r_it_ref != r_en_ref; ++r_it_ref )
  											{
  												std::string desc_sub_ref_role_name = r_it_ref->getSmartRoleName();
***************
*** 303,312 ****
  
  	FCO::ModelRepPtrList_ConstIterator mod_it = model_list.begin();
  	// for all models i am part of
! 	for( ; mod_it != model_list.end(); ++mod_it )
  	{
  		ModelRep * mod_ptr = *mod_it;
  		PointerItemSeries_Iterator item_it = m_oper1TargetMap[ mod_ptr].begin();
! 		for( ; item_it != this->m_oper1TargetMap[mod_ptr].end(); ++item_it)
  		{
  			if ( std::find( src_dumper_list.begin(), src_dumper_list.end(), *item_it) == 
--- 311,322 ----
  
  	FCO::ModelRepPtrList_ConstIterator mod_it = model_list.begin();
+ 	FCO::ModelRepPtrList_ConstIterator mod_en = model_list.end();
  	// for all models i am part of
! 	for( ; mod_it != mod_en; ++mod_it )
  	{
  		ModelRep * mod_ptr = *mod_it;
  		PointerItemSeries_Iterator item_it = m_oper1TargetMap[ mod_ptr].begin();
! 		PointerItemSeries_Iterator item_en = m_oper1TargetMap[ mod_ptr].end();
! 		for( ; item_it != item_en; ++item_it)
  		{
  			if ( std::find( src_dumper_list.begin(), src_dumper_list.end(), *item_it) == 
***************
*** 318,322 ****
  		
  		item_it = m_oper2TargetMap[ mod_ptr].begin();
! 		for( ; item_it != this->m_oper2TargetMap[mod_ptr].end(); ++item_it)
  		{
  			if ( std::find( dst_dumper_list.begin(), dst_dumper_list.end(), *item_it) ==
--- 328,333 ----
  		
  		item_it = m_oper2TargetMap[ mod_ptr].begin();
! 		item_en = m_oper2TargetMap[ mod_ptr].end();
! 		for( ; item_it != item_en; ++item_it)
  		{
  			if ( std::find( dst_dumper_list.begin(), dst_dumper_list.end(), *item_it) ==
***************
*** 339,343 ****
  
  	PointerItemSeries_Iterator item_it = src_dumper_list.begin();
! 	for( ; item_it != src_dumper_list.end(); ++item_it)
  		mmm_src += indStr() + "<pointeritem desc = \"" + item_it->name() + "\"></pointeritem>\n";
  
--- 350,355 ----
  
  	PointerItemSeries_Iterator item_it = src_dumper_list.begin();
! 	PointerItemSeries_Iterator item_en = src_dumper_list.end();
! 	for( ; item_it != item_en; ++item_it)
  		mmm_src += indStr() + "<pointeritem desc = \"" + item_it->name() + "\"></pointeritem>\n";
  
***************
*** 348,352 ****
  
  	item_it = dst_dumper_list.begin();
! 	for( ; item_it != dst_dumper_list.end(); ++item_it)
  		mmm_dst += indStr() + "<pointeritem desc = \"" + item_it->name() + "\"></pointeritem>\n";
  
--- 360,365 ----
  
  	item_it = dst_dumper_list.begin();
! 	item_en = dst_dumper_list.end();
! 	for( ; item_it != item_en; ++item_it)
  		mmm_dst += indStr() + "<pointeritem desc = \"" + item_it->name() + "\"></pointeritem>\n";
  
***************
*** 417,421 ****
  		// assign the source cardinality constraints to DST-s
  		SDList_Iterator it = m_oper2.begin();
! 		while ( it != m_oper2.end())
  		{
  			std::string src_desc;
--- 430,435 ----
  		// assign the source cardinality constraints to DST-s
  		SDList_Iterator it = m_oper2.begin();
! 		SDList_Iterator en = m_oper2.end();
! 		while ( it != en)
  		{
  			std::string src_desc;
***************
*** 440,444 ****
  		// assign the dst cardinality constraints to SRC-s
  		SDList_Iterator it = m_oper1.begin();
! 		while ( it != m_oper1.end())
  		{
  			std::string dst_desc;
--- 454,459 ----
  		// assign the dst cardinality constraints to SRC-s
  		SDList_Iterator it = m_oper1.begin();
! 		SDList_Iterator en = m_oper1.end();
! 		while ( it != en)
  		{
  			std::string dst_desc;

Index: ConnectionRep.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/ConnectionRep.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ConnectionRep.cpp	19 Aug 2004 18:29:52 -0000	1.8
--- ConnectionRep.cpp	26 Jan 2005 17:31:06 -0000	1.9
***************
*** 121,125 ****
  
  	std::set< BON::FCO >::const_iterator it = m_equivs.begin();
! 	for ( ; it != m_equivs.end(); ++it)
  	{
  		if ( *it == m_ptr) continue;
--- 121,126 ----
  
  	std::set< BON::FCO >::const_iterator it = m_equivs.begin();
! 	std::set< BON::FCO >::const_iterator en = m_equivs.end();
! 	for ( ; it != en; ++it)
  	{
  		if ( *it == m_ptr) continue;
***************
*** 227,231 ****
  
  		std::list<ConnJoint>::iterator it = m_jointList.begin();
! 		for( ; !desc && it != m_jointList.end(); ++it)
  			desc = desc || it->descendantsOf( a_joint);
  
--- 228,233 ----
  
  		std::list<ConnJoint>::iterator it = m_jointList.begin();
! 		std::list<ConnJoint>::iterator en = m_jointList.end();
! 		for( ; !desc && it != en; ++it)
  			desc = desc || it->descendantsOf( a_joint);
  
***************
*** 242,247 ****
  	// interface inheritance
  	ModelRepPtrList_Iterator mod_it = models.begin();
  	// for all models i am part of
! 	for( ; mod_it != models.end(); ++mod_it )
  	{
  		ModelRep* mod_ptr = *mod_it;
--- 244,250 ----
  	// interface inheritance
  	ModelRepPtrList_Iterator mod_it = models.begin();
+ 	ModelRepPtrList_Iterator mod_en = models.end();
  	// for all models i am part of
! 	for( ; mod_it != mod_en; ++mod_it )
  	{
  		ModelRep* mod_ptr = *mod_it;
***************
*** 249,253 ****
  		// for all connJoints it has
  		std::list<ConnJoint>::iterator joint_it = m_jointList.begin();
! 		for( ; joint_it != m_jointList.end(); ++joint_it )
  		{
  			joint_it->intInherit( mod_ptr); // creates map containing src and dst roles
--- 252,257 ----
  		// for all connJoints it has
  		std::list<ConnJoint>::iterator joint_it = m_jointList.begin();
! 		std::list<ConnJoint>::iterator joint_en = m_jointList.end();
! 		for( ; joint_it != joint_en; ++joint_it )
  		{
  			joint_it->intInherit( mod_ptr); // creates map containing src and dst roles
***************
*** 261,268 ****
  
  	std::vector<FCO*>::iterator conn_it = conn_descendants.begin();
! 	for( ; conn_it != conn_descendants.end(); ++conn_it)
  	{
  		std::list<ConnJoint>::iterator joint_it = m_jointList.begin();
! 		for( ; joint_it != m_jointList.end(); ++joint_it )
  		{
  			ConnectionRep * conn_rep = 0;
--- 265,274 ----
  
  	std::vector<FCO*>::iterator conn_it = conn_descendants.begin();
! 	std::vector<FCO*>::iterator conn_en = conn_descendants.end();
! 	for( ; conn_it != conn_en; ++conn_it)
  	{
  		std::list<ConnJoint>::iterator joint_it = m_jointList.begin();
! 		std::list<ConnJoint>::iterator joint_en = m_jointList.end();
! 		for( ; joint_it != joint_en; ++joint_it )
  		{
  			ConnectionRep * conn_rep = 0;
***************
*** 361,365 ****
  
  	std::list<ConnJoint>::iterator joint_it = m_jointList.begin();
! 	for( ; joint_it != m_jointList.end(); ++joint_it )
  	{
  		std::string nnn = joint_it->dumpElements( models);
--- 367,372 ----
  
  	std::list<ConnJoint>::iterator joint_it = m_jointList.begin();
! 	std::list<ConnJoint>::iterator joint_en = m_jointList.end();
! 	for( ; joint_it != joint_en; ++joint_it )
  	{
  		std::string nnn = joint_it->dumpElements( models);
***************
*** 377,381 ****
  	bool res = true;
  	std::list<ConnJoint>::iterator joint_it = m_jointList.begin();
! 	for( ; joint_it != m_jointList.end(); ++joint_it )
  	{
  		res = res && joint_it->checkElements( getName());
--- 384,389 ----
  	bool res = true;
  	std::list<ConnJoint>::iterator joint_it = m_jointList.begin();
! 	std::list<ConnJoint>::iterator joint_en = m_jointList.end();
! 	for( ; joint_it != joint_en; ++joint_it )
  	{
  		res = res && joint_it->checkElements( getName());
***************
*** 388,392 ****
  {
  	std::list<ConnJoint>::iterator joint_it = m_jointList.begin();
! 	for( ; joint_it != m_jointList.end(); ++joint_it )
  		joint_it->createConstraints(s, getName());
  }
--- 396,401 ----
  {
  	std::list<ConnJoint>::iterator joint_it = m_jointList.begin();
! 	std::list<ConnJoint>::iterator joint_en = m_jointList.end();
! 	for( ; joint_it != joint_en; ++joint_it )
  		joint_it->createConstraints(s, getName());
  }

Index: Dumper.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/Dumper.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** Dumper.cpp	5 Nov 2004 21:25:08 -0000	1.27
--- Dumper.cpp	26 Jan 2005 17:31:06 -0000	1.28
***************
*** 41,47 ****
  {
  	std::vector<FolderRep*>::iterator it( m_folderList.begin());
! 	while( it != m_folderList.end() && !(*it)->isFCOContained( fco))
  		++it;
! 	return it != m_folderList.end();
  }
  
--- 41,48 ----
  {
  	std::vector<FolderRep*>::iterator it( m_folderList.begin());
[...1053 lines suppressed...]
  		res = AfxMessageBox( "Successfully generated " + CString(f_name.c_str()) + "\n\nWould you like to register your new paradigm ?", MB_YESNO | MB_ICONINFORMATION);
- #endif
  
  	if ( res == IDYES) 
--- 1757,1764 ----
***************
*** 1731,1742 ****
  		if (FAILED(hr)) {
  
- #ifdef NOUSERINPUT
- 			TO("Error occured while registering new paradigm.");
- #else
  			if( global_vars.silent_mode)
  				TO("Error occured while registering new paradigm.");
  			else
  				AfxMessageBox("Error occured while registering new paradigm.", MB_ICONSTOP | MB_OK);
- #endif
  		}
  	}
--- 1773,1780 ----

Index: FCO.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/FCO.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FCO.cpp	19 Aug 2004 18:29:52 -0000	1.11
--- FCO.cpp	26 Jan 2005 17:31:06 -0000	1.12
***************
*** 206,210 ****
  	// abstract iff all equivalent classes are abstract
  	std::set< BON::FCO >::const_iterator it = m_equivs.begin();
! 	for ( ; it != m_equivs.end(); ++it)
  	{
  		if ( *it == m_ptr) continue;
--- 206,211 ----
  	// abstract iff all equivalent classes are abstract
  	std::set< BON::FCO >::const_iterator it = m_equivs.begin();
! 	std::set< BON::FCO >::const_iterator en = m_equivs.end();
! 	for ( ; it != en; ++it)
  	{
  		if ( *it == m_ptr) continue;
***************
*** 454,458 ****
  
  		std::vector<ReferenceRep *>::iterator temp_it = temp.begin();
! 		for( ; temp_it != temp.end(); ++temp_it)
  		{
  			if( std::find( multiple_refs.begin(), multiple_refs.end(), *temp_it) == multiple_refs.end()) // not found a ref in the current transitive ref list
--- 455,460 ----
  
  		std::vector<ReferenceRep *>::iterator temp_it = temp.begin();
! 		std::vector<ReferenceRep *>::iterator temp_en = temp.end();
! 		for( ; temp_it != temp_en; ++temp_it)
  		{
  			if( std::find( multiple_refs.begin(), multiple_refs.end(), *temp_it) == multiple_refs.end()) // not found a ref in the current transitive ref list
***************
*** 615,619 ****
  {
  	AttributeRepPtrList_ConstIterator it_pos = t_list.begin();
! 	for( ; it_pos != t_list.end(); ++it_pos)
  		addFinalAttribute( *it_pos);
  }
--- 617,622 ----
  {
  	AttributeRepPtrList_ConstIterator it_pos = t_list.begin();
! 	AttributeRepPtrList_ConstIterator en_pos = t_list.end();
! 	for( ; it_pos != en_pos; ++it_pos)
  		addFinalAttribute( *it_pos);
  }
***************
*** 621,629 ****
  bool FCO::findFinalAttributeBasedOnName( const std::string & name)
  {
! 	AttributeRepPtrList_Iterator it;
  	it = m_finalAttributeList.begin();
! 	while( it != m_finalAttributeList.end() && !((*it)->getName() == name /*&& (*it)->isViewable()*/))
  		++it;
! 	return ( it != m_finalAttributeList.end()); // if found
  }
  
--- 624,633 ----
  bool FCO::findFinalAttributeBasedOnName( const std::string & name)
  {
! 	AttributeRepPtrList_Iterator it, en;
  	it = m_finalAttributeList.begin();
! 	en = m_finalAttributeList.end();
! 	while( it != en && !((*it)->getName() == name /*&& (*it)->isViewable()*/))
  		++it;
! 	return ( it != en); // if found
  }
  
***************
*** 633,637 ****
  {
  	std::string mmm = "";
! 	AttributeRepPtrList_Iterator it;
  	
  	AnyLexicographicSort lex;
--- 637,641 ----
  {
  	std::string mmm = "";
! 	AttributeRepPtrList_Iterator it, en;
  	
  	AnyLexicographicSort lex;
***************
*** 640,644 ****
  
  	it = m_finalAttributeList.begin();
! 	for( ; it != m_finalAttributeList.end(); ++it)
  		if ( !(*it)->isGlobal())
  		{
--- 644,649 ----
  
  	it = m_finalAttributeList.begin();
! 	en = m_finalAttributeList.end();
! 	for( ; it != en; ++it)
  		if ( !(*it)->isGlobal())
  		{
***************
*** 658,668 ****
  {
  	std::list<AttributeRep*> temp_list;
! 	std::list<AttributeRep*>::iterator t_it;
  	std::string mmm = "";
  
! 	AttributeRepPtrList_Iterator it;
  	
  	it = m_finalAttributeList.begin();
! 	for( ; it != m_finalAttributeList.end(); ++it)
  		if ( !check_viewable || (*it)->isViewable())
  		{
--- 663,674 ----
  {
  	std::list<AttributeRep*> temp_list;
! 	std::list<AttributeRep*>::iterator t_it, t_en;
  	std::string mmm = "";
  
! 	AttributeRepPtrList_Iterator it, en;
  	
  	it = m_finalAttributeList.begin();
! 	en = m_finalAttributeList.end();
! 	for( ; it != en; ++it)
  		if ( !check_viewable || (*it)->isViewable())
  		{
***************
*** 676,680 ****
  	{
  		mmm = " attributes = \"";
! 		for( t_it = temp_list.begin(); t_it != temp_list.end(); ++t_it)
  		{
  			if (t_it != temp_list.begin()) mmm += " ";
--- 682,687 ----
  	{
  		mmm = " attributes = \"";
! 		t_en = temp_list.end();
! 		for( t_it = temp_list.begin(); t_it != t_en; ++t_it)
  		{
  			if (t_it != temp_list.begin()) mmm += " ";
***************
*** 693,697 ****
  	getImpAncestors( ancestors);
  	std::vector<FCO*>::iterator it = ancestors.begin();
! 	for( ; it != ancestors.end(); ++it)
  	{
  		mmm += (*it)->dumpIcon();
--- 700,705 ----
  	getImpAncestors( ancestors);
  	std::vector<FCO*>::iterator it = ancestors.begin();
! 	std::vector<FCO*>::iterator en = ancestors.end();
! 	for( ; it != en; ++it)
  	{
  		mmm += (*it)->dumpIcon();
***************
*** 715,719 ****
  	getImpAncestors( ancestors);
  	std::vector<FCO*>::iterator it = ancestors.begin();
! 	for( ; it != ancestors.end(); ++it)
  	{
  		mmm += (*it)->dumpPortIcon();
--- 723,728 ----
  	getImpAncestors( ancestors);
  	std::vector<FCO*>::iterator it = ancestors.begin();
! 	std::vector<FCO*>::iterator en = ancestors.end();
! 	for( ; it != en; ++it)
  	{
  		mmm += (*it)->dumpPortIcon();
***************
*** 737,741 ****
  	getImpAncestors( ancestors);
  	std::vector<FCO*>::iterator it = ancestors.begin();
! 	for( ; it != ancestors.end(); ++it)
  	{
  		mmm += (*it)->dumpDecorator();
--- 746,751 ----
  	getImpAncestors( ancestors);
  	std::vector<FCO*>::iterator it = ancestors.begin();
! 	std::vector<FCO*>::iterator en = ancestors.end();
! 	for( ; it != en; ++it)
  	{
  		mmm += (*it)->dumpDecorator();
***************
*** 760,764 ****
  	getImpAncestors( ancestors);
  	std::vector<FCO*>::iterator it = ancestors.begin();
! 	for( ; it != ancestors.end(); ++it)
  	{
  		mmm += (*it)->dumpHotspotEnabled();
--- 770,775 ----
  	getImpAncestors( ancestors);
  	std::vector<FCO*>::iterator it = ancestors.begin();
! 	std::vector<FCO*>::iterator en = ancestors.end();
! 	for( ; it != en; ++it)
  	{
  		mmm += (*it)->dumpHotspotEnabled();
***************
*** 782,786 ****
  	getImpAncestors( ancestors);
  	std::vector<FCO*>::iterator it = ancestors.begin();
! 	for( ; it != ancestors.end(); ++it)
  	{
  		mmm += (*it)->dumpTypeShown();
--- 793,798 ----
  	getImpAncestors( ancestors);
  	std::vector<FCO*>::iterator it = ancestors.begin();
! 	std::vector<FCO*>::iterator en = ancestors.end();
! 	for( ; it != en; ++it)
  	{
  		mmm += (*it)->dumpTypeShown();
***************
*** 803,807 ****
  	getImpAncestors( ancestors);
  	std::vector<FCO*>::iterator it = ancestors.begin();
! 	for( ; it != ancestors.end(); ++it)
  	{
  		mmm += (*it)->dumpGeneralPref();
--- 815,820 ----
  	getImpAncestors( ancestors);
  	std::vector<FCO*>::iterator it = ancestors.begin();
! 	std::vector<FCO*>::iterator en = ancestors.end();
! 	for( ; it != en; ++it)
  	{
  		mmm += (*it)->dumpGeneralPref();
***************
*** 889,893 ****
  	getImpAncestors( ancestors);
  	std::vector<FCO*>::iterator it = ancestors.begin();
! 	for( ; it != ancestors.end(); ++it)
  	{
  		mmm += (*it)->dumpSubTypeIcon();
--- 902,907 ----
  	getImpAncestors( ancestors);
  	std::vector<FCO*>::iterator it = ancestors.begin();
! 	std::vector<FCO*>::iterator en = ancestors.end();
! 	for( ; it != en; ++it)
  	{
  		mmm += (*it)->dumpSubTypeIcon();
***************
*** 911,915 ****
  	getImpAncestors( ancestors);
  	std::vector<FCO*>::iterator it = ancestors.begin();
! 	for( ; it != ancestors.end(); ++it)
  	{
  		mmm += (*it)->dumpInstanceIcon();
--- 925,930 ----
  	getImpAncestors( ancestors);
  	std::vector<FCO*>::iterator it = ancestors.begin();
! 	std::vector<FCO*>::iterator en = ancestors.end();
! 	for( ; it != en; ++it)
  	{
  		mmm += (*it)->dumpInstanceIcon();
***************
*** 933,937 ****
  	getImpAncestors( ancestors);
  	std::vector<FCO*>::iterator it = ancestors.begin();
! 	for( ; it != ancestors.end(); ++it)
  	{
  		mmm += (*it)->dumpNameWrap();
--- 948,953 ----
  	getImpAncestors( ancestors);
  	std::vector<FCO*>::iterator it = ancestors.begin();
! 	std::vector<FCO*>::iterator en = ancestors.end();
! 	for( ; it != en; ++it)
  	{
  		mmm += (*it)->dumpNameWrap();
***************
*** 957,961 ****
  	getImpAncestors( ancestors);
  	std::vector<FCO*>::iterator it = ancestors.begin();
! 	for( ; it != ancestors.end(); ++it)
  	{
  		mmm += (*it)->dumpNameEnabled();
--- 973,978 ----
  	getImpAncestors( ancestors);
  	std::vector<FCO*>::iterator it = ancestors.begin();
! 	std::vector<FCO*>::iterator en = ancestors.end();
! 	for( ; it != en; ++it)
  	{
  		mmm += (*it)->dumpNameEnabled();

Index: FolderRep.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/FolderRep.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** FolderRep.cpp	5 Nov 2004 21:25:08 -0000	1.9
--- FolderRep.cpp	26 Jan 2005 17:31:06 -0000	1.10
***************
*** 104,108 ****
  	bool fco_list_empty = true;
  	FCO_ConstIterator it = m_fcoList.begin();
! 	while ( it != m_fcoList.end())
  	{
  		if (!(*it)->isAbstract())
--- 104,109 ----
  	bool fco_list_empty = true;
  	FCO_ConstIterator it = m_fcoList.begin();
! 	FCO_ConstIterator en = m_fcoList.end();
! 	while ( it != en)
  	{
  		if (!(*it)->isAbstract())
***************
*** 131,135 ****
  	std::vector<FCO *> temp_list;
  	FCO_Iterator fco_it = m_fcoList.begin();
! 	for( ; fco_it != m_fcoList.end(); ++fco_it)
  	{
  		FCO * fco_ptr = *fco_it;
--- 132,137 ----
  	std::vector<FCO *> temp_list;
  	FCO_Iterator fco_it = m_fcoList.begin();
! 	FCO_Iterator fco_en = m_fcoList.end();
! 	for( ; fco_it != fco_en; ++fco_it)
  	{
  		FCO * fco_ptr = *fco_it;
***************
*** 137,141 ****
  		fco_ptr->getIntDescendants( descendants);
  		std::vector<FCO*>::iterator desc_it = descendants.begin();
! 		for( ; desc_it != descendants.end(); ++desc_it)
  		{
  			FCO * new_member = *desc_it;
--- 139,144 ----
  		fco_ptr->getIntDescendants( descendants);
  		std::vector<FCO*>::iterator desc_it = descendants.begin();
! 		std::vector<FCO*>::iterator desc_en = descendants.end();
! 		for( ; desc_it != desc_en; ++desc_it)
  		{
  			FCO * new_member = *desc_it;
***************
*** 161,168 ****
  
  	SubFolder_ConstIterator it_f = m_subFolderList.begin();
! 	if  ( it_f != m_subFolderList.end())
  	{
  		mmm += " subfolders = \"" + (*it_f)->getName();
! 		for( ++it_f; it_f != m_subFolderList.end(); ++it_f)
  		{
  			mmm += " " + (*it_f)->getName();
--- 164,172 ----
  
  	SubFolder_ConstIterator it_f = m_subFolderList.begin();
! 	SubFolder_ConstIterator en_f = m_subFolderList.end();
! 	if  ( it_f != en_f)
  	{
  		mmm += " subfolders = \"" + (*it_f)->getName();
! 		for( ++it_f; it_f != en_f; ++it_f)
  		{
  			mmm += " " + (*it_f)->getName();
***************
*** 178,182 ****
  		bool first = true;
  		FCO_Iterator it = m_fcoList.begin();
! 		while ( it != m_fcoList.end())
  		{
  			if (!(*it)->isAbstract()) // check for abstract
--- 182,187 ----
  		bool first = true;
  		FCO_Iterator it = m_fcoList.begin();
! 		FCO_Iterator en = m_fcoList.end();
! 		while ( it != en)
  		{
  			if (!(*it)->isAbstract()) // check for abstract
***************
*** 244,248 ****
  		ptr->getIntDescendants( descendants);
  		std::vector<FCO*>::iterator desc_it = descendants.begin();
! 		for( ; desc_it != descendants.end(); ++desc_it)
  			str_expr_begin += " or child.oclIsTypeOf( " + (*desc_it)->getName() + ")";
  
--- 249,254 ----
  		ptr->getIntDescendants( descendants);
  		std::vector<FCO*>::iterator desc_it = descendants.begin();
! 		std::vector<FCO*>::iterator desc_en = descendants.end();
! 		for( ; desc_it != desc_en; ++desc_it)
  			str_expr_begin += " or child.oclIsTypeOf( " + (*desc_it)->getName() + ")";
  

Index: ModelRep.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/ModelRep.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ModelRep.cpp	5 Nov 2004 21:25:08 -0000	1.15
--- ModelRep.cpp	26 Jan 2005 17:31:06 -0000	1.16
***************
*** 53,57 ****
  {
  	RoleMap_Iterator it = m_initialRoleMap.begin();
! 	for( ; it != m_initialRoleMap.end(); ++it)
  	{
  		RoleMapKey fco = it->first; // FCO *
--- 53,58 ----
  {
  	RoleMap_Iterator it = m_initialRoleMap.begin();
! 	RoleMap_Iterator en = m_initialRoleMap.end();
! 	for( ; it != en; ++it)
  	{
  		RoleMapKey fco = it->first; // FCO *
***************
*** 82,86 ****
  			RoleMapValue &series = it->second;
  			RoleSeries_Iterator role_it = series.begin();
! 			for(; role_it != series.end(); ++role_it)
  			{
  				role_it->setLongForm( true);
--- 83,88 ----
  			RoleMapValue &series = it->second;
  			RoleSeries_Iterator role_it = series.begin();
! 			RoleSeries_Iterator role_en = series.end();
! 			for(; role_it != role_en; ++role_it)
  			{
  				role_it->setLongForm( true);
***************
*** 107,111 ****
  
  	RoleMap_ConstIterator it = m_initialRoleMap.begin();
! 	while ( it != m_initialRoleMap.end())
  	{
  		FCO * const ptr = it->first; // ModelRep *
--- 109,114 ----
  
  	RoleMap_ConstIterator it = m_initialRoleMap.begin();
! 	RoleMap_ConstIterator en = m_initialRoleMap.end();
! 	while ( it != en)
  	{
  		FCO * const ptr = it->first; // ModelRep *
***************
*** 172,176 ****
  
  	RoleMap_ConstIterator it = m_finalRoleMap.begin();
! 	while ( it != m_finalRoleMap.end())
  	{
  		FCO * const ptr = it->first; // ModelRep *
--- 175,180 ----
  
  	RoleMap_ConstIterator it = m_finalRoleMap.begin();
! 	RoleMap_ConstIterator en = m_finalRoleMap.end();
! 	while ( it != en)
  	{
  		FCO * const ptr = it->first; // ModelRep *
***************
*** 190,194 ****
  	std::vector< ReferenceRep *> refs;
  	RoleMap_ConstIterator it = m_finalRoleMap.begin();
! 	while ( it != m_finalRoleMap.end())
  	{
  		FCO * const ptr = it->first;
--- 194,199 ----
  	std::vector< ReferenceRep *> refs;
  	RoleMap_ConstIterator it = m_finalRoleMap.begin();
! 	RoleMap_ConstIterator en = m_finalRoleMap.end();
! 	while ( it != en)
  	{
  		FCO * const ptr = it->first;
***************
*** 236,241 ****
  					
  		RoleMap_Iterator fco_it( m_initialRoleMap.begin());
  		// for each FCO
! 		for( ; fco_it != m_initialRoleMap.end(); ++fco_it)
  		{ 
  			RoleMapKey fco_ptr = fco_it->first;
--- 241,247 ----
  					
  		RoleMap_Iterator fco_it( m_initialRoleMap.begin());
+ 		RoleMap_Iterator fco_en( m_initialRoleMap.end());
  		// for each FCO
! 		for( ; fco_it != fco_en; ++fco_it)
  		{ 
  			RoleMapKey fco_ptr = fco_it->first;
***************
*** 249,258 ****
  
  			RoleSeries_Iterator role_it = roles.begin();
  			// for each role
! 			for( ; role_it != roles.end(); ++role_it)
  			{
  				std::vector<FCO*>::iterator desc_it = children.begin();
  				// for each interface descendant
! 				for( ; desc_it != children.end(); ++desc_it)
  				{
  					// the descendants must have a separate role for each initial role
--- 255,266 ----
  
  			RoleSeries_Iterator role_it = roles.begin();
+ 			RoleSeries_Iterator role_en = roles.end();
  			// for each role
! 			for( ; role_it != role_en; ++role_it)
  			{
  				std::vector<FCO*>::iterator desc_it = children.begin();
+ 				std::vector<FCO*>::iterator desc_en = children.end();
  				// for each interface descendant
! 				for( ; desc_it != desc_en; ++desc_it)
  				{
  					// the descendants must have a separate role for each initial role
***************
*** 287,298 ****
  {
  	RoleMap_Iterator role_it = m_finalRoleMap.begin();
  	// for all roles in this model
! 	for( ; role_it != m_finalRoleMap.end(); ++role_it)
  	{
  		RoleStringLex lex;
  		std::sort( role_it->second.begin(), role_it->second.end(), lex);
  		std::vector<AspectRep*>::iterator asp_it = m_finalAspectList.begin();
  		// for all my aspects 
! 		for( ; asp_it != m_finalAspectList.end(); ++asp_it)
  		{
  			// the fco which owns the roles
--- 295,308 ----
  {
  	RoleMap_Iterator role_it = m_finalRoleMap.begin();
+ 	RoleMap_Iterator role_en = m_finalRoleMap.end();
  	// for all roles in this model
! 	for( ; role_it != role_en; ++role_it)
  	{
  		RoleStringLex lex;
  		std::sort( role_it->second.begin(), role_it->second.end(), lex);
  		std::vector<AspectRep*>::iterator asp_it = m_finalAspectList.begin();
+ 		std::vector<AspectRep*>::iterator asp_en = m_finalAspectList.end();
  		// for all my aspects 
! 		for( ; asp_it != asp_en; ++asp_it)
  		{
  			// the fco which owns the roles
***************
*** 305,309 ****
  					// each role of fco is member of aspect
  					RoleSeries_Iterator jt = role_it->second.begin();
! 					for( ; jt != role_it->second.end() ; ++jt)
  					{
  						PartRep pr( *jt, *asp_it);
--- 315,320 ----
  					// each role of fco is member of aspect
  					RoleSeries_Iterator jt = role_it->second.begin();
! 					RoleSeries_Iterator je = role_it->second.end();
! 					for( ; jt != je; ++jt)
  					{
  						PartRep pr( *jt, *asp_it);
***************
*** 315,319 ****
  					// some roles are going to become part of aspect
  					RoleSeries_Iterator jt = role_it->second.begin();
! 					for( ; jt != role_it->second.end() ; ++jt)
  					{
  						if ( (*asp_it)->findFinalRole( *jt)) // this role is intended to be in the aspect
--- 326,331 ----
  					// some roles are going to become part of aspect
  					RoleSeries_Iterator jt = role_it->second.begin();
! 					RoleSeries_Iterator je = role_it->second.end();
! 					for( ; jt != je; ++jt)
  					{
  						if ( (*asp_it)->findFinalRole( *jt)) // this role is intended to be in the aspect
***************
*** 351,355 ****
  {
  	std::vector<AspectRep*>::const_iterator ii = l.begin();
! 	for( ; ii != l.end(); ++ii)
  		addFinalAspect(*ii);
  }
--- 363,368 ----
  {
  	std::vector<AspectRep*>::const_iterator ii = l.begin();
! 	std::vector<AspectRep*>::const_iterator en = l.end();
! 	for( ; ii != en; ++ii)
  		addFinalAspect(*ii);
  }
***************
*** 405,409 ****
  	
  	std::vector<AspectRep *>::const_iterator aspects_it = aspect_set.begin();
! 	while( aspects_it != aspect_set.end() && !found)
  	{
  		std::vector<AspectRep*>::const_iterator ii = 
--- 418,423 ----
  	
  	std::vector<AspectRep *>::const_iterator aspects_it = aspect_set.begin();
! 	std::vector<AspectRep *>::const_iterator aspects_en = aspect_set.end();
! 	while( aspects_it != aspects_en && !found)
  	{
  		std::vector<AspectRep*>::const_iterator ii = 
***************
*** 486,490 ****
  	// all roles (final)
  	RoleMap_Iterator it = m_finalRoleMap.begin();
! 	for( ; it != m_finalRoleMap.end(); ++it)
  		key_list.push_back( it->first);
  
--- 500,505 ----
  	// all roles (final)
  	RoleMap_Iterator it = m_finalRoleMap.begin();
! 	RoleMap_Iterator en = m_finalRoleMap.end();
! 	for( ; it != en; ++it)
  		key_list.push_back( it->first);
  
***************
*** 493,497 ****
  	
  	std::vector< RoleMapKey>::iterator key_it = key_list.begin();
! 	for( ; key_it != key_list.end(); ++key_it )
  	{
  		//RoleMapKey ptr = it->first;
--- 508,513 ----
  	
  	std::vector< RoleMapKey>::iterator key_it = key_list.begin();
! 	std::vector< RoleMapKey>::iterator key_en = key_list.end();
! 	for( ; key_it != key_en; ++key_it )
  	{
  		//RoleMapKey ptr = it->first;
***************
*** 500,504 ****
  		RoleMapValue &roles = m_finalRoleMap[ ptr];
  		RoleSeries_Iterator jt = roles.begin();
! 		for( ; jt != roles.end() ; ++jt)
  			if (!jt->getFCOPtr()->isAbstract())
  			{
--- 516,521 ----
  		RoleMapValue &roles = m_finalRoleMap[ ptr];
  		RoleSeries_Iterator jt = roles.begin();
! 		RoleSeries_Iterator je = roles.end();
! 		for( ; jt != je; ++jt)
  			if (!jt->getFCOPtr()->isAbstract())
  			{
***************
*** 538,542 ****
  
  	std::vector<std::string>::iterator sorted_list_it = role_lines_to_dump.begin();
! 	for( ; sorted_list_it != role_lines_to_dump.end(); ++sorted_list_it)
  		mmm += *sorted_list_it;
  
--- 555,560 ----
  
  	std::vector<std::string>::iterator sorted_list_it = role_lines_to_dump.begin();
! 	std::vector<std::string>::iterator sorted_list_en = role_lines_to_dump.end();
! 	for( ; sorted_list_it != sorted_list_en; ++sorted_list_it)
  		mmm += *sorted_list_it;
  
***************
*** 548,552 ****
  		std::sort( m_finalAspectList.begin(), m_finalAspectList.end(), asp_less_than);
  		std::vector<AspectRep *>::iterator asp_it = m_finalAspectList.begin();
! 		for( ; asp_it != m_finalAspectList.end(); ++asp_it)
  		{
  			AspectRep * asp_ptr = *asp_it;
--- 566,571 ----
  		std::sort( m_finalAspectList.begin(), m_finalAspectList.end(), asp_less_than);
  		std::vector<AspectRep *>::iterator asp_it = m_finalAspectList.begin();
! 		std::vector<AspectRep *>::iterator asp_en = m_finalAspectList.end();
! 		for( ; asp_it != asp_en; ++asp_it)
  		{
  			AspectRep * asp_ptr = *asp_it;
***************
*** 568,572 ****
  			const AspectRep::PartRepSeries parts = (*asp_it)->getPartSeries( this);
  			AspectRep::PartRepSeries_ConstIterator part_it = parts.begin();
! 			for( ; part_it != parts.end(); ++part_it)
  			{
  				std::string r_name = part_it->getRoleRepPtr()->getSmartRoleName();
--- 587,592 ----
  			const AspectRep::PartRepSeries parts = (*asp_it)->getPartSeries( this);
  			AspectRep::PartRepSeries_ConstIterator part_it = parts.begin();
! 			AspectRep::PartRepSeries_ConstIterator part_en = parts.end();
! 			for( ; part_it != part_en; ++part_it)
  			{
  				std::string r_name = part_it->getRoleRepPtr()->getSmartRoleName();
***************
*** 663,667 ****
  {
  	RoleMap_ConstIterator it = m_initialRoleMap.begin();
! 	for ( ; it != m_initialRoleMap.end(); ++it)
  	{
  		FCO * const ptr = it->first;
--- 683,688 ----
  {
  	RoleMap_ConstIterator it = m_initialRoleMap.begin();
! 	RoleMap_ConstIterator en = m_initialRoleMap.end();
! 	for ( ; it != en; ++it)
  	{
  		FCO * const ptr = it->first;
***************
*** 671,675 ****
  		
  		RoleSeries_ConstIterator jt = it->second.begin();
! 		for( ; jt != it->second.end() ; ++jt)
  		//if (!jt->getFCOPtr()->isAbstract())
  		{
--- 692,697 ----
  		
  		RoleSeries_ConstIterator jt = it->second.begin();
! 		RoleSeries_ConstIterator je = it->second.end();
! 		for( ; jt != je ; ++jt)
  		//if (!jt->getFCOPtr()->isAbstract())
  		{
***************
*** 694,698 ****
  
  				std::vector<FCO*>::iterator desc_it = descendants.begin();
! 				for( ; desc_it != descendants.end(); ++desc_it)
  					if ( !(*desc_it)->isAbstract())
  						str_expr_begin += "+ self.parts( \"" + (*desc_it)->getName() + r.getOnlyRoleName() + "\" ) -> size ";
--- 716,721 ----
  
  				std::vector<FCO*>::iterator desc_it = descendants.begin();
! 				std::vector<FCO*>::iterator desc_en = descendants.end();
! 				for( ; desc_it != desc_en; ++desc_it)
  					if ( !(*desc_it)->isAbstract())
  						str_expr_begin += "+ self.parts( \"" + (*desc_it)->getName() + r.getOnlyRoleName() + "\" ) -> size ";

Index: ReferenceRep.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/ReferenceRep.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ReferenceRep.cpp	30 Jul 2004 00:10:23 -0000	1.11
--- ReferenceRep.cpp	26 Jan 2005 17:31:06 -0000	1.12
***************
*** 193,197 ****
  {
  	RefereeList_Iterator referee_it = referees.begin();
! 	for( ; referee_it != referees.end(); ++referee_it)
  	{
  		addFinalReferees( *referee_it);
--- 193,198 ----
  {
  	RefereeList_Iterator referee_it = referees.begin();
! 	RefereeList_Iterator referee_en = referees.end();
! 	for( ; referee_it != referee_en; ++referee_it)
  	{
  		addFinalReferees( *referee_it);
***************
*** 208,212 ****
  
  	RefereeList_Iterator it = m_initialReferees.begin();
! 	for( ; it != m_initialReferees.end(); ++it)
  	{
  		FCO * target_ptr = *it;
--- 209,214 ----
  
  	RefereeList_Iterator it = m_initialReferees.begin();
! 	RefereeList_Iterator en = m_initialReferees.end();
! 	for( ; it != en; ++it)
  	{
  		FCO * target_ptr = *it;
***************
*** 263,267 ****
  			// copy if not present already into all_referees
  			RefereeList_ConstIterator list_iter = list.begin();
! 			for( ; list_iter != list.end(); ++list_iter)
  				if (std::find( all_referees.begin(), all_referees.end(), *list_iter) == all_referees.end())
  					all_referees.push_back( *list_iter);
--- 265,270 ----
  			// copy if not present already into all_referees
  			RefereeList_ConstIterator list_iter = list.begin();
! 			RefereeList_ConstIterator list_iend = list.end();
! 			for( ; list_iter != list_iend; ++list_iter)
  				if (std::find( all_referees.begin(), all_referees.end(), *list_iter) == all_referees.end())
  					all_referees.push_back( *list_iter);
***************
*** 312,316 ****
  	std::sort( m_finalReferees.begin(), m_finalReferees.end(), lex);
  	RefereeList_Iterator it = m_finalReferees.begin();
! 	for( ; it != m_finalReferees.end(); ++it )
  	{
  		if (!(*it)->isAbstract())
--- 315,320 ----
  	std::sort( m_finalReferees.begin(), m_finalReferees.end(), lex);
  	RefereeList_Iterator it = m_finalReferees.begin();
! 	RefereeList_Iterator en = m_finalReferees.end();
! 	for( ; it != en; ++it )
  	{
  		if (!(*it)->isAbstract())
***************
*** 390,394 ****
  
  	ModelRep::AspectRepPtrList::iterator asp_it = intersection_of_asps.begin();
! 	for( ; asp_it != intersection_of_asps.end(); ++asp_it)
  	{
  		if ( !lowest_asp) // is lowest_asp set?
--- 394,399 ----
  
  	ModelRep::AspectRepPtrList::iterator asp_it = intersection_of_asps.begin();
! 	ModelRep::AspectRepPtrList::iterator asp_en = intersection_of_asps.end();
! 	for( ; asp_it != asp_en; ++asp_it)
  	{
  		if ( !lowest_asp) // is lowest_asp set?
***************
*** 408,412 ****
  	std::vector<const ModelRep *> models = getModelRefVector();
  	std::vector<const ModelRep *>::iterator it = models.begin();
! 	for( ; it != models.end(); ++it)
  	{
  		const ModelRep::AspectRepPtrList &asplist = (*it)->getFinalAspectRepPtrList();
--- 413,418 ----
  	std::vector<const ModelRep *> models = getModelRefVector();
  	std::vector<const ModelRep *>::iterator it = models.begin();
! 	std::vector<const ModelRep *>::iterator en = models.end();
! 	for( ; it != en; ++it)
  	{
  		const ModelRep::AspectRepPtrList &asplist = (*it)->getFinalAspectRepPtrList();
***************
*** 419,423 ****
  		{
  			ModelRep::AspectRepPtrList::iterator isect_it = intersection_of_asps.begin();
! 			while( isect_it != intersection_of_asps.end())
  			{
  				if ( std::find( asplist.begin(), asplist.end(), *isect_it) == asplist.end()) // element of union not found in asp set, so it should be deleted from the union
--- 425,430 ----
  		{
  			ModelRep::AspectRepPtrList::iterator isect_it = intersection_of_asps.begin();
! 			ModelRep::AspectRepPtrList::iterator isect_en = intersection_of_asps.end();
! 			while( isect_it != isect_en)
  			{
  				if ( std::find( asplist.begin(), asplist.end(), *isect_it) == asplist.end()) // element of union not found in asp set, so it should be deleted from the union

Index: RootFolder.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/RootFolder.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RootFolder.cpp	2 Mar 2004 19:21:12 -0000	1.3
--- RootFolder.cpp	26 Jan 2005 17:31:06 -0000	1.4
***************
*** 42,50 ****
  	std::sort( m_subFolderList.begin(), m_subFolderList.end(), lex);
  	SubFolder_ConstIterator it_f = m_subFolderList.begin();
! 	if  ( it_f != m_subFolderList.end())
  	{
  		mmm +=" subfolders = \"";
  		bool first = true;
! 		while( it_f != m_subFolderList.end())
  		{
  			if (!first) mmm += " ";
--- 42,51 ----
  	std::sort( m_subFolderList.begin(), m_subFolderList.end(), lex);
  	SubFolder_ConstIterator it_f = m_subFolderList.begin();
! 	SubFolder_ConstIterator en_f = m_subFolderList.end();
! 	if  ( it_f != en_f)
  	{
  		mmm +=" subfolders = \"";
  		bool first = true;
! 		while( it_f != en_f)
  		{
  			if (!first) mmm += " ";
***************
*** 63,67 ****
  		bool first = true;
  		FCO_ConstIterator it = m_fcoList.begin();
! 		while ( it != m_fcoList.end())
  		{
  			if ((*it)->isFCO() && !(*it)->isAbstract())
--- 64,69 ----
  		bool first = true;
  		FCO_ConstIterator it = m_fcoList.begin();
! 		FCO_ConstIterator en = m_fcoList.end();
! 		while ( it != en)
  		{
  			if ((*it)->isFCO() && !(*it)->isAbstract())

Index: SetRep.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/SetRep.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SetRep.cpp	30 Jul 2004 00:10:23 -0000	1.6
--- SetRep.cpp	26 Jan 2005 17:31:07 -0000	1.7
***************
*** 59,63 ****
  { 
  	RoleRep::RoleRepSeries_ConstIterator role_it = role_series.begin();
! 	for( ; role_it != role_series.end(); ++role_it)
  		addSetMemberRole( model, *role_it);
  }
--- 59,64 ----
  { 
  	RoleRep::RoleRepSeries_ConstIterator role_it = role_series.begin();
! 	RoleRep::RoleRepSeries_ConstIterator role_en = role_series.end();
! 	for( ; role_it != role_en; ++role_it)
  		addSetMemberRole( model, *role_it);
  }
***************
*** 88,93 ****
  	ModelRepPtrList models = this->modelsIAmPartOfFinal();
  	ModelRepPtrList_Iterator mod_it = models.begin();
  	// for all models that contain this set
! 	for( ; mod_it != models.end(); ++mod_it )
  	{
  		ModelRep* mod_ptr = *mod_it; 
--- 89,95 ----
  	ModelRepPtrList models = this->modelsIAmPartOfFinal();
  	ModelRepPtrList_Iterator mod_it = models.begin();
+ 	ModelRepPtrList_Iterator mod_en = models.end();
  	// for all models that contain this set
! 	for( ; mod_it != mod_en; ++mod_it )
  	{
  		ModelRep* mod_ptr = *mod_it; 
***************
*** 98,102 ****
  		// for all members of the set
  		SetMemberList_ConstIterator member_it = m_memberList.begin();
! 		for( ; member_it != m_memberList.end(); ++member_it)
  		{
  			FCO * member_ptr = *member_it;
--- 100,105 ----
  		// for all members of the set
  		SetMemberList_ConstIterator member_it = m_memberList.begin();
! 		SetMemberList_ConstIterator member_en = m_memberList.end();
! 		for( ; member_it != member_en; ++member_it)
  		{
  			FCO * member_ptr = *member_it;
***************
*** 177,183 ****
  	ModelRepPtrList models = this->modelsIAmPartOfFinal();
  	ModelRepPtrList_ConstIterator mod_it = models.begin();
  
  	// for all models that contain this set
! 	for( ; mod_it != models.end(); ++mod_it )
  	{
  		ModelRep * mod_ptr = *mod_it;
--- 180,187 ----
  	ModelRepPtrList models = this->modelsIAmPartOfFinal();
  	ModelRepPtrList_ConstIterator mod_it = models.begin();
+ 	ModelRepPtrList_ConstIterator mod_en = models.end();
  
  	// for all models that contain this set
! 	for( ; mod_it != mod_en; ++mod_it )
  	{
  		ModelRep * mod_ptr = *mod_it;
***************
*** 185,189 ****
  		// for all members in this model
  		PointerItemSeries_Iterator part_it = m_memberMap[ mod_ptr].begin();
! 		for( ; part_it != this->m_memberMap[mod_ptr].end(); ++part_it)
  		{
  			// insert into dumper_list if not present already
--- 189,194 ----
  		// for all members in this model
  		PointerItemSeries_Iterator part_it = m_memberMap[ mod_ptr].begin();
! 		PointerItemSeries_Iterator part_en = m_memberMap[ mod_ptr].end();
! 		for( ; part_it != part_en; ++part_it)
  		{
  			// insert into dumper_list if not present already
***************
*** 199,203 ****
  	std::sort( dumper_list.begin(), dumper_list.end(), lex);
  	PointerItemSeries_Iterator dump_it = dumper_list.begin();
! 	for( ; dump_it != dumper_list.end(); ++dump_it)
  		mmm += indStr() + "<pointeritem desc = \"" + dump_it->name() + "\"></pointeritem>\n";
  
--- 204,209 ----
  	std::sort( dumper_list.begin(), dumper_list.end(), lex);
  	PointerItemSeries_Iterator dump_it = dumper_list.begin();
! 	PointerItemSeries_Iterator dump_en = dumper_list.end();
! 	for( ; dump_it != dump_en; ++dump_it)
  		mmm += indStr() + "<pointeritem desc = \"" + dump_it->name() + "\"></pointeritem>\n";
  

Index: Sheet.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/Sheet.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Sheet.cpp	22 Sep 2004 22:08:18 -0000	1.9
--- Sheet.cpp	26 Jan 2005 17:31:07 -0000	1.10
***************
*** 41,45 ****
  	{
  		FcoRep_Iterator it( m_fcoRepList.begin() );
! 		for( ; it != m_fcoRepList.end(); ++it)
  		{
  			FcoRep * act_ptr = * it;
--- 41,46 ----
  	{
  		FcoRep_Iterator it( m_fcoRepList.begin() );
! 		FcoRep_Iterator en( m_fcoRepList.end() );
! 		for( ; it != en; ++it)
  		{
  			FcoRep * act_ptr = * it;
***************
*** 49,53 ****
  	{
  		AtomRep_Iterator it = m_atomList.begin();
! 		for( ; it != m_atomList.end(); ++it)
  		{
  			AtomRep * act_ptr = * it;
--- 50,55 ----
  	{
  		AtomRep_Iterator it = m_atomList.begin();
! 		AtomRep_Iterator en = m_atomList.end();
! 		for( ; it != en; ++it)
  		{
  			AtomRep * act_ptr = * it;
***************
*** 57,61 ****
  	{
  		ModelRep_Iterator it = m_modelList.begin();
! 		for( ; it != m_modelList.end(); ++it)
  		{
  			ModelRep * act_ptr = * it;
--- 59,64 ----
  	{
  		ModelRep_Iterator it = m_modelList.begin();
! 		ModelRep_Iterator en = m_modelList.end();
! 		for( ; it != en; ++it)
  		{
  			ModelRep * act_ptr = * it;
***************
*** 65,69 ****
  	{
  		ConnectionRep_Iterator it = m_connList.begin();
! 		for( ; it != m_connList.end(); ++it)
  		{
  			ConnectionRep * act_ptr = * it;
--- 68,73 ----
  	{
  		ConnectionRep_Iterator it = m_connList.begin();
! 		ConnectionRep_Iterator en = m_connList.end();
! 		for( ; it != en; ++it)
  		{
  			ConnectionRep * act_ptr = * it;
***************
*** 73,77 ****
  	{
  		SetRep_Iterator it = m_setList.begin();
! 		for( ; it != m_setList.end(); ++it)
  		{
  			SetRep * act_ptr = * it;
--- 77,82 ----
  	{
  		SetRep_Iterator it = m_setList.begin();
! 		SetRep_Iterator en = m_setList.end();
! 		for( ; it != en; ++it)
  		{
  			SetRep * act_ptr = * it;
***************
*** 81,85 ****
  	{
  		ReferenceRep_Iterator it = m_refList.begin();
! 		for( ; it != m_refList.end(); ++it)
  		{
  			ReferenceRep * act_ptr = * it;
--- 86,91 ----
  	{
  		ReferenceRep_Iterator it = m_refList.begin();
! 		ReferenceRep_Iterator en = m_refList.end();
! 		for( ; it != en; ++it)
  		{
  			ReferenceRep * act_ptr = * it;
***************
*** 89,93 ****
  	{
  		FolderRep_Iterator ai = m_folderList.begin();
! 		for( ; ai != m_folderList.end(); ++ai)
  		{
  			FolderRep * act_ptr = * ai;
--- 95,100 ----
  	{
  		FolderRep_Iterator ai = m_folderList.begin();
! 		FolderRep_Iterator ae = m_folderList.end();
! 		for( ; ai != ae; ++ai)
  		{
  			FolderRep * act_ptr = * ai;
***************
*** 97,101 ****
  	{
  		AspectRep_Iterator ai = m_aspectList.begin();
! 		for( ; ai != m_aspectList.end(); ++ai)
  		{
  			AspectRep * act_ptr = * ai;
--- 104,109 ----
  	{
  		AspectRep_Iterator ai = m_aspectList.begin();
! 		AspectRep_Iterator ae = m_aspectList.end();
! 		for( ; ai != ae; ++ai)
  		{
  			AspectRep * act_ptr = * ai;
***************
*** 105,109 ****
  	{
  		ConstraintRep_Iterator ai = m_constraintList.begin();
! 		for( ; ai != m_constraintList.end(); ++ai)
  		{
  			ConstraintRep * act_ptr = * ai;
--- 113,118 ----
  	{
  		ConstraintRep_Iterator ai = m_constraintList.begin();
! 		ConstraintRep_Iterator ae = m_constraintList.end();
! 		for( ; ai != ae; ++ai)
  		{
  			ConstraintRep * act_ptr = * ai;
***************
*** 113,117 ****
  	{
  		ConstraintFuncRep_Iterator ai = m_constraintFuncList.begin();
! 		for( ; ai != m_constraintFuncList.end(); ++ai)
  		{
  			ConstraintFuncRep * act_ptr = * ai;
--- 122,127 ----
  	{
  		ConstraintFuncRep_Iterator ai = m_constraintFuncList.begin();
! 		ConstraintFuncRep_Iterator ae = m_constraintFuncList.end();
! 		for( ; ai != ae; ++ai)
  		{
  			ConstraintFuncRep * act_ptr = * ai;
***************
*** 121,125 ****
  	{
  		AttributeRep_Iterator ai = m_attributeList.begin();
! 		for( ; ai != m_attributeList.end(); ++ai)
  		{
  			AttributeRep * act_ptr = * ai;
--- 131,136 ----
  	{
  		AttributeRep_Iterator ai = m_attributeList.begin();
! 		AttributeRep_Iterator ae = m_attributeList.end();
! 		for( ; ai != ae; ++ai)
  		{
  			AttributeRep * act_ptr = * ai;
***************
*** 187,191 ****
  {
  	{FcoRep_Iterator it0( m_fcoRepList.begin());
! 	for( ; it0 != m_fcoRepList.end(); ++it0 )
  	{
  		(*it0)->initAttributes();
--- 198,203 ----
  {
  	{FcoRep_Iterator it0( m_fcoRepList.begin());
! 	 FcoRep_Iterator en0( m_fcoRepList.end());
! 	for( ; it0 != en0; ++it0 )
  	{
  		(*it0)->initAttributes();
***************
*** 194,198 ****
  
  	{AtomRep_Iterator it1 = m_atomList.begin();
! 	for( ; it1 != m_atomList.end(); ++it1 )
  	{
  		(*it1)->initAttributes();
--- 206,211 ----
  
  	{AtomRep_Iterator it1 = m_atomList.begin();
! 	 AtomRep_Iterator en1 = m_atomList.end();
! 	for( ; it1 != en1; ++it1 )
  	{
  		(*it1)->initAttributes();
***************
*** 201,205 ****
  
  	{ModelRep_Iterator it2 = m_modelList.begin();
! 	for( ; it2 != m_modelList.end(); ++it2 )
  	{
  		(*it2)->initAttributes();
--- 214,219 ----
  
  	{ModelRep_Iterator it2 = m_modelList.begin();
! 	 ModelRep_Iterator en2 = m_modelList.end();
! 	for( ; it2 != en2; ++it2 )
  	{
  		(*it2)->initAttributes();
***************
*** 208,212 ****
  
  	{ConnectionRep_Iterator it3 = m_connList.begin();
! 	for( ; it3 != m_connList.end(); ++it3 )
  	{
  		(*it3)->initAttributes();
--- 222,227 ----
  
  	{ConnectionRep_Iterator it3 = m_connList.begin();
! 	 ConnectionRep_Iterator en3 = m_connList.end();
! 	for( ; it3 != en3; ++it3 )
  	{
  		(*it3)->initAttributes();
***************
*** 215,219 ****
  
  	{SetRep_Iterator it4 = m_setList.begin();
! 	for( ; it4 != m_setList.end(); ++it4 )
  	{
  		(*it4)->initAttributes();
--- 230,235 ----
  
  	{SetRep_Iterator it4 = m_setList.begin();
! 	 SetRep_Iterator en4 = m_setList.end();
! 	for( ; it4 != en4; ++it4 )
  	{
  		(*it4)->initAttributes();
***************
*** 222,226 ****
  
  	{ReferenceRep_Iterator it5 = m_refList.begin();
! 	for( ; it5 != m_refList.end(); ++it5 )
  	{
  		(*it5)->initAttributes();
--- 238,243 ----
  
  	{ReferenceRep_Iterator it5 = m_refList.begin();
! 	 ReferenceRep_Iterator en5 = m_refList.end();
! 	for( ; it5 != en5; ++it5 )
  	{
  		(*it5)->initAttributes();
***************
*** 229,233 ****
  	
  	{FolderRep_Iterator it6 = m_folderList.begin();
! 	for( ; it6 != m_folderList.end(); ++it6 )
  	{
  		(*it6)->initAttributes();
--- 246,251 ----
  	
  	{FolderRep_Iterator it6 = m_folderList.begin();
! 	 FolderRep_Iterator en6 = m_folderList.end();
! 	for( ; it6 != en6; ++it6 )
  	{
  		(*it6)->initAttributes();
***************
*** 240,244 ****
  {
  	ModelRep_Iterator jt1( m_modelList.begin());
! 	for( ; jt1 != m_modelList.end(); ++jt1)
  	{
  		ModelRep * mod_ptr = *jt1;
--- 258,263 ----
  {
  	ModelRep_Iterator jt1( m_modelList.begin());
! 	ModelRep_Iterator je1( m_modelList.end());
! 	for( ; jt1 != je1; ++jt1)
  	{
  		ModelRep * mod_ptr = *jt1;
***************
*** 430,434 ****
  {
  	FcoRep_Iterator it0( m_fcoRepList.begin());
! 	for( ; it0 != m_fcoRepList.end(); ++it0 )
  	{
  		if ((*it0)->getPtr() == ptr) return *it0;
--- 449,454 ----
  {
  	FcoRep_Iterator it0( m_fcoRepList.begin());
! 	FcoRep_Iterator en0( m_fcoRepList.end());
! 	for( ; it0 != en0; ++it0 )
  	{
  		if ((*it0)->getPtr() == ptr) return *it0;
***************
*** 436,440 ****
  
  	AtomRep_Iterator it1 = m_atomList.begin();
! 	for( ; it1 != m_atomList.end(); ++it1 )
  	{
  		if ((*it1)->getPtr() == ptr) return *it1;
--- 456,461 ----
  
  	AtomRep_Iterator it1 = m_atomList.begin();
! 	AtomRep_Iterator en1 = m_atomList.end();
! 	for( ; it1 != en1; ++it1 )
  	{
  		if ((*it1)->getPtr() == ptr) return *it1;
***************
*** 442,446 ****
  
  	ModelRep_Iterator it2 = m_modelList.begin();
! 	for( ; it2 != m_modelList.end(); ++it2 )
  	{
  		if ((*it2)->getPtr() == ptr) return *it2;
--- 463,468 ----
  
  	ModelRep_Iterator it2 = m_modelList.begin();
! 	ModelRep_Iterator en2 = m_modelList.end();
! 	for( ; it2 != en2; ++it2 )
  	{
  		if ((*it2)->getPtr() == ptr) return *it2;
***************
*** 448,452 ****
  
  	ConnectionRep_Iterator it3 = m_connList.begin();
! 	for( ; it3 != m_connList.end(); ++it3 )
  	{
  		if ((*it3)->getPtr() == ptr) return *it3;
--- 470,475 ----
  
  	ConnectionRep_Iterator it3 = m_connList.begin();
! 	ConnectionRep_Iterator en3 = m_connList.end();
! 	for( ; it3 != en3; ++it3 )
  	{
  		if ((*it3)->getPtr() == ptr) return *it3;
***************
*** 454,458 ****
  
  	SetRep_Iterator it4 = m_setList.begin();
! 	for( ; it4 != m_setList.end(); ++it4 )
  	{
  		if ((*it4)->getPtr() == ptr) return *it4;
--- 477,482 ----
  
  	SetRep_Iterator it4 = m_setList.begin();
! 	SetRep_Iterator en4 = m_setList.end();
! 	for( ; it4 != en4; ++it4 )
  	{
  		if ((*it4)->getPtr() == ptr) return *it4;
***************
*** 460,464 ****
  
  	ReferenceRep_Iterator it5 = m_refList.begin();
! 	for( ; it5 != m_refList.end(); ++it5 )
  	{
  		if ((*it5)->getPtr() == ptr) return *it5;
--- 484,489 ----
  
  	ReferenceRep_Iterator it5 = m_refList.begin();
! 	ReferenceRep_Iterator en5 = m_refList.end();
! 	for( ; it5 != en5; ++it5 )
  	{
  		if ((*it5)->getPtr() == ptr) return *it5;
***************
*** 471,475 ****
  {
  	ReferenceRep_Iterator it( m_refList.begin());
! 	for( ; it != m_refList.end(); ++it )
  	{
  		if ((*it)->getPtr() == ptr) return *it;
--- 496,501 ----
  {
  	ReferenceRep_Iterator it( m_refList.begin());
! 	ReferenceRep_Iterator en( m_refList.end());
! 	for( ; it != en; ++it )
  	{
  		if ((*it)->getPtr() == ptr) return *it;
***************
*** 483,487 ****
  {
  	FolderRep_Iterator it5 = m_folderList.begin();
! 	for( ; it5 != m_folderList.end(); ++it5 )
  	{
  		if ((*it5)->getPtr() == ptr) return *it5;
--- 509,514 ----
  {
  	FolderRep_Iterator it5 = m_folderList.begin();
! 	FolderRep_Iterator en5 = m_folderList.end();
! 	for( ; it5 != en5; ++it5 )
  	{
  		if ((*it5)->getPtr() == ptr) return *it5;
***************
*** 489,493 ****
  
  	AspectRep_Iterator it1( m_aspectList.begin());
! 	for( ; it1 != m_aspectList.end(); ++it1 )
  	{
  		if ((*it1)->getPtr() == ptr) return *it1;
--- 516,521 ----
  
  	AspectRep_Iterator it1( m_aspectList.begin());
! 	AspectRep_Iterator en1( m_aspectList.end());
! 	for( ; it1 != en1; ++it1 )
  	{
  		if ((*it1)->getPtr() == ptr) return *it1;
***************
*** 495,499 ****
  
  	ConstraintRep_Iterator it2 = m_constraintList.begin();
! 	for( ; it2 != m_constraintList.end(); ++it2 )
  	{
  		if ((*it2)->getPtr() == ptr) return *it2;
--- 523,528 ----
  
  	ConstraintRep_Iterator it2 = m_constraintList.begin();
! 	ConstraintRep_Iterator en2 = m_constraintList.end();
! 	for( ; it2 != en2; ++it2 )
  	{
  		if ((*it2)->getPtr() == ptr) return *it2;
***************
*** 501,505 ****
  
  	ConstraintFuncRep_Iterator it3 = m_constraintFuncList.begin();
! 	for( ; it3 != m_constraintFuncList.end(); ++it3 )
  	{
  		if ((*it3)->getPtr() == ptr) return *it3;
--- 530,535 ----
  
  	ConstraintFuncRep_Iterator it3 = m_constraintFuncList.begin();
! 	ConstraintFuncRep_Iterator en3 = m_constraintFuncList.end();
! 	for( ; it3 != en3; ++it3 )
  	{
  		if ((*it3)->getPtr() == ptr) return *it3;
***************
*** 507,511 ****
  
  	AttributeRep_Iterator it4 = m_attributeList.begin();
! 	for( ; it4 != m_attributeList.end(); ++it4 )
  	{
  		if ((*it4)->getPtr() == ptr) return *it4;
--- 537,542 ----
  
  	AttributeRep_Iterator it4 = m_attributeList.begin();
! 	AttributeRep_Iterator en4 = m_attributeList.end();
! 	for( ; it4 != en4; ++it4 )
  	{
  		if ((*it4)->getPtr() == ptr) return *it4;
***************
*** 565,569 ****
  	unsigned int val = 0;
  	std::map<unsigned int,unsigned int>::iterator i = t_m.begin();
! 	for( ; i != t_m.end(); ++i)
  	{
  		++val;
--- 596,601 ----
  	unsigned int val = 0;
  	std::map<unsigned int,unsigned int>::iterator i = t_m.begin();
! 	std::map<unsigned int,unsigned int>::iterator e = t_m.end();
! 	for( ; i != e; ++i)
  	{
  		++val;
***************
*** 690,694 ****
  	// using the ancestors database build up the m_desc and m_anc fields of each fco
  	std::map< unsigned int, std::vector<unsigned int> >::iterator anc_it = ancestors.begin();
! 	for( ; anc_it != ancestors.end(); ++anc_it)
  	{
  		unsigned int id = anc_it->first;
--- 722,727 ----
  	// using the ancestors database build up the m_desc and m_anc fields of each fco
  	std::map< unsigned int, std::vector<unsigned int> >::iterator anc_it = ancestors.begin();
! 	std::map< unsigned int, std::vector<unsigned int> >::iterator anc_en = ancestors.end();
! 	for( ; anc_it != anc_en; ++anc_it)
  	{
  		unsigned int id = anc_it->first;