[GME-commit] GMESRC/Paradigms/MetaGME/MetaInterpreter2004 BON2Component.cpp,1.27,1.28

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

Update of /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004
In directory escher:/tmp/cvs-serv1752

Modified Files:
	BON2Component.cpp 
Log Message:
Iterators used/handled more conservatively again. (Modified back).


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: BON2Component.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/BON2Component.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** BON2Component.cpp	7 Apr 2005 21:26:23 -0000	1.27
--- BON2Component.cpp	21 Jun 2005 17:16:45 -0000	1.28
***************
*** 95,100 ****
  	std::set<Model> models = model->getChildModels();
  	std::set<Model>::iterator i = models.begin();
! 	std::set<Model>::iterator e = models.end();
! 	for( ; i != e; ++i)
  		scanSubModels( *i);
  }
--- 95,99 ----
  	std::set<Model> models = model->getChildModels();
  	std::set<Model>::iterator i = models.begin();
! 	for( ; i != models.end(); ++i)
  		scanSubModels( *i);
  }
***************
*** 114,119 ****
  	result.insert( subfolders.begin(), subfolders.end());
  	std::set<Folder>::const_iterator sub_it = subfolders.begin();
! 	std::set<Folder>::const_iterator sub_en = subfolders.end();
! 	for( ; sub_it != sub_en; ++sub_it)
  		scanSubFolders( (*sub_it)->getChildFolders(), result);
  }
--- 113,117 ----
  	result.insert( subfolders.begin(), subfolders.end());
  	std::set<Folder>::const_iterator sub_it = subfolders.begin();
! 	for( ; sub_it != subfolders.end(); ++sub_it)
  		scanSubFolders( (*sub_it)->getChildFolders(), result);
  }
***************
*** 133,143 ****
  		
  		std::set<Folder>::iterator folder_it = folders.begin();
! 		std::set<Folder>::iterator folder_en = folders.end();
! 		for( ; folder_it != folder_en; ++folder_it)
  		{
  			std::set<Model> objs = (*folder_it)->getChildModels();
  			std::set<Model>::iterator i = objs.begin();
! 			std::set<Model>::iterator e = objs.end();
! 			for( ; i != e; ++i)
  				scanModels( *i, *folder_it); // scan all root models
  		}
--- 131,139 ----
  		
  		std::set<Folder>::iterator folder_it = folders.begin();
! 		for( ; folder_it != folders.end(); ++folder_it)
  		{
  			std::set<Model> objs = (*folder_it)->getChildModels();
  			std::set<Model>::iterator i = objs.begin();
! 			for( ; i != objs.end(); ++i)
  				scanModels( *i, *folder_it); // scan all root models
  		}
***************
*** 145,160 ****
  		std::set<Folder> library_rf = project->getLibraries(); // get all libraries
  		std::set<Folder>::iterator lib_rf_it = library_rf.begin();
! 		std::set<Folder>::iterator lib_rf_en = library_rf.end();
! 		for( ; lib_rf_it != lib_rf_en; ++lib_rf_it)
  		{
  			folders.clear();
  			scanSubFolders( (*lib_rf_it)->getChildFolders(), folders); // get all subfolders of a library root folder
  			folders.insert( *lib_rf_it); // insert the library root folder too
! 			for( folder_it = folders.begin(), folder_en = folders.end(); folder_it != folder_en; ++folder_it)
  			{
  				std::set<Model> objs = (*folder_it)->getChildModels();
  				std::set<Model>::iterator i = objs.begin();
! 				std::set<Model>::iterator e = objs.end();
! 				for( ; i != e; ++i)
  					scanModels( *i, *lib_rf_it); // scan all library contained models, with the library rootfolder as its registry information holder
  			}
--- 141,154 ----
  		std::set<Folder> library_rf = project->getLibraries(); // get all libraries
  		std::set<Folder>::iterator lib_rf_it = library_rf.begin();
! 		for( ; lib_rf_it != library_rf.end(); ++lib_rf_it)
  		{
  			folders.clear();
  			scanSubFolders( (*lib_rf_it)->getChildFolders(), folders); // get all subfolders of a library root folder
  			folders.insert( *lib_rf_it); // insert the library root folder too
! 			for( folder_it = folders.begin(); folder_it != folders.end(); ++folder_it)
  			{
  				std::set<Model> objs = (*folder_it)->getChildModels();
  				std::set<Model>::iterator i = objs.begin();
! 				for( ; i != objs.end(); ++i)
  					scanModels( *i, *lib_rf_it); // scan all library contained models, with the library rootfolder as its registry information holder
  			}
***************
*** 209,217 ****
  
  	Entity_Iterator it_1( m_entities.begin());
- 	Entity_Iterator it_e( m_entities.end());
  
  	Any * new_elem = 0;
  
! 	for( ; it_1 != it_e; ++it_1 )
  	{
  		if ( it_1->isDeleted()) continue;
--- 203,210 ----
  
  	Entity_Iterator it_1( m_entities.begin());
  
  	Any * new_elem = 0;
  
! 	for( ; it_1 != m_entities.end(); ++it_1 )
  	{
  		if ( it_1->isDeleted()) continue;
***************
*** 274,280 ****
  	}
  
! 	Relation_Iterator rel_it( m_relations.begin());
! 	Relation_Iterator rel_en( m_relations.end());
! 	for( ; rel_it != rel_en; ++rel_it)
  	{
  		Relation::OPER_TYPE oper = rel_it->getOperation();
--- 267,272 ----
  	}
  
! 	Relation_Iterator rel_it = m_relations.begin();
! 	for( ; rel_it != m_relations.end(); ++rel_it)
  	{
  		Relation::OPER_TYPE oper = rel_it->getOperation();