[GME-commit] GMESRC/Paradigms/MetaGME/BonExtension BON2Component.cpp,1.22,1.23

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

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

Modified Files:
	BON2Component.cpp 
Log Message:
Use Iterators in the old style. (To avoid the Bug that appeared in the metainterpreter.)


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: BON2Component.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/BonExtension/BON2Component.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** BON2Component.cpp	26 Jan 2005 17:31:01 -0000	1.22
--- BON2Component.cpp	21 Jun 2005 20:22:52 -0000	1.23
***************
*** 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);
  }
***************
*** 115,120 ****
  	result.insert( subfolders.begin(), subfolders.end());
  	std::set<Folder>::iterator sub_it = subfolders.begin();
! 	std::set<Folder>::iterator sub_en = subfolders.end();
! 	for( ; sub_it != sub_en; ++sub_it)
  		scanSubFolders( (*sub_it)->getChildFolders(), result);
  }
--- 114,118 ----
  	result.insert( subfolders.begin(), subfolders.end());
  	std::set<Folder>::iterator sub_it = subfolders.begin();
! 	for( ; sub_it != subfolders.end(); ++sub_it)
  		scanSubFolders( (*sub_it)->getChildFolders(), result);
  }
***************
*** 134,144 ****
  		
  		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
  		}
--- 132,140 ----
  		
  		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
  		}
***************
*** 146,161 ****
  		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
  			}
--- 142,155 ----
  		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
  			}
***************
*** 199,207 ****
  
  	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;
--- 193,200 ----
  
  	Entity_Iterator it_1( m_entities.begin());
  
  	Any * new_elem = 0;
  
! 	for( ; it_1 != m_entities.end(); ++it_1 )
  	{
  		if ( it_1->isDeleted()) continue;
***************
*** 261,267 ****
  	}
  
! 	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();
--- 254,259 ----
  	}
  
! 	Relation_Iterator rel_it = m_relations.begin();
! 	for( ; rel_it != m_relations.end(); ++rel_it)
  	{
  		Relation::OPER_TYPE oper = rel_it->getOperation();