[GME-commit] GMESRC/GME/MgaUtil AnnotationBrowserDlg.cpp,1.2,1.3 ClosureRes.h,1.1,1.2 CompDlg.cpp,1.14,1.15 CompDlg.h,1.9,1.10 MakeClosure.cpp,1.11,1.12 MakeClosure.h,1.6,1.7 MgaClosure.cpp,1.5,1.6 MgaUtil.dsp,1.26,1.27 RegistryBrowserDlg.cpp,1.4,1.5 StdAfx.h,1.10,1.11

gme-commit at list.isis.vanderbilt.edu gme-commit at list.isis.vanderbilt.edu
Wed Oct 13 11:17:59 CDT 2004


Update of /var/lib/gme/GMESRC/GME/MgaUtil
In directory braindrain:/tmp/cvs-serv20870/MgaUtil

Modified Files:
	AnnotationBrowserDlg.cpp ClosureRes.h CompDlg.cpp CompDlg.h 
	MakeClosure.cpp MakeClosure.h MgaClosure.cpp MgaUtil.dsp 
	RegistryBrowserDlg.cpp StdAfx.h 
Log Message:
GME ported to STLport
-std:: prefix added to stl classes and methods



CVS User: zolmol

Index: AnnotationBrowserDlg.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/AnnotationBrowserDlg.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AnnotationBrowserDlg.cpp	21 Nov 2001 01:57:00 -0000	1.2
--- AnnotationBrowserDlg.cpp	13 Oct 2004 15:17:55 -0000	1.3
***************
*** 204,209 ****
  
  	if (m_wndAnnotation.GetSafeHwnd() && m_wndAnnotationList.GetSafeHwnd()) {
! 		m_wndAnnotationList.SetWindowPos(NULL, 0, origTopRect.bottom, cx*ratio, cy - (origBottomRect.bottom-origBottomRect.top) - origTopRect.bottom, SWP_NOZORDER);
! 		m_wndAnnotation.SetWindowPos(NULL, cx*ratio+GetSystemMetrics(SM_CYFRAME), origTopRect.bottom, cx - (cx*ratio+GetSystemMetrics(SM_CYFRAME)), cy - (origBottomRect.bottom-origBottomRect.top) - origTopRect.bottom, SWP_NOZORDER);
  		m_wndSplitterBar.SetPanes(&m_wndAnnotationList,&m_wndAnnotation);		
  	}
--- 204,209 ----
  
  	if (m_wndAnnotation.GetSafeHwnd() && m_wndAnnotationList.GetSafeHwnd()) {
! 		m_wndAnnotationList.SetWindowPos(NULL, 0, origTopRect.bottom, static_cast<int>(cx*ratio), cy - (origBottomRect.bottom-origBottomRect.top) - origTopRect.bottom, SWP_NOZORDER);
! 		m_wndAnnotation.SetWindowPos(NULL, static_cast<int>(cx*ratio)+GetSystemMetrics(SM_CYFRAME), origTopRect.bottom, cx - (static_cast<int>(cx*ratio)+GetSystemMetrics(SM_CYFRAME)), cy - (origBottomRect.bottom-origBottomRect.top) - origTopRect.bottom, SWP_NOZORDER);
  		m_wndSplitterBar.SetPanes(&m_wndAnnotationList,&m_wndAnnotation);		
  	}
***************
*** 219,223 ****
  		CRect origWnd;
  		wndOK->GetClientRect(&origWnd);
! 		wndOK->MoveWindow(112.0 * ratio, rectDlg.bottom - (rect3.bottom - rect3.top), origWnd.Width(), origWnd.Height());
  	}
  	CWnd* wndCANCEL = this->GetDlgItem(IDCANCEL);
--- 219,223 ----
  		CRect origWnd;
  		wndOK->GetClientRect(&origWnd);
! 		wndOK->MoveWindow(static_cast<int>(112.0 * ratio), rectDlg.bottom - (rect3.bottom - rect3.top), origWnd.Width(), origWnd.Height());
  	}
  	CWnd* wndCANCEL = this->GetDlgItem(IDCANCEL);
***************
*** 225,229 ****
  		CRect origWnd;
  		wndCANCEL->GetClientRect(&origWnd);
! 		wndCANCEL->MoveWindow(242.0 * ratio, rectDlg.bottom - (rect3.bottom - rect3.top), origWnd.Width(), origWnd.Height());
  	}
  
--- 225,229 ----
  		CRect origWnd;
  		wndCANCEL->GetClientRect(&origWnd);
! 		wndCANCEL->MoveWindow(static_cast<int>(242.0 * ratio), rectDlg.bottom - (rect3.bottom - rect3.top), origWnd.Width(), origWnd.Height());
  	}
  

Index: ClosureRes.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/ClosureRes.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ClosureRes.h	2 Jun 2004 21:30:44 -0000	1.1
--- ClosureRes.h	13 Oct 2004 15:17:55 -0000	1.2
***************
*** 9,14 ****
  
  #include "resource.h"
! #include "vector"
! #include "string"
  /////////////////////////////////////////////////////////////////////////////
  // ClosureRes dialog
--- 9,14 ----
  
  #include "resource.h"
! #include <vector>
! #include <string>
  /////////////////////////////////////////////////////////////////////////////
  // ClosureRes dialog
***************
*** 19,23 ****
  public:
  	CClosureRes(CWnd* pParent = NULL);   // standard constructor
! 	vector< string >	m_metaKindsAndFolders;
  
  // Dialog Data
--- 19,23 ----
  public:
  	CClosureRes(CWnd* pParent = NULL);   // standard constructor
! 	std::vector< std::string >	m_metaKindsAndFolders;
  
  // Dialog Data

