[GME-commit] GMESRC/Paradigms/MetaGME/BonExtension/Rep Any.cpp,1.14,1.15

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

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

Modified Files:
	Any.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: Any.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/BonExtension/Rep/Any.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Any.cpp	31 Dec 2004 19:51:20 -0000	1.14
--- Any.cpp	21 Jun 2005 20:22:53 -0000	1.15
***************
*** 368,376 ****
  		// put the regnodes into a map, the key will be the node's name, thus ordering is provided
  		std::map< std::string, BON::RegistryNode, StringLex> aliases, enums, exceptions, operations, structures;
! 		std::map< std::string, BON::RegistryNode, StringLex>::iterator iter, itend;
  		std::set<BON::RegistryNode> all_nodes = rn->getChildren(); // inquire all children
  		std::set<BON::RegistryNode>::const_iterator all_iter = all_nodes.begin();
! 		std::set<BON::RegistryNode>::const_iterator all_itend = all_nodes.end();
! 		for( ; all_iter != all_itend; ++all_iter)
  		{
  			std::string nm = (*all_iter)->getName();
--- 368,375 ----
  		// put the regnodes into a map, the key will be the node's name, thus ordering is provided
  		std::map< std::string, BON::RegistryNode, StringLex> aliases, enums, exceptions, operations, structures;
! 		std::map< std::string, BON::RegistryNode, StringLex>::iterator iter;
  		std::set<BON::RegistryNode> all_nodes = rn->getChildren(); // inquire all children
  		std::set<BON::RegistryNode>::const_iterator all_iter = all_nodes.begin();
! 		for( ; all_iter != all_nodes.end(); ++all_iter)
  		{
  			std::string nm = (*all_iter)->getName();
***************
*** 385,415 ****
  
  		// aliases first
! 		iter  = aliases.begin();
! 		itend = aliases.end();
! 		for( ; iter != itend; ++iter)
  			mof += parseMOFOperation( iter->second->getValue()) + "\n";
  
  		// then enums
! 		iter  = enums.begin();
! 		itend = enums.end();
! 		for( ; iter != itend; ++iter)
  			mof += parseMOFOperation( iter->second->getValue()) + "\n";
  
  		// structures
! 		iter  = structures.begin();
! 		itend = structures.end();
! 		for( ; iter != itend; ++iter)
  			mof += parseMOFOperation( iter->second->getValue()) + "\n";
  
  		// exceptions
! 		iter  = exceptions.begin();
! 		itend = exceptions.end();
! 		for( ; iter != itend; ++iter)
  			mof += parseMOFException( iter->second->getValue()) + "\n";
  
  		// operations
! 		iter  = operations.begin();
! 		itend = operations.end();
! 		for( ; iter != itend; ++iter)
  			mof += parseMOFOperation( iter->second->getValue()) + "\n";
  
--- 384,404 ----
  
  		// aliases first
! 		for( iter = aliases.begin(); iter != aliases.end(); ++iter)
  			mof += parseMOFOperation( iter->second->getValue()) + "\n";
  
  		// then enums
! 		for( iter = enums.begin(); iter != enums.end(); ++iter)
  			mof += parseMOFOperation( iter->second->getValue()) + "\n";
  
  		// structures
! 		for( iter = structures.begin(); iter != structures.end(); ++iter)
  			mof += parseMOFOperation( iter->second->getValue()) + "\n";
  
  		// exceptions
! 		for( iter = exceptions.begin(); iter != exceptions.end(); ++iter)
  			mof += parseMOFException( iter->second->getValue()) + "\n";
  
  		// operations
! 		for( iter = operations.begin(); iter != operations.end(); ++iter)
  			mof += parseMOFOperation( iter->second->getValue()) + "\n";