[GME-commit] GMESRC/Paradigms/MetaGME/MetaInterpreter2004 MetaGME2004.vcproj,NONE,1.1 BON2Component.cpp,1.25,1.26 BON2Engine.cpp,1.3,1.4 Component.rc,1.9,1.10 Regexp.h,1.1,1.2 StdAfx.h,1.1,1.2 logger.h,1.4,1.5 MetaGME2004.dsp,1.16,NONE

gme-commit at list.isis.vanderbilt.edu gme-commit at list.isis.vanderbilt.edu
Wed Jan 26 11:31:39 CST 2005 

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

Modified Files:
	BON2Component.cpp BON2Engine.cpp Component.rc Regexp.h 
	StdAfx.h logger.h 
Added Files:
	MetaGME2004.vcproj 
Removed Files:
	MetaGME2004.dsp 
Log Message:
Checkin for VC7.1 upgrade


CVS User: zolmol

--- NEW FILE: MetaGME2004.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="7.10"
	Name="MetaGME2004"
	SccProjectName=""
	SccLocalPath=""
	Keyword="AtlProj">
	<Platforms>
		<Platform
			Name="Win32"/>
	</Platforms>
	<Configurations>
		<Configuration
			Name="ReleaseNoUserInput|Win32"
			OutputDirectory=".\ReleaseNoUserInput"
			IntermediateDirectory=".\ReleaseNoUserInput"
			ConfigurationType="2"
			UseOfMFC="2"
[...1883 lines suppressed...]
			<File
				RelativePath="CompIcon.ico">
			</File>
			<File
				RelativePath="icon2.ico">
			</File>
			<File
				RelativePath="iconDN.ico">
			</File>
			<File
				RelativePath="iconUP.ico">
			</File>
		</Filter>
		<File
			RelativePath="ConfigureComponent.exe">
		</File>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

Index: BON2Component.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/BON2Component.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** BON2Component.cpp	5 Nov 2004 21:25:07 -0000	1.25
--- BON2Component.cpp	26 Jan 2005 17:31:05 -0000	1.26
***************
*** 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);
  }
***************
*** 112,117 ****
  
  	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);
  }
--- 113,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);
  }
***************
*** 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
  		}
--- 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
  		}
***************
*** 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
  			}
--- 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
  			}
***************
*** 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;
--- 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;
***************
*** 264,269 ****
  	}
  
! 	Relation_Iterator rel_it = m_relations.begin();
! 	for( ; rel_it != m_relations.end(); ++rel_it)
  	{
  		Relation::OPER_TYPE oper = rel_it->getOperation();
--- 271,277 ----
  	}
  
! 	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();
***************
*** 340,343 ****
--- 348,352 ----
  }
  
+ 
  // ====================================================
  // This is the main component method for Interpereters and Plugins.
***************
*** 347,350 ****
--- 356,360 ----
  	// ======================
  	// Insert application specific code here
+ 
  	global_vars.silent_mode = (lParam == GME_SILENT_MODE);
  	//global_vars.silent_mode = true;

Index: BON2Engine.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/BON2Engine.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BON2Engine.cpp	19 Aug 2004 18:29:50 -0000	1.3
--- BON2Engine.cpp	26 Jan 2005 17:31:05 -0000	1.4
***************
*** 726,735 ****
  	}
  
- #ifdef NOUSERINPUT
- 	{
- 		res = true;
- 		dlg->m_result = dlg->m_dn;
- 	}
- #else
  	if( global_vars.silent_mode)
  	{
--- 726,729 ----
***************
*** 742,746 ****
  		if( !dlg->m_dn.empty())	res = dlg->DoModal() == IDOK;
  	}
- #endif
  
  	if( res)
--- 736,739 ----

Index: Component.rc
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Component.rc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Component.rc	5 Nov 2004 21:25:08 -0000	1.9
--- Component.rc	26 Jan 2005 17:31:06 -0000	1.10
***************
*** 167,171 ****
  STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Global Aspect Order Dialogue"
! FONT 8, "MS Sans Serif", 0, 0, 0x1
  BEGIN
      DEFPUSHBUTTON   "OK",IDOK,15,120,50,14
--- 167,171 ----
  STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Global Aspect Order Dialogue"
! FONT 8, "MS Sans Serif"
  BEGIN
      DEFPUSHBUTTON   "OK",IDOK,15,120,50,14

Index: Regexp.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/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:27 -0000	1.1
--- Regexp.h	26 Jan 2005 17:31:06 -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/MetaInterpreter2004/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:27 -0000	1.1
--- StdAfx.h	26 Jan 2005 17:31:06 -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

Index: logger.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/logger.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** logger.h	30 Jul 2004 23:03:04 -0000	1.4
--- logger.h	26 Jan 2005 17:31:06 -0000	1.5
***************
*** 41,52 ****
  	global_vars.err << MSG_INFO << msg << "\n";
  #if(0)
- #ifdef NOUSERINPUT
- 	ERR_OUT( msg);
- #else
  	if ( global_vars.silent_mode)
  		ERR_OUT( msg);
  	else
  		AfxMessageBox(msg);
- #endif
  	TOF(msg); 
  #endif
--- 41,48 ----

--- MetaGME2004.dsp DELETED ---

More information about the GME-commit mailing list