Index: CompDlg.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/CompDlg.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** CompDlg.cpp	22 Jan 2002 08:42:00 -0000	1.14
--- CompDlg.cpp	13 Oct 2004 15:17:55 -0000	1.15
***************
*** 371,375 ****
  	char buf[300];
  	{
! 		ifstream fin(path, ios::nocreate);
  		if(fin.good()) fin.getline(buf, 300);
  		if(!fin.good()) {
--- 371,375 ----
  	char buf[300];
  	{
! 		std::ifstream fin(path, std::ios::in);//z! ios::nocreate used previously, but if opened for read it won't create in this way
  		if(fin.good()) fin.getline(buf, 300);
  		if(!fin.good()) {

Index: CompDlg.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/CompDlg.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CompDlg.h	28 Jun 2001 05:40:00 -0000	1.9
--- CompDlg.h	13 Oct 2004 15:17:55 -0000	1.10
***************
*** 7,11 ****
  // CompDlg.h : header file
  //
! #include <fstream.h>
  
  /////////////////////////////////////////////////////////////////////////////
--- 7,11 ----
  // CompDlg.h : header file
  //
! #include <fstream> //<fstream.h>
  
  /////////////////////////////////////////////////////////////////////////////

Index: MakeClosure.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/MakeClosure.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** MakeClosure.cpp	29 Sep 2004 21:00:28 -0000	1.11
--- MakeClosure.cpp	13 Oct 2004 15:17:55 -0000	1.12
***************
*** 2,9 ****
  #include "MakeClosure.h"
  
! #include "string"
! #include "map"
! #include "set"
! #include "algorithm"
  //
  // C O M M E N T
--- 2,9 ----
  #include "MakeClosure.h"
  
! #include <string>
! #include <map>
! #include <set>
! #include <algorithm>
  //
  // C O M M E N T
***************
*** 12,16 ****
  // object hierarchy
  //
! const string rootfolder_str = "RootFolder";
  
  inline void nop( IMgaMetaFCO * f)
--- 12,16 ----
  // object hierarchy
  //
! const std::string rootfolder_str = "RootFolder";
  
  inline void nop( IMgaMetaFCO * f)
***************
*** 18,22 ****
  #ifdef _DEBUG
  	CComObjPtr<IMgaMetaFCO> ff( f);
! 	CComBstrObj name; string s;
  	COMTHROW( ff->get_Name( PutOut( name)));
  	CopyTo( name, s);
--- 18,22 ----
  #ifdef _DEBUG
  	CComObjPtr<IMgaMetaFCO> ff( f);
! 	CComBstrObj name; std::string s;
  	COMTHROW( ff->get_Name( PutOut( name)));
  	CopyTo( name, s);
***************
*** 29,33 ****
  #ifdef _DEBUG
  	CComObjPtr<IMgaMetaFolder> ff( f);
! 	CComBstrObj name; string s;
  	COMTHROW( ff->get_Name( PutOut( name)));
  	CopyTo( name, s);
--- 29,33 ----
  #ifdef _DEBUG
  	CComObjPtr<IMgaMetaFolder> ff( f);
! 	CComBstrObj name; std::string s;
  	COMTHROW( ff->get_Name( PutOut( name)));
  	CopyTo( name, s);
***************
*** 40,44 ****
  #ifdef _DEBUG
  	CComObjPtr<IMgaMetaModel> ff( f);
! 	CComBstrObj name; string s;
  	COMTHROW( ff->get_Name( PutOut( name)));
  	CopyTo( name, s);
--- 40,44 ----
  #ifdef _DEBUG
  	CComObjPtr<IMgaMetaModel> ff( f);
! 	CComBstrObj name; std::string s;
  	COMTHROW( ff->get_Name( PutOut( name)));
  	CopyTo( name, s);
***************
*** 51,55 ****
  #ifdef _DEBUG
  	CComObjPtr<IMgaFCO> ff( f);
! 	CComBstrObj name; string s;
  	COMTHROW( ff->get_Name( PutOut( name)));
  	CopyTo( name, s);
--- 51,55 ----
  #ifdef _DEBUG
  	CComObjPtr<IMgaFCO> ff( f);
! 	CComBstrObj name; std::string s;
  	COMTHROW( ff->get_Name( PutOut( name)));
  	CopyTo( name, s);
***************
*** 62,66 ****
  #ifdef _DEBUG
  	CComObjPtr<IMgaFolder> ff( f);
! 	CComBstrObj name; string s;
  	COMTHROW( ff->get_Name( PutOut( name)));
  	CopyTo( name, s);
--- 62,66 ----
  #ifdef _DEBUG
  	CComObjPtr<IMgaFolder> ff( f);
! 	CComBstrObj name; std::string s;
  	COMTHROW( ff->get_Name( PutOut( name)));
  	CopyTo( name, s);
***************
*** 73,77 ****
  #ifdef _DEBUG
  	CComObjPtr<IMgaModel> ff( f);
! 	CComBstrObj name; string s;
  	COMTHROW( ff->get_Name( PutOut( name)));
  	CopyTo( name, s);
--- 73,77 ----
  #ifdef _DEBUG
  	CComObjPtr<IMgaModel> ff( f);
! 	CComBstrObj name; std::string s;
  	COMTHROW( ff->get_Name( PutOut( name)));
  	CopyTo( name, s);
***************
*** 214,218 ****
  		checkMeta( m_topFolds, m_topFcos);
  
! 		string res_str;
  		getAccKindsInString( res_str);
  		if( !res_str.empty()) send2Console( "[Closure Copy] The following kinds may accept the copied data: " + res_str + ".");
--- 214,218 ----
  		checkMeta( m_topFolds, m_topFcos);
  
! 		std::string res_str;
  		getAccKindsInString( res_str);
  		if( !res_str.empty()) send2Console( "[Closure Copy] The following kinds may accept the copied data: " + res_str + ".");
***************
*** 224,228 ****
  		checkMeta( m_topFolds, m_topFcos);
  
! 		string res_str;
  		getAccKindsInString( res_str);
  		if( !res_str.empty()) send2Console( "[Closure Copy] The following kinds may accept the copied data: " + res_str + ".");
--- 224,228 ----
  		checkMeta( m_topFolds, m_topFcos);
  
! 		std::string res_str;
  		getAccKindsInString( res_str);
  		if( !res_str.empty()) send2Console( "[Closure Copy] The following kinds may accept the copied data: " + res_str + ".");
***************
*** 251,256 ****
  			// check if model parent is in the selected set of objects
  			// and if *i is already in the parentless
! 			if ( find_if( m_selFcos.begin(), m_selFcos.end(), GmeEqual( fco)) == m_selFcos.end() &&
! 				 find_if( parentless.begin(), parentless.end(), GmeEqual( *i)) == parentless.end())
  			{
  				parentless.push_back( *i);
--- 251,256 ----
  			// check if model parent is in the selected set of objects
  			// and if *i is already in the parentless
! 			if ( std::find_if( m_selFcos.begin(), m_selFcos.end(), GmeEqual( fco)) == m_selFcos.end() &&
! 				 std::find_if( parentless.begin(), parentless.end(), GmeEqual( *i)) == parentless.end())
  			{
  				parentless.push_back( *i);
***************
*** 265,270 ****
  				// check if folder parent is in the selected set of objects
  				// and if *i is already in the parentless
! 				if ( find_if( m_selFolds.begin(), m_selFolds.end(), GmeEqual( parent)) == m_selFolds.end() &&
! 					 find_if( parentless.begin(), parentless.end(), GmeEqual( *i)) == parentless.end())
  				{
  					parentless.push_back( *i);	
--- 265,270 ----
  				// check if folder parent is in the selected set of objects
  				// and if *i is already in the parentless
! 				if ( std::find_if( m_selFolds.begin(), m_selFolds.end(), GmeEqual( parent)) == m_selFolds.end() &&
! 					 std::find_if( parentless.begin(), parentless.end(), GmeEqual( *i)) == parentless.end())
  				{
  					parentless.push_back( *i);	
***************
*** 287,292 ****
  		{
  			// check if parent is in the selected set of objects
! 			if ( find_if( m_selFolds.begin(), m_selFolds.end(), GmeEqual( parent)) == m_selFolds.end() &&
! 				 find_if( parentless_folders.begin(), parentless_folders.end(), GmeEqual( *k)) == parentless_folders.end())
  			{
  				parentless_folders.push_back( *k);
--- 287,292 ----
  		{
  			// check if parent is in the selected set of objects
! 			if ( std::find_if( m_selFolds.begin(), m_selFolds.end(), GmeEqual( parent)) == m_selFolds.end() &&
! 				 std::find_if( parentless_folders.begin(), parentless_folders.end(), GmeEqual( *k)) == parentless_folders.end())
  			{
  				parentless_folders.push_back( *k);
***************
*** 824,828 ****
  }
  
! void CMakeClosure::insertNew( const string& id, bool is_top /* = false */)
  {
  	CComObjPtr<IMgaObject> obj;
--- 824,828 ----
  }
  
! void CMakeClosure::insertNew( const std::string& id, bool is_top /* = false */)
  {
  	CComObjPtr<IMgaObject> obj;
***************
*** 849,853 ****
  				{
  					nop( model);
! 					if ( find_if( m_topFcos.begin(), m_topFcos.end(), GmeEqual( model)) == m_topFcos.end())
  						m_topFcos.push_back( model);
  				}
--- 849,853 ----
  				{
  					nop( model);
! 					if ( std::find_if( m_topFcos.begin(), m_topFcos.end(), GmeEqual( model)) == m_topFcos.end())
  						m_topFcos.push_back( model);
  				}
***************
*** 865,869 ****
  				{
  					nop( folder);
! 					if ( find_if( m_topFolds.begin(), m_topFolds.end(), GmeEqual( folder)) == m_topFolds.end())
  						m_topFolds.push_back( folder);
  				}
--- 865,869 ----
  				{
  					nop( folder);
! 					if ( std::find_if( m_topFolds.begin(), m_topFolds.end(), GmeEqual( folder)) == m_topFolds.end())
  						m_topFolds.push_back( folder);
  				}
***************
*** 926,945 ****
  bool CMakeClosure::findAmongSelected(const CComObjPtr<IMgaFCO>& in)
  {
! 	return find_if( m_selFcos.begin(), m_selFcos.end(), GmeEqual( in)) != m_selFcos.end();
  }
  
  bool CMakeClosure::findAmongSelected(const CComObjPtr<IMgaFolder>& in)
  {
! 	return find_if( m_selFolds.begin(), m_selFolds.end(), GmeEqual( in)) != m_selFolds.end();
  }
  
  bool CMakeClosure::findAmongNews(const CComObjPtr<IMgaFCO>& in)
  {
! 	return find_if( m_newlySelFcos.begin(), m_newlySelFcos.end(), GmeEqual( in)) != m_newlySelFcos.end();
  }
  
  bool CMakeClosure::findAmongNews(const CComObjPtr<IMgaFolder>& in)
  {
! 	return find_if( m_newlySelFolds.begin(), m_newlySelFolds.end(), GmeEqual( in)) != m_newlySelFolds.end();
  }
  
--- 926,945 ----
  bool CMakeClosure::findAmongSelected(const CComObjPtr<IMgaFCO>& in)
  {
! 	return std::find_if( m_selFcos.begin(), m_selFcos.end(), GmeEqual( in)) != m_selFcos.end();
  }
  
  bool CMakeClosure::findAmongSelected(const CComObjPtr<IMgaFolder>& in)
  {
! 	return std::find_if( m_selFolds.begin(), m_selFolds.end(), GmeEqual( in)) != m_selFolds.end();
  }
  
  bool CMakeClosure::findAmongNews(const CComObjPtr<IMgaFCO>& in)
  {
! 	return std::find_if( m_newlySelFcos.begin(), m_newlySelFcos.end(), GmeEqual( in)) != m_newlySelFcos.end();
  }
  
  bool CMakeClosure::findAmongNews(const CComObjPtr<IMgaFolder>& in)
  {
! 	return std::find_if( m_newlySelFolds.begin(), m_newlySelFolds.end(), GmeEqual( in)) != m_newlySelFolds.end();
  }
  
***************
*** 976,980 ****
  	for( ; fol_it != fo_parents.end(); ++fol_it)
  	{
! 		if ( find_if( m_selFolds.begin(), m_selFolds.end(), GmeEqual( *fol_it)) == m_selFolds.end())
  			m_selFolds.push_back( *fol_it);
  		else
--- 976,980 ----
  	for( ; fol_it != fo_parents.end(); ++fol_it)
  	{
! 		if ( std::find_if( m_selFolds.begin(), m_selFolds.end(), GmeEqual( *fol_it)) == m_selFolds.end())
  			m_selFolds.push_back( *fol_it);
  		else
***************
*** 988,992 ****
  		CComObjPtr<IMgaFCO> fco;
  		COMTHROW( ::QueryInterface( *mod_it, fco));
! 		if ( fco && find_if( m_selFcos.begin(), m_selFcos.end(), GmeEqual( fco)) == m_selFcos.end())
  			m_selFcos.push_back( fco);
  		else
--- 988,992 ----
  		CComObjPtr<IMgaFCO> fco;
  		COMTHROW( ::QueryInterface( *mod_it, fco));
! 		if ( fco && std::find_if( m_selFcos.begin(), m_selFcos.end(), GmeEqual( fco)) == m_selFcos.end())
  			m_selFcos.push_back( fco);
  		else
***************
*** 995,999 ****
  }
  
! string CMakeClosure::processUpward( IMgaObject *obj, CComObjPtrVector<IMgaFolder>& f_parents, CComObjPtrVector<IMgaModel>& m_parents)
  {
  	ASSERT( obj != NULL );
--- 995,999 ----
  }
  
! std::string CMakeClosure::processUpward( IMgaObject *obj, CComObjPtrVector<IMgaFolder>& f_parents, CComObjPtrVector<IMgaModel>& m_parents)
  {
  	ASSERT( obj != NULL );
***************
*** 1018,1022 ****
  			while ( m)
  			{
! 				if ( find_if( m_parents.begin(), m_parents.end(), GmeEqual( m)) == m_parents.end())
  					m_parents.push_back( m);
  
--- 1018,1022 ----
  			while ( m)
  			{
! 				if ( std::find_if( m_parents.begin(), m_parents.end(), GmeEqual( m)) == m_parents.end())
  					m_parents.push_back( m);
  
***************
*** 1035,1039 ****
  			while( f)
  			{
! 				if ( find_if( f_parents.begin(), f_parents.end(), GmeEqual( f)) == f_parents.end())
  					f_parents.push_back( f);
  				
--- 1035,1039 ----
  			while( f)
  			{
! 				if ( std::find_if( f_parents.begin(), f_parents.end(), GmeEqual( f)) == f_parents.end())
  					f_parents.push_back( f);
  				
***************
*** 1054,1058 ****
  			while( f)
  			{
! 				if ( find_if( f_parents.begin(), f_parents.end(), GmeEqual( f)) == f_parents.end())
  					f_parents.push_back( f);
  
--- 1054,1058 ----
  			while( f)
  			{
! 				if ( std::find_if( f_parents.begin(), f_parents.end(), GmeEqual( f)) == f_parents.end())
  					f_parents.push_back( f);
  
***************
*** 1078,1083 ****
  	CComObjPtrVector<IMgaModel> m_parents;
  
! 	map< int, string> path_map;
! 	map< int, string> name_map;
  
  	unsigned int k = 0;
--- 1078,1083 ----
  	CComObjPtrVector<IMgaModel> m_parents;
  
! 	std::map< int, std::string> path_map;
! 	std::map< int, std::string> name_map;
  
  	unsigned int k = 0;
***************
*** 1085,1089 ****
  	for( ; i != m_topFcos.end(); ++i, ++k)
  	{
! 		string res, resid;
  
  		// initialize the values
--- 1085,1089 ----
  	for( ; i != m_topFcos.end(); ++i, ++k)
  	{
! 		std::string res, resid;
  
  		// initialize the values
***************
*** 1103,1107 ****
  		{
  			CComBstrObj name, id;
! 			string s, ids;
  			COMTHROW( m->get_Name( PutOut(name)) );
  			COMTHROW( m->get_ID( PutOut( id)) );
--- 1103,1107 ----
  		{
  			CComBstrObj name, id;
! 			std::string s, ids;
  			COMTHROW( m->get_Name( PutOut(name)) );
  			COMTHROW( m->get_ID( PutOut( id)) );
***************
*** 1112,1116 ****
  
  			
! 			if ( find_if( m_parents.begin(), m_parents.end(), GmeEqual( m)) == m_parents.end())
  				m_parents.push_back( m);
  
--- 1112,1116 ----
  
  			
! 			if ( std::find_if( m_parents.begin(), m_parents.end(), GmeEqual( m)) == m_parents.end())
  				m_parents.push_back( m);
  
***************
*** 1130,1134 ****
  		{
  			CComBstrObj name, id;
! 			string s, ids;
  			COMTHROW( f->get_Name( PutOut( name)) );
  			COMTHROW( f->get_ID( PutOut( id)) );
--- 1130,1134 ----
  		{
  			CComBstrObj name, id;
! 			std::string s, ids;
  			COMTHROW( f->get_Name( PutOut( name)) );
  			COMTHROW( f->get_ID( PutOut( id)) );
***************
*** 1138,1142 ****
  			resid = ids + '/' + resid;
  
! 			if ( find_if( f_parents.begin(), f_parents.end(), GmeEqual( f)) == f_parents.end())
  				f_parents.push_back( f);
  			
--- 1138,1142 ----
  			resid = ids + '/' + resid;
  
! 			if ( std::find_if( f_parents.begin(), f_parents.end(), GmeEqual( f)) == f_parents.end())
  				f_parents.push_back( f);
  			
***************
*** 1153,1157 ****
  	for(  ; j != m_topFolds.end(); ++j, ++k)
  	{
! 		string res, resid;
  
  		// initialize the values
--- 1153,1157 ----
  	for(  ; j != m_topFolds.end(); ++j, ++k)
  	{
! 		std::string res, resid;
  
  		// initialize the values
***************
*** 1171,1175 ****
  		{
  			CComBstrObj name, id;
! 			string s, ids;
  			COMTHROW( f->get_Name( PutOut(name)) );
  			COMTHROW( f->get_ID( PutOut( id)) );
--- 1171,1175 ----
  		{
  			CComBstrObj name, id;
! 			std::string s, ids;
  			COMTHROW( f->get_Name( PutOut(name)) );
  			COMTHROW( f->get_ID( PutOut( id)) );
***************
*** 1179,1183 ****
  			resid = ids + '/' + resid;
  
! 			if ( find_if( f_parents.begin(), f_parents.end(), GmeEqual( f)) == f_parents.end())
  				f_parents.push_back( f);
  
--- 1179,1183 ----
  			resid = ids + '/' + resid;
  
! 			if ( std::find_if( f_parents.begin(), f_parents.end(), GmeEqual( f)) == f_parents.end())
  				f_parents.push_back( f);
  
***************
*** 1195,1203 ****
  		return;
  
! 	string common_path = path_map[ 0];
! 	string common_name = name_map[ 0];
  	for( unsigned int l = 1; l < k; ++l)
  	{
! 		string next_path = path_map[ l];
  		unsigned int minlen = min( next_path.length(), common_path.length());
  
--- 1195,1203 ----
  		return;
  
! 	std::string common_path = path_map[ 0];
! 	std::string common_name = name_map[ 0];
  	for( unsigned int l = 1; l < k; ++l)
  	{
! 		std::string next_path = path_map[ l];
  		unsigned int minlen = min( next_path.length(), common_path.length());
  
***************
*** 1220,1224 ****
  		common_path = common_path.substr( 0, pos_of_last_slash + 1); // tailing '/' needed
  
! 		string next_name = name_map[ l];
  		minlen = min( next_name.length(), common_name.length());
  
--- 1220,1224 ----
  		common_path = common_path.substr( 0, pos_of_last_slash + 1); // tailing '/' needed
  
! 		std::string next_name = name_map[ l];
  		minlen = min( next_name.length(), common_name.length());
  
***************
*** 1239,1247 ****
  	common_path = common_path.substr( 0, common_path.length() - 1);
  
! 	string common_root_name; // the common model's name
  	int pos = common_name.rfind( "/"); // tailing '/' removed previously
  	common_root_name = common_name.substr( pos + 1, common_name.length() - pos - 1);
  
! 	string common_root_id; // the common model's id
  	pos = common_path.rfind( "/"); // tailing '/' removed previously
  	common_root_id = common_path.substr( pos + 1, common_path.length() - pos - 1);
--- 1239,1247 ----
  	common_path = common_path.substr( 0, common_path.length() - 1);
  
! 	std::string common_root_name; // the common model's name
  	int pos = common_name.rfind( "/"); // tailing '/' removed previously
  	common_root_name = common_name.substr( pos + 1, common_name.length() - pos - 1);
  
! 	std::string common_root_id; // the common model's id
  	pos = common_path.rfind( "/"); // tailing '/' removed previously
  	common_root_id = common_path.substr( pos + 1, common_path.length() - pos - 1);
***************
*** 1274,1278 ****
  	for( l = 0; l < k; ++l)
  	{
! 		string rest_of_path = path_map[ l];
  		rest_of_path = rest_of_path.substr( common_path.length() + 1, rest_of_path.length() - common_path.length() - 1); 
  
--- 1274,1278 ----
  	for( l = 0; l < k; ++l)
  	{
! 		std::string rest_of_path = path_map[ l];
  		rest_of_path = rest_of_path.substr( common_path.length() + 1, rest_of_path.length() - common_path.length() - 1); 
  
***************
*** 1280,1284 ****
  		while( !rest_of_path.empty())
  		{
! 			string next_id;
  			pos = rest_of_path.find( '/'); // no leading '/' but a tailing '/' is there anyway
  			ASSERT( pos); // pos != 0
--- 1280,1284 ----
  		while( !rest_of_path.empty())
  		{
! 			std::string next_id;
  			pos = rest_of_path.find( '/'); // no leading '/' but a tailing '/' is there anyway
  			ASSERT( pos); // pos != 0
***************
*** 1329,1333 ****
  	// looking for potential folder containers
  	unsigned int how_many_libraries = 0;
! 	set < string > goody_folds;
  	bool goody_folds_init_done = false;
  	for( CComObjPtrVector<IMgaFolder>::const_iterator fold_it = p_folds.begin(); fold_it != p_folds.end(); ++fold_it)
--- 1329,1333 ----
  	// looking for potential folder containers
  	unsigned int how_many_libraries = 0;
! 	std::set < std::string > goody_folds;
  	bool goody_folds_init_done = false;
  	for( CComObjPtrVector<IMgaFolder>::const_iterator fold_it = p_folds.begin(); fold_it != p_folds.end(); ++fold_it)
***************
*** 1340,1344 ****
  		CComBstrObj kind_name;
  		COMTHROW( f_meta->get_Name( PutOut(kind_name)) );
! 		string kind_nm;
  		CopyTo( kind_name, kind_nm);
  		if ( kind_nm == rootfolder_str)
--- 1340,1344 ----
  		CComBstrObj kind_name;
  		COMTHROW( f_meta->get_Name( PutOut(kind_name)) );
! 		std::string kind_nm;
  		CopyTo( kind_name, kind_nm);
  		if ( kind_nm == rootfolder_str)
***************
*** 1349,1353 ****
  
  		// will store the folder parents this folder may be part of
! 		set < string > actual;
  		CComObjPtrVector<IMgaMetaFolder> act_vec;
  		f_meta->get_UsedInFolders( PutOut( act_vec) );
--- 1349,1353 ----
  
  		// will store the folder parents this folder may be part of
! 		std::set < std::string > actual;
  		CComObjPtrVector<IMgaMetaFolder> act_vec;
  		f_meta->get_UsedInFolders( PutOut( act_vec) );
***************
*** 1356,1360 ****
  			CComBstrObj name;
  			COMTHROW( (*a_i)->get_Name( PutOut(name)) );
! 			string s;
  			CopyTo( name, s);
  
--- 1356,1360 ----
  			CComBstrObj name;
  			COMTHROW( (*a_i)->get_Name( PutOut(name)) );
! 			std::string s;
  			CopyTo( name, s);
  
***************
*** 1365,1370 ****
  		if ( goody_folds_init_done)
  		{
! 			set < string > res;
! 			set_intersection( goody_folds.begin(), goody_folds.end(), actual.begin(), actual.end(), inserter( res, res.begin()));
  			goody_folds = res;
  		}
--- 1365,1370 ----
  		if ( goody_folds_init_done)
  		{
! 			std::set < std::string > res;
! 			std::set_intersection( goody_folds.begin(), goody_folds.end(), actual.begin(), actual.end(), std::inserter( res, res.begin()));
  			goody_folds = res;
  		}
***************
*** 1383,1387 ****
  
  		// will store the folder parents this fco may be part of
! 		set < string > actual;
  		CComObjPtrVector<IMgaMetaFolder> act_vec;
  		k_meta->get_UsedInFolders( PutOut( act_vec) );
--- 1383,1387 ----
  
  		// will store the folder parents this fco may be part of
! 		std::set < std::string > actual;
  		CComObjPtrVector<IMgaMetaFolder> act_vec;
  		k_meta->get_UsedInFolders( PutOut( act_vec) );
***************
*** 1390,1394 ****
  			CComBstrObj name;
  			COMTHROW( (*a_i)->get_Name( PutOut(name)) );
! 			string s;
  			CopyTo( name, s);
  
--- 1390,1394 ----
  			CComBstrObj name;
  			COMTHROW( (*a_i)->get_Name( PutOut(name)) );
! 			std::string s;
  			CopyTo( name, s);
  
***************
*** 1399,1404 ****
  		if ( goody_folds_init_done) // if goody_folds inited already
  		{
! 			set < string > res;
! 			set_intersection( goody_folds.begin(), goody_folds.end(), actual.begin(), actual.end(), inserter( res, res.begin()));
  			goody_folds = res;
  		}
--- 1399,1404 ----
  		if ( goody_folds_init_done) // if goody_folds inited already
  		{
! 			std::set < std::string > res;
! 			std::set_intersection( goody_folds.begin(), goody_folds.end(), actual.begin(), actual.end(), std::inserter( res, res.begin()));
  			goody_folds = res;
  		}
***************
*** 1413,1417 ****
  	{
  		// these folders may contain all objects ( topFCOs and topFolders)
! 		for( set< string > :: iterator git = goody_folds.begin(); git != goody_folds.end(); ++git)
  			m_acceptingKindsAndFolders.push_back( *git);
  	}
--- 1413,1417 ----
  	{
  		// these folders may contain all objects ( topFCOs and topFolders)
! 		for( std::set< std::string > :: iterator git = goody_folds.begin(); git != goody_folds.end(); ++git)
  			m_acceptingKindsAndFolders.push_back( *git);
  	}
***************
*** 1430,1434 ****
  	{	
  		// will store the intersection of accepting models
! 		set < string > goody_models;
  		bool goody_models_init_done = false;
  		CComObjPtrVector<IMgaFCO>::const_iterator fco_it = p_fcos.begin();
--- 1430,1434 ----
  	{	
  		// will store the intersection of accepting models
! 		std::set < std::string > goody_models;
  		bool goody_models_init_done = false;
  		CComObjPtrVector<IMgaFCO>::const_iterator fco_it = p_fcos.begin();
***************
*** 1436,1440 ****
  		{
  			// will store the names of those models which may contain this kind (*fco_it)
! 			set < string > actual_models;
  			CComObjPtr<IMgaMetaFCO> k_meta;
  			COMTHROW( (*fco_it)->get_Meta( PutOut( k_meta)));
--- 1436,1440 ----
  		{
  			// will store the names of those models which may contain this kind (*fco_it)
! 			std::set < std::string > actual_models;
  			CComObjPtr<IMgaMetaFCO> k_meta;
  			COMTHROW( (*fco_it)->get_Meta( PutOut( k_meta)));
***************
*** 1455,1459 ****
  				CComBstrObj name;
  				COMTHROW( m->get_Name( PutOut(name)) );
! 				string s;
  				CopyTo( name, s); // we have the name of a kind that may appear in the model
  
--- 1455,1459 ----
  				CComBstrObj name;
  				COMTHROW( m->get_Name( PutOut(name)) );
! 				std::string s;
  				CopyTo( name, s); // we have the name of a kind that may appear in the model
  
***************
*** 1465,1470 ****
  			if ( goody_models_init_done) // if set already
  			{
! 				set < string > res;
! 				set_intersection( goody_models.begin(), goody_models.end(), actual_models.begin(), actual_models.end(), inserter( res, res.begin()));
  				goody_models = res;
  			}
--- 1465,1470 ----
  			if ( goody_models_init_done) // if set already
  			{
! 				std::set < std::string > res;
! 				std::set_intersection( goody_models.begin(), goody_models.end(), actual_models.begin(), actual_models.end(), std::inserter( res, res.begin()));
  				goody_models = res;
  			}
***************
*** 1477,1481 ****
  
  		// these models may contain all objects ( topFCOs only since topFolders is empty)
! 		for( set < string > :: iterator gid = goody_models.begin(); gid != goody_models.end(); ++gid)
  		{
  			m_acceptingKindsAndFolders.push_back( *gid);
--- 1477,1481 ----
  
  		// these models may contain all objects ( topFCOs only since topFolders is empty)
! 		for( std::set < std::string > :: iterator gid = goody_models.begin(); gid != goody_models.end(); ++gid)
  		{
  			m_acceptingKindsAndFolders.push_back( *gid);
***************
*** 1604,1608 ****
  }
  
! void CMakeClosure::getAccKindsInString( string& p_resStr) const
  {
  	unsigned int i = 0;
--- 1604,1608 ----
  }
  
! void CMakeClosure::getAccKindsInString( std::string& p_resStr) const
  {
  	unsigned int i = 0;
***************
*** 1615,1624 ****
  }
  
! const vector< string >& CMakeClosure::getAccKindsVector() const
  {
  	return m_acceptingKindsAndFolders;
  }
  
! void CMakeClosure::send2Console( const string& msg)
  {
  	CComBSTR bstr( msg.c_str());
--- 1615,1624 ----
  }
  
! const std::vector< std::string >& CMakeClosure::getAccKindsVector() const
  {
  	return m_acceptingKindsAndFolders;
  }
  
! void CMakeClosure::send2Console( const std::string& msg)
  {
  	CComBSTR bstr( msg.c_str());
***************
*** 1734,1738 ****
  
  
! 	sort( m_peculiarFcos.begin(), m_peculiarFcos.end(), ConnsLast());
  
  	m_selFcos = m_topFcos = m_peculiarFcos;
--- 1734,1738 ----
  
  
! 	std::sort( m_peculiarFcos.begin(), m_peculiarFcos.end(), ConnsLast());
  
  	m_selFcos = m_topFcos = m_peculiarFcos;
***************
*** 1792,1796 ****
  		send2Console( "[Smart Copy] The container does not contain the kinds specified. No data copied.");
  
! 	sort( m_peculiarFcos.begin(), m_peculiarFcos.end(), ConnsLast());
  
  	m_selFcos = m_topFcos = m_peculiarFcos;
--- 1792,1796 ----
  		send2Console( "[Smart Copy] The container does not contain the kinds specified. No data copied.");
  
! 	std::sort( m_peculiarFcos.begin(), m_peculiarFcos.end(), ConnsLast());
  
  	m_selFcos = m_topFcos = m_peculiarFcos;

Index: MakeClosure.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/MakeClosure.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MakeClosure.h	28 Sep 2004 22:43:27 -0000	1.6
--- MakeClosure.h	13 Oct 2004 15:17:55 -0000	1.7
***************
*** 91,98 ****
  
  	bool isAnyAccepting() const;
! 	void getAccKindsInString( string& p_resStr) const;
! 	const vector< string >& getAccKindsVector() const;
  
! 	void send2Console( const string& msg);
  
   protected:
--- 91,98 ----
  
  	bool isAnyAccepting() const;
! 	void getAccKindsInString( std::string& p_resStr) const;
! 	const std::vector< std::string >& getAccKindsVector() const;
  
! 	void send2Console( const std::string& msg);
  
   protected:
***************
*** 112,119 ****
  	void totalWrap();
  	void autoWrap();
! 	string processUpward(IMgaObject *obj, CComObjPtrVector<IMgaFolder>& f_parents, CComObjPtrVector<IMgaModel>& m_parents);
  
  	void checkMeta( const CComObjPtrVector<IMgaFolder>& p_folds, const CComObjPtrVector<IMgaFCO>& p_fcos);
! 	vector< string > m_acceptingKindsAndFolders; // the meta names of those kinds which the closure may be inserted into
  
  	virtual void procObj( IMgaObject* obj);
--- 112,119 ----
  	void totalWrap();
  	void autoWrap();
! 	std::string processUpward(IMgaObject *obj, CComObjPtrVector<IMgaFolder>& f_parents, CComObjPtrVector<IMgaModel>& m_parents);
  
  	void checkMeta( const CComObjPtrVector<IMgaFolder>& p_folds, const CComObjPtrVector<IMgaFCO>& p_fcos);
! 	std::vector< std::string > m_acceptingKindsAndFolders; // the meta names of those kinds which the closure may be inserted into
  
  	virtual void procObj( IMgaObject* obj);
***************
*** 152,156 ****
  	bool findAmongNews( const CComObjPtr<IMgaFolder>& in);
  
! 	void insertNew( const string& id, bool is_the_top = false);
  	void insertNew( const CComObjPtr<IMgaFCO>& in);
  	void insertNew( const CComObjPtrVector<IMgaFCO>& in_v);
--- 152,156 ----
  	bool findAmongNews( const CComObjPtr<IMgaFolder>& in);
  
! 	void insertNew( const std::string& id, bool is_the_top = false);
  	void insertNew( const CComObjPtr<IMgaFCO>& in);
  	void insertNew( const CComObjPtrVector<IMgaFCO>& in_v);
***************
*** 297,302 ****
  	/*virtual*/ void preProcess();
  	/*virtual*/ void postProcess();
! 	string m_iniSelPath;
! 	string m_accKind; // to store the special container kind the closure has been initiated from
   protected:
  	bool m_bRefs;
--- 297,302 ----
  	/*virtual*/ void preProcess();
  	/*virtual*/ void postProcess();
! 	std::string m_iniSelPath;
! 	std::string m_accKind; // to store the special container kind the closure has been initiated from
   protected:
  	bool m_bRefs;

Index: MgaClosure.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/MgaClosure.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MgaClosure.cpp	28 Sep 2004 15:23:53 -0000	1.5
--- MgaClosure.cpp	13 Oct 2004 15:17:55 -0000	1.6
***************
*** 70,74 ****
  			mc.isAnyAccepting())			// avoid if is no accepting kind/folder
  		{
! 			string res_str;
  			//CClosureRes res_dlg;
  
--- 70,74 ----
  			mc.isAnyAccepting())			// avoid if is no accepting kind/folder
  		{
! 			std::string res_str;
  			//CClosureRes res_dlg;
  

Index: MgaUtil.dsp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/MgaUtil.dsp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** MgaUtil.dsp	28 Sep 2004 15:23:53 -0000	1.26
--- MgaUtil.dsp	13 Oct 2004 15:17:55 -0000	1.27
***************
*** 44,48 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /c
! # ADD CPP /nologo /MD /W3 /GR /GX /Zi /O1 /I "../Common" /I "../include/STL" /I "../include/htmlhelp" /I "../Interfaces" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /Yu"stdafx.h" /FD /c
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  # ADD MTL /nologo /D "NDEBUG" /win32
--- 44,48 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /c
! # ADD CPP /nologo /MD /W3 /GR /GX /Zi /O1 /I "../Common" /I "../include/STLport" /I "../include/htmlhelp" /I "../Interfaces" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /Yu"stdafx.h" /FD /c
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  # ADD MTL /nologo /D "NDEBUG" /win32
***************
*** 81,85 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c
! # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../Common" /I "../include/STL" /I "../include/htmlhelp" /I "../Interfaces" /D "_DEBUG" /D "_ATL_DLL" /D "WIN32" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /FR /Yu"stdafx.h" /FD /GZ /c
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  # ADD MTL /nologo /D "_DEBUG" /win32
--- 81,85 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c
! # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../Common" /I "../include/STLport" /I "../include/htmlhelp" /I "../Interfaces" /D "_DEBUG" /D "_ATL_DLL" /D "WIN32" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /FR /Yu"stdafx.h" /FD /GZ /c
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  # ADD MTL /nologo /D "_DEBUG" /win32

Index: RegistryBrowserDlg.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/RegistryBrowserDlg.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RegistryBrowserDlg.cpp	17 Nov 2003 17:08:02 -0000	1.4
--- RegistryBrowserDlg.cpp	13 Oct 2004 15:17:55 -0000	1.5
***************
*** 182,187 ****
  
  	if (m_wndRegNode.GetSafeHwnd() && m_wndRegistryTree.GetSafeHwnd()) {
! 		m_wndRegistryTree.SetWindowPos(NULL, 0, origTopRect.bottom, cx*ratio, cy - (origBottomRect.bottom-origBottomRect.top) - origTopRect.bottom, SWP_NOZORDER);
! 		m_wndRegNode.SetWindowPos(NULL, cx*ratio+GetSystemMetrics(SM_CYFRAME), origTopRect.bottom, cx - (cx*ratio+GetSystemMetrics(SM_CYFRAME)), cy - (origBottomRect.bottom-origBottomRect.top) - origTopRect.bottom, SWP_NOZORDER);
  		m_wndSplitterBar.SetPanes(&m_wndRegistryTree,&m_wndRegNode);		
  	}
--- 182,187 ----
  
  	if (m_wndRegNode.GetSafeHwnd() && m_wndRegistryTree.GetSafeHwnd()) {
! 		m_wndRegistryTree.SetWindowPos(NULL, 0, origTopRect.bottom, static_cast<int>(cx*ratio), cy - (origBottomRect.bottom-origBottomRect.top) - origTopRect.bottom, SWP_NOZORDER);
! 		m_wndRegNode.SetWindowPos(NULL, static_cast<int>(cx*ratio)+GetSystemMetrics(SM_CYFRAME), origTopRect.bottom, cx - (static_cast<int>(cx*ratio)+GetSystemMetrics(SM_CYFRAME)), cy - (origBottomRect.bottom-origBottomRect.top) - origTopRect.bottom, SWP_NOZORDER);
  		m_wndSplitterBar.SetPanes(&m_wndRegistryTree,&m_wndRegNode);		
  	}
***************
*** 197,201 ****
  		CRect origWnd;
  		wndOK->GetClientRect(&origWnd);
! 		wndOK->MoveWindow(112.0 * ratio, rectDlg.bottom - (rect3.bottom - rect3.top), origWnd.Width(), origWnd.Height());
  	}
  	CWnd* wndCANCEL = this->GetDlgItem(IDCANCEL);
--- 197,201 ----
  		CRect origWnd;
  		wndOK->GetClientRect(&origWnd);
! 		wndOK->MoveWindow(static_cast<int>(112.0 * ratio), rectDlg.bottom - (rect3.bottom - rect3.top), origWnd.Width(), origWnd.Height());
  	}
  	CWnd* wndCANCEL = this->GetDlgItem(IDCANCEL);
***************
*** 203,207 ****
  		CRect origWnd;
  		wndCANCEL->GetClientRect(&origWnd);
! 		wndCANCEL->MoveWindow(242.0 * ratio, rectDlg.bottom - (rect3.bottom - rect3.top), origWnd.Width(), origWnd.Height());
  	}
  
--- 203,207 ----
  		CRect origWnd;
  		wndCANCEL->GetClientRect(&origWnd);
! 		wndCANCEL->MoveWindow(static_cast<int>(242.0 * ratio), rectDlg.bottom - (rect3.bottom - rect3.top), origWnd.Width(), origWnd.Height());
  	}
  

Index: StdAfx.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/StdAfx.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** StdAfx.h	8 Oct 2002 15:06:00 -0000	1.10
--- StdAfx.h	13 Oct 2004 15:17:55 -0000	1.11
***************
*** 53,61 ****
  ///////////////////////////////////////////////////////////////////
  
! #include <stl_config.h>
! #undef __SGI_STL_NO_ARROW_OPERATOR
! #define __SGI_STL_INTERNAL_RELOPS
  #include <vector>
! #include <slist>
  
  #include "CommonSmart.h"
--- 53,60 ----
  ///////////////////////////////////////////////////////////////////
  
! #include <stl_user_config.h>
! 
  #include <vector>
! #include <list>
  
  #include "CommonSmart.h"



More information about the GME-commit mailing list