[GME-commit] GMESRC/Paradigms/MetaGME/BonExtension BonExt.vcproj,NONE,1.1 BON2Component.cpp,1.21,1.22 Regexp.h,1.1,1.2 StdAfx.h,1.1,1.2 BonExt.dsp,1.10,NONE

Wed Jan 26 11:31:35 CST 2005

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

Modified Files:
	BON2Component.cpp Regexp.h StdAfx.h 
Added Files:
	BonExt.vcproj 
Removed Files:
	BonExt.dsp 
Log Message:
Checkin for VC7.1 upgrade

CVS User: zolmol

--- NEW FILE: BonExt.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="7.10"
	Name="BonExt"
	SccProjectName=""
	SccLocalPath=""
	Keyword="AtlProj">
	<Platforms>
		<Platform
			Name="Win32"/>
	</Platforms>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory=".\Debug"
			IntermediateDirectory=".\Debug"
			ConfigurationType="2"
			UseOfMFC="2"
[...1319 lines suppressed...]
				</File>
				<File
					RelativePath="GUI\Table.h">
				</File>
			</Filter>
		</Filter>
		<Filter
			Name="Resource Files"
			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
			<File
				RelativePath="CompIcon.ico">
			</File>
		</Filter>
		<File
			RelativePath="ConfigureComponent.exe">
		</File>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

Index: BON2Component.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/BON2Component.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** BON2Component.cpp	21 Oct 2004 02:04:33 -0000	1.21
--- BON2Component.cpp	26 Jan 2005 17:31:01 -0000	1.22
***************
*** 95,99 ****
  	std::set<Model> models = model->getChildModels();
  	std::set<Model>::iterator i = models.begin();
! 	for( ; i != models.end(); ++i)
  		scanSubModels( *i);
  }
--- 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);
  }
***************
*** 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);
  }
--- 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);
  }
***************
*** 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
  		}
--- 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
  		}
***************
*** 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
  			}
--- 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
  			}
***************
*** 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;
--- 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;
***************
*** 254,259 ****
  	}

! 	Relation_Iterator rel_it = m_relations.begin();
! 	for( ; rel_it != m_relations.end(); ++rel_it)
  	{
  		Relation::OPER_TYPE oper = rel_it->getOperation();
--- 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();

Index: Regexp.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Regexp.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Regexp.h	4 Dec 2003 16:45:26 -0000	1.1
--- Regexp.h	26 Jan 2005 17:31:02 -0000	1.2
***************
*** 2,6 ****
  #define __REGEXP_H__

! class CString;
  class regexp;

--- 2,6 ----
  #define __REGEXP_H__

! //class CString;
  class regexp;

Index: StdAfx.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/StdAfx.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StdAfx.h	4 Dec 2003 16:45:26 -0000	1.1
--- StdAfx.h	26 Jan 2005 17:31:02 -0000	1.2
***************
*** 19,22 ****
--- 19,28 ----
  #include <afxdisp.h>

+ #if(1) // stlport
+ #include <stl_user_config.h>
+ #else // ms stl
+ #include <algorithm>
+ #endif
+ 
  #include <atlbase.h>
  //You may derive a class from CComModule and use it if you want to override

--- BonExt.dsp DELETED ---