Wed Oct 13 11:18:00 CDT 2004

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

Modified Files:
	Core.dsp CoreAttribute.cpp CoreAttribute.h CoreBinFile.cpp 
	CoreBinFile.h CoreMetaAttribute.h CoreMetaObject.cpp 
	CoreMetaObject.h CoreMetaProject.cpp CoreMetaProject.h 
	CoreODBC.cpp CoreODBC.h CoreObject.cpp CoreObject.h 
	CoreProject.cpp CoreProject.h CoreRepository.cpp 
	CoreRepository.h CoreTerritory.cpp CoreTerritory.h 
	CoreUtilities.h StdAfx.h 
Log Message:
GME ported to STLport
-std:: prefix added to stl classes and methods

CVS User: zolmol

Index: Core.dsp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Core/Core.dsp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Core.dsp	22 Jul 2004 14:26:50 -0000	1.14
--- Core.dsp	13 Oct 2004 15:17:54 -0000	1.15
***************
*** 44,48 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
! # ADD CPP /nologo /MD /W3 /GX /Zi /O1 /I "../Include/repository" /I "../Include/ODBC" /I "../Interfaces" /I "../Include/STL" /I "../Common" /I "../Gme" /D "NDEBUG" /D "_ATL_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Yu"StdAfx.h" /FD /c
  # ADD BASE RSC /l 0x409 /d "NDEBUG"
  # ADD RSC /l 0x409 /d "NDEBUG"
--- 44,48 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
! # ADD CPP /nologo /MD /W3 /GX /Zi /O1 /I "../Include/repository" /I "../Include/ODBC" /I "../Interfaces" /I "../Include/STLport" /I "../Common" /I "../Gme" /D "NDEBUG" /D "_ATL_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Yu"StdAfx.h" /FD /c
  # ADD BASE RSC /l 0x409 /d "NDEBUG"
  # ADD RSC /l 0x409 /d "NDEBUG"
***************
*** 52,56 ****
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x60300000" /subsystem:windows /dll /map /debug /machine:I386
  # Begin Custom Build - Performing registration
  OutDir=.\Release
--- 52,56 ----
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x60300000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\lib"
  # Begin Custom Build - Performing registration
  OutDir=.\Release
***************
*** 79,83 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /GZ /c
! # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../Include/ODBC" /I "../Include/repository" /I "../Interfaces" /I "../Include/STL" /I "../Common" /I "../Gme" /D "_DEBUG" /D "_ATL_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Fr /Yu"StdAfx.h" /FD /GZ /c
  # ADD BASE RSC /l 0x409 /d "_DEBUG"
  # ADD RSC /l 0x409 /d "_DEBUG"
--- 79,83 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /GZ /c
! # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../Include/ODBC" /I "../Include/repository" /I "../Interfaces" /I "../Include/stlport" /I "../Common" /I "../Gme" /D "_DEBUG" /D "_ATL_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Fr /Yu"StdAfx.h" /FD /GZ /c
  # ADD BASE RSC /l 0x409 /d "_DEBUG"
  # ADD RSC /l 0x409 /d "_DEBUG"
***************
*** 87,91 ****
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x60300000" /subsystem:windows /dll /map /debug /machine:I386 /pdbtype:sept
  # Begin Custom Build - Performing registration
  OutDir=.\Debug
--- 87,92 ----
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x60300000" /subsystem:windows /dll /map /debug /machine:I386 /pdbtype:sept /libpath:"..\lib"
! # SUBTRACT LINK32 /nodefaultlib
  # Begin Custom Build - Performing registration
  OutDir=.\Debug

Index: CoreAttribute.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Core/CoreAttribute.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** CoreAttribute.cpp	31 Oct 2001 00:31:00 -0000	1.17
--- CoreAttribute.cpp	13 Oct 2004 15:17:54 -0000	1.18
***************
*** 160,164 ****
  	COMTHROW( metaattribute->get_Name(PutOut(attrbstr)) );

! 	string attrname;
  	CopyTo(attrbstr, attrname);

--- 160,164 ----
  	COMTHROW( metaattribute->get_Name(PutOut(attrbstr)) );

! 	std::string attrname;
  	CopyTo(attrbstr, attrname);

***************
*** 689,693 ****
  	COMTHROW( metaattribute->get_Name(PutOut(attrbstr)) );

! 	string attrname;
  	CopyTo(attrbstr, attrname);

--- 689,693 ----
  	COMTHROW( metaattribute->get_Name(PutOut(attrbstr)) );

! 	std::string attrname;
  	CopyTo(attrbstr, attrname);

***************
*** 885,889 ****
  	COMTHROW( metaattribute->get_Name(PutOut(bstr)) );

! 	string name;
  	CopyTo(bstr, name);

--- 885,889 ----
  	COMTHROW( metaattribute->get_Name(PutOut(bstr)) );

! 	std::string name;
  	CopyTo(bstr, name);

***************
*** 897,901 ****
  	else
  	{
! 		string val;
  		CopyTo(values.front(), val);

--- 897,901 ----
  	else
  	{
! 		std::string val;
  		CopyTo(values.front(), val);

***************
*** 911,915 ****
  		COMTHROW( storage->get_AttributeValue(PutOut(v)) );

! 		string val;
  		CopyTo(v, val);

--- 911,915 ----
  		COMTHROW( storage->get_AttributeValue(PutOut(v)) );

! 		std::string val;
  		CopyTo(v, val);

***************
*** 928,932 ****
  	COMTHROW( metaattribute->get_Name(PutOut(bstr)) );

! 	string name;
  	CopyTo(bstr, name);

--- 928,932 ----
  	COMTHROW( metaattribute->get_Name(PutOut(bstr)) );

! 	std::string name;
  	CopyTo(bstr, name);

***************
*** 1056,1060 ****
--- 1056,1062 ----
  		ASSERT( idpair.objid != OBJID_NONE );

+ #pragma warning( disable: 4244) // conversion from 'long' to 'short', possible loss of data
  		CComObjPtr<CCoreObject> object = GetProject()->GetObject(idpair.metaid, idpair.objid);
+ #pragma warning( default: 4244) // conversion from 'long' to 'short', possible loss of data
  		ASSERT( object != NULL );

***************
*** 1084,1088 ****
  		CCoreCollectionAttribute::objects_type &collection = values.front()->GetCollection();

! 		pair<objects_iterator, bool> t = collection.insert(GetObject());
  		ASSERT( t.second );
  		backref = t.first;
--- 1086,1090 ----
  		CCoreCollectionAttribute::objects_type &collection = values.front()->GetCollection();

! 		std::pair<objects_iterator, bool> t = collection.insert(GetObject());
  		ASSERT( t.second );
  		backref = t.first;
***************
*** 1778,1782 ****
  	ASSERT( v.vt == VT_EMPTY );

! 	typedef CCoreCollection<TYPENAME_ELEM2COLL(ICoreObject), vector<ICoreObject*>, ICoreObject, CCoreObject> COMTYPE;

  	CComObjPtr<COMTYPE> p;
--- 1780,1784 ----
  	ASSERT( v.vt == VT_EMPTY );

! 	typedef CCoreCollection<TYPENAME_ELEM2COLL(ICoreObject), std::vector<ICoreObject*>, ICoreObject, CCoreObject> COMTYPE;

  	CComObjPtr<COMTYPE> p;
***************
*** 1826,1830 ****
  	GetArrayBounds(a, i, e);

! 	typedef CCoreCollection<ICoreObjects, vector<ICoreObject*>, ICoreObject, CCoreObject> COMTYPE;

  	CComObjPtr<COMTYPE> p;
--- 1828,1832 ----
  	GetArrayBounds(a, i, e);

! 	typedef CCoreCollection<ICoreObjects, std::vector<ICoreObject*>, ICoreObject, CCoreObject> COMTYPE;

  	CComObjPtr<COMTYPE> p;
***************
*** 1837,1844 ****
--- 1839,1850 ----
  		// *** later every loaded object will be locked

+ #pragma warning( disable: 4244) // conversion from 'long' to 'short', possible loss of data
  		CComObjPtr<CCoreObject> object = project->FindObject((*i).metaid, (*i).objid);
+ #pragma warning( default: 4244) // conversion from 'long' to 'short', possible loss of data
  		if( object == NULL )
  		{
+ #pragma warning( disable: 4244) // conversion from 'long' to 'short', possible loss of data
  			object = project->CreateObject((*i).metaid, (*i).objid);
+ #pragma warning( default: 4244) // conversion from 'long' to 'short', possible loss of data
  			ASSERT( object != NULL );
  		}
***************
*** 1920,1927 ****
--- 1926,1937 ----
  		while( i != e )
  		{
+ #pragma warning( disable: 4244) // conversion from 'long' to 'short', possible loss of data
  			CComObjPtr<CCoreObject> object = project->FindObject((*i).metaid, (*i).objid);
+ #pragma warning( default: 4244) // conversion from 'long' to 'short', possible loss of data
  			if( object == NULL )
  			{
+ #pragma warning( disable: 4244) // conversion from 'long' to 'short', possible loss of data
  				object = project->CreateObject((*i).metaid, (*i).objid);
+ #pragma warning( default: 4244) // conversion from 'long' to 'short', possible loss of data
  				ASSERT( object != NULL );

***************
*** 1962,1966 ****
--- 1972,1978 ----
  	while( i != e )
  	{
+ #pragma warning( disable: 4244) // conversion from 'long' to 'short', possible loss of data
  		CComObjPtr<CCoreObject> object = project->FindObject((*i).metaid, (*i).objid);
+ #pragma warning( default: 4244) // conversion from 'long' to 'short', possible loss of data
  		if( object == NULL )
  			return false;

Index: CoreAttribute.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Core/CoreAttribute.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CoreAttribute.h	31 Oct 2001 00:32:00 -0000	1.11
--- CoreAttribute.h	13 Oct 2004 15:17:54 -0000	1.12
***************
*** 225,229 ****
  	typedef DATA value_type;

! 	typedef list<value_type> values_type;
  	typedef values_type::iterator values_iterator;

--- 225,229 ----
  	typedef DATA value_type;

! 	typedef std::list<value_type> values_type;
  	typedef values_type::iterator values_iterator;

***************
*** 294,301 ****
  	typedef CComObjPtr<CCoreCollectionAttribute> value_type;

! 	typedef list<value_type> values_type;
  	typedef values_type::iterator values_iterator;

! 	typedef set< CCoreObject*, ptr_compare<CCoreObject> > objects_type;
  	typedef objects_type::iterator objects_iterator;

--- 294,301 ----
  	typedef CComObjPtr<CCoreCollectionAttribute> value_type;

! 	typedef std::list<value_type> values_type;
  	typedef values_type::iterator values_iterator;

! 	typedef std::set< CCoreObject*, ptr_compare<CCoreObject> > objects_type;
  	typedef objects_type::iterator objects_iterator;

***************
*** 360,364 ****
  template<class BASE, const int VALTYPE>
  class ATL_NO_VTABLE CCoreDataAttribute : 
! 	public typename BASE,
  	public CCoreTransactionItem,
  	public CCoreUndoItem
--- 360,364 ----
  template<class BASE, const int VALTYPE>
  class ATL_NO_VTABLE CCoreDataAttribute : 
! 	public /*typename*/ BASE,//z!
  	public CCoreTransactionItem,
  	public CCoreUndoItem
***************
*** 432,436 ****

  public:
! 	typedef set< CCoreObject*, ptr_compare<CCoreObject> > objects_type;
  	typedef objects_type::iterator objects_iterator;

--- 432,436 ----

  public:
! 	typedef std::set< CCoreObject*, ptr_compare<CCoreObject> > objects_type;
  	typedef objects_type::iterator objects_iterator;

Index: CoreBinFile.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Core/CoreBinFile.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** CoreBinFile.cpp	18 May 2004 13:30:59 -0000	1.15
--- CoreBinFile.cpp	13 Oct 2004 15:17:54 -0000	1.16
***************
*** 71,75 ****
  	ASSERT( metaattributes != NULL );

! 	typedef vector< CComObjPtr<ICoreMetaAttribute> > metaattributelist_type;
  	metaattributelist_type metaattributelist;
  	GetAll<ICoreMetaAttributes, ICoreMetaAttribute>(metaattributes, metaattributelist);
--- 71,75 ----
  	ASSERT( metaattributes != NULL );

! 	typedef std::vector< CComObjPtr<ICoreMetaAttribute> > metaattributelist_type;
  	metaattributelist_type metaattributelist;
  	GetAll<ICoreMetaAttributes, ICoreMetaAttribute>(metaattributes, metaattributelist);
***************
*** 437,441 ****
  	b.resize(len);
  	if( len > 0 )
! 		ifs.read(b.begin(), len);
  }

--- 437,441 ----
  	b.resize(len);
  	if( len > 0 )
! 		ifs.read( (char *) b.begin(), len);//zolmol!
  }

***************
*** 444,448 ****
  	ASSERT( ifs.is_open() );

! 	string s;

  	int len;
--- 444,448 ----
  	ASSERT( ifs.is_open() );

! 	std::string s;

  	int len;
***************
*** 453,457 ****
  	s.resize(len);
  	if( len > 0 )
! 		ifs.read(s.begin(), len);

  	CopyTo(s, ss);
--- 453,457 ----
  	s.resize(len);
  	if( len > 0 )
! 		ifs.read( (char *) s.begin(), len);//zolmol!

  	CopyTo(s, ss);
***************
*** 468,472 ****

  	if( len > 0 )
! 		ofs.write(b.begin(), len);
  }

--- 468,472 ----

  	if( len > 0 )
! 		ofs.write( (const char *) b.begin(), len);//zolmol!
  }

***************
*** 475,479 ****
  	ASSERT( ofs.is_open() );

! 	string s;
  	CopyTo(ss, s);

--- 475,479 ----
  	ASSERT( ofs.is_open() );

! 	std::string s;
  	CopyTo(ss, s);

***************
*** 484,488 ****

  	if( len > 0 )
! 		ofs.write(s.begin(), len);
  }

--- 484,488 ----

  	if( len > 0 )
! 		ofs.write( (const char *) s.begin(), len);//zolmol!
  }

***************
*** 515,520 ****
  		BinAttrBase *attr = opened_object->second.Find(attrid);

! 		pair<BinAttrBase *const, CComVariant> r(attr, CComVariant());
! 		pair<undos_iterator, bool> t = undos.insert(r);

  		if( t.second )
--- 515,520 ----
  		BinAttrBase *attr = opened_object->second.Find(attrid);

! 		std::pair<BinAttrBase *const, CComVariant> r(attr, CComVariant());
! 		std::pair<undos_iterator, bool> t = undos.insert(r);

  		if( t.second )
***************
*** 538,542 ****
  	ASSERT( metaobjects != NULL );

! 	typedef vector< CComObjPtr<ICoreMetaObject> > metaobjectlist_type;
  	metaobjectlist_type metaobjectlist;
  	GetAll<ICoreMetaObjects, ICoreMetaObject>(metaobjects, metaobjectlist);
--- 538,542 ----
  	ASSERT( metaobjects != NULL );

! 	typedef std::vector< CComObjPtr<ICoreMetaObject> > metaobjectlist_type;
  	metaobjectlist_type metaobjectlist;
  	GetAll<ICoreMetaObjects, ICoreMetaObject>(metaobjects, metaobjectlist);
***************
*** 553,557 ****

  		ASSERT( maxobjids.find(metaid) == maxobjids.end() );
! 		maxobjids.insert( pair<const metaid_type, objid_type>(metaid, OBJID_NONE) );

  		++i;
--- 553,557 ----

  		ASSERT( maxobjids.find(metaid) == maxobjids.end() );
! 		maxobjids.insert( std::pair<const metaid_type, objid_type>(metaid, OBJID_NONE) );

  		++i;
***************
*** 611,615 ****
  		ASSERT( metaobject != NULL );

! 		pair<objects_iterator, bool> t = objects.insert(
  			objects_type::value_type(idpair,BinObject()));
  		ASSERT( t.second );
--- 611,615 ----
  		ASSERT( metaobject != NULL );

! 		std::pair<objects_iterator, bool> t = objects.insert(
  			objects_type::value_type(idpair,BinObject()));
  		ASSERT( t.second );
***************
*** 688,692 ****
  	ASSERT( metaprojectid.size() == 16 );

! 	ofs.open(filename.c_str(), ios::out | ios::binary);
  	if( ofs.fail() || !ofs.is_open() )
  		HR_THROW(E_FILEOPEN);
--- 688,692 ----
  	ASSERT( metaprojectid.size() == 16 );

! 	ofs.open(filename.c_str(), std::ios::out | std::ios::binary);
  	if( ofs.fail() || !ofs.is_open() )
  		HR_THROW(E_FILEOPEN);
***************
*** 725,729 ****
  	InitMaxObjIDs();

! 	ifs.open(filename.c_str(), ios::in | ios::nocreate | ios::binary);
  	if( ifs.fail() )
  		HR_THROW(E_FILEOPEN);
--- 725,729 ----
  	InitMaxObjIDs();

! 	ifs.open(filename.c_str(), std::ios::in | std::ios::binary);//zolmol!//previously ios::nocreate had been used but no file is created if opened for read only
  	if( ifs.fail() )
  		HR_THROW(E_FILEOPEN);
***************
*** 758,762 ****
  		idpair.objid = objid;

! 		pair<objects_iterator, bool> t = objects.insert(
  			objects_type::value_type(idpair,BinObject()));
  		ASSERT( t.second );
--- 758,762 ----
  		idpair.objid = objid;

! 		std::pair<objects_iterator, bool> t = objects.insert(
  			objects_type::value_type(idpair,BinObject()));
  		ASSERT( t.second );
***************
*** 793,797 ****

  	ifs.close();
! 	ofs.open(filename.c_str(), ios::app | ios::binary);
  	read_only = false;
  	if( ofs.fail() || !ofs.is_open() )	read_only = true;
--- 793,797 ----

  	ifs.close();
! 	ofs.open(filename.c_str(), std::ios::app | std::ios::binary);
  	read_only = false;
  	if( ofs.fail() || !ofs.is_open() )	read_only = true;
***************
*** 806,810 ****
  	{
  		CopyTo(connection, filename);
! 		if( !(string(filename, 0, 4) == "MGA=") )
  			HR_THROW(E_INVALID_USAGE);

--- 806,810 ----
  	{
  		CopyTo(connection, filename);
! 		if( !(std::string(filename, 0, 4) == "MGA=") )
  			HR_THROW(E_INVALID_USAGE);

***************
*** 830,834 ****
  	{
  		CopyTo(connection, filename);
! 		if( !(string(filename, 0, 4) == "MGA=") )
  			HR_THROW(E_INVALID_USAGE);

--- 830,834 ----
  	{
  		CopyTo(connection, filename);
! 		if( !(std::string(filename, 0, 4) == "MGA=") )
  			HR_THROW(E_INVALID_USAGE);

***************
*** 848,852 ****
  		idpair.objid = OBJID_ROOT;

! 		pair<objects_iterator, bool> t = objects.insert(
  			objects_type::value_type(idpair,BinObject()));
  		ASSERT( t.second );
--- 848,852 ----
  		idpair.objid = OBJID_ROOT;

! 		std::pair<objects_iterator, bool> t = objects.insert(
  			objects_type::value_type(idpair,BinObject()));
  		ASSERT( t.second );
***************
*** 867,879 ****
  STDMETHODIMP CCoreBinFile::SaveProject(BSTR connection, VARIANT_BOOL keepoldname = VARIANT_TRUE) 
  {
! 	string origfname = filename;
  	COMTRY
  	{
! 		string fn;
  		CopyTo(connection, fn);

  		if( !fn.empty() ) 
  		{
! 			if( !(string(fn, 0, 4) == "MGA=") )
  				HR_THROW(E_INVALID_USAGE);

--- 867,879 ----
  STDMETHODIMP CCoreBinFile::SaveProject(BSTR connection, VARIANT_BOOL keepoldname = VARIANT_TRUE) 
  {
! 	std::string origfname = filename;
  	COMTRY
  	{
! 		std::string fn;
  		CopyTo(connection, fn);

  		if( !fn.empty() ) 
  		{
! 			if( !(std::string(fn, 0, 4) == "MGA=") )
  				HR_THROW(E_INVALID_USAGE);

***************
*** 927,932 ****
  	CloseObject();

! 	slist<objects_iterator>::iterator i = deleted_objects.begin();
! 	slist<objects_iterator>::iterator e = deleted_objects.end();
  	while( i != e )
  	{
--- 927,932 ----
  	CloseObject();

! 	std::list<objects_iterator>::iterator i = deleted_objects.begin();//slist
! 	std::list<objects_iterator>::iterator e = deleted_objects.end();//slist
  	while( i != e )
  	{
***************
*** 965,970 ****
  	}

! 	slist<objects_iterator>::iterator i = deleted_objects.begin();
! 	slist<objects_iterator>::iterator e = deleted_objects.end();
  	while( i != e )
  	{
--- 965,970 ----
  	}

! 	std::list<objects_iterator>::iterator i = deleted_objects.begin();//slist
! 	std::list<objects_iterator>::iterator e = deleted_objects.end();//slist
  	while( i != e )
  	{
***************
*** 1037,1044 ****

  	ASSERT( base->GetValType() == VALTYPE_COLLECTION );
! 	vector<objects_iterator> &objs = ((BinAttr<VALTYPE_COLLECTION>*)base)->a;

  #ifdef DEBUG_CONTAINERS
! 	vector<objects_iterator>::iterator i = find(objs.begin(), objs.end(), a);
  	ASSERT( i == objs.end() );
  #endif
--- 1037,1044 ----

  	ASSERT( base->GetValType() == VALTYPE_COLLECTION );
! 	std::vector<objects_iterator> &objs = ((BinAttr<VALTYPE_COLLECTION>*)base)->a;

  #ifdef DEBUG_CONTAINERS
! 	std::vector<objects_iterator>::iterator i = find(objs.begin(), objs.end(), a);
  	ASSERT( i == objs.end() );
  #endif
***************
*** 1056,1064 ****

  		ASSERT( base->GetValType() == VALTYPE_COLLECTION );
! 		vector<objects_iterator> &objs = ((BinAttr<VALTYPE_COLLECTION>*)base)->a;

  		ASSERT( binfile->opened_object->second.Find(attrid) == this );

! 		vector<objects_iterator>::iterator i = find(objs.begin(), objs.end(), binfile->opened_object);
  		ASSERT( i != objs.end() );

--- 1056,1064 ----

  		ASSERT( base->GetValType() == VALTYPE_COLLECTION );
! 		std::vector<objects_iterator> &objs = ((BinAttr<VALTYPE_COLLECTION>*)base)->a;

  		ASSERT( binfile->opened_object->second.Find(attrid) == this );

! 		std::vector<objects_iterator>::iterator i = std::find(objs.begin(), objs.end(), binfile->opened_object);
  		ASSERT( i != objs.end() );

***************
*** 1134,1141 ****
  	ASSERT( p != NULL && p->vt == VT_EMPTY );

! 	vector<metaobjidpair_type> idpairs;

! 	vector<objects_iterator>::const_iterator i = a.begin();
! 	vector<objects_iterator>::const_iterator e = a.end();
  	while( i != e )
  	{
--- 1134,1141 ----
  	ASSERT( p != NULL && p->vt == VT_EMPTY );

! 	std::vector<metaobjidpair_type> idpairs;

! 	std::vector<objects_iterator>::const_iterator i = a.begin();
! 	std::vector<objects_iterator>::const_iterator e = a.end();
  	while( i != e )
  	{

Index: CoreBinFile.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Core/CoreBinFile.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CoreBinFile.h	27 Dec 2003 18:46:46 -0000	1.9
--- CoreBinFile.h	13 Oct 2004 15:17:54 -0000	1.10
***************
*** 3,8 ****
  #define MGA_COREBINFILE_H

! #include <fstream.h>
! #include <slist>
  #include <hash_map>

--- 3,8 ----
  #define MGA_COREBINFILE_H

! #include <fstream>//fstream.h
! #include <list>//slist
  #include <hash_map>

***************
*** 28,32 ****
  };

! typedef slist<BinAttrBase*> binattrs_type;
  typedef binattrs_type::iterator binattrs_iterator;

--- 28,32 ----
  };

! typedef std::list<BinAttrBase*> binattrs_type;//slist
  typedef binattrs_type::iterator binattrs_iterator;

***************
*** 65,69 ****
  };

! typedef hash_map<metaobjidpair_type, BinObject, 
  	metaobjidpair_hashfunc, metaobjidpair_equalkey> objects_type;
  typedef objects_type::iterator objects_iterator;
--- 65,69 ----
  };

! typedef std::hash_map<metaobjidpair_type, BinObject, 
  	metaobjidpair_hashfunc, metaobjidpair_equalkey> objects_type;
  typedef objects_type::iterator objects_iterator;
***************
*** 136,156 ****

  public:
! 	ifstream ifs;
! 	ofstream ofs;

  public:
! 	void read(unsigned char &a) { ifs.read((unsigned char*)&a, sizeof(unsigned char)); }
! 	void read(short &a) { ifs.read((unsigned char*)&a, sizeof(short)); }
! 	void read(int &a) { ifs.read((unsigned char*)&a, sizeof(int)); }
! 	void read(long &a)  { ifs.read((unsigned char*)&a, sizeof(long)); }
! 	void read(double &a)  { ifs.read((unsigned char*)&a, sizeof(double)); }
  	void read(CComBstrObj &a);
  	void read(bindata &a);

! 	void write(unsigned char a) { ofs.write((unsigned char*)&a, sizeof(unsigned char)); }
! 	void write(short a) { ofs.write((unsigned char*)&a, sizeof(short)); }
! 	void write(int a) { ofs.write((unsigned char*)&a, sizeof(int)); }
! 	void write(long a) { ofs.write((unsigned char*)&a, sizeof(long)); }
! 	void write(double a) { ofs.write((unsigned char*)&a, sizeof(double)); }
  	void write(const CComBstrObj &a);
  	void write(const bindata &a);
--- 136,156 ----

  public:
! 	std::ifstream ifs;
! 	std::ofstream ofs;

  public:
! 	void read(unsigned char &a) { ifs.read((char*)&a, sizeof(char)); }//zolmol! 5 times
! 	void read(short &a) { ifs.read((char*)&a, sizeof(short)); }
! 	void read(int &a) { ifs.read((char*)&a, sizeof(int)); }
! 	void read(long &a)  { ifs.read((char*)&a, sizeof(long)); }
! 	void read(double &a)  { ifs.read((char*)&a, sizeof(double)); }
  	void read(CComBstrObj &a);
  	void read(bindata &a);

! 	void write(unsigned char a) { ofs.write((const char*)&a, sizeof(unsigned char)); }//zolmol! 5 times
! 	void write(short a) { ofs.write((const char*)&a, sizeof(short)); }
! 	void write(int a) { ofs.write((const char*)&a, sizeof(int)); }
! 	void write(long a) { ofs.write((const char*)&a, sizeof(long)); }
! 	void write(double a) { ofs.write((const char*)&a, sizeof(double)); }
  	void write(const CComBstrObj &a);
  	void write(const bindata &a);
***************
*** 159,163 ****

  public:
! 	typedef hash_map< BinAttrBase*, CComVariant, 
  		ptr_hashfunc<BinAttrBase>, ptr_equalkey<BinAttrBase> > undos_type;
  	typedef undos_type::iterator undos_iterator;
--- 159,163 ----

  public:
! 	typedef std::hash_map< BinAttrBase*, CComVariant, 
  		ptr_hashfunc<BinAttrBase>, ptr_equalkey<BinAttrBase> > undos_type;
  	typedef undos_type::iterator undos_iterator;
***************
*** 174,183 ****
  	objects_iterator opened_object;

! 	typedef hash_map<metaid_type, objid_type> maxobjids_type;
  	typedef maxobjids_type::iterator maxobjids_iterator;

  	maxobjids_type maxobjids;
! 	slist<objects_iterator> deleted_objects;
! 	slist<objects_iterator> created_objects;

  	struct resolve_type
--- 174,183 ----
  	objects_iterator opened_object;

! 	typedef std::hash_map<metaid_type, objid_type> maxobjids_type;
  	typedef maxobjids_type::iterator maxobjids_iterator;

  	maxobjids_type maxobjids;
! 	std::list<objects_iterator> deleted_objects;//slist
! 	std::list<objects_iterator> created_objects;//slist

  	struct resolve_type
***************
*** 188,192 ****
  	};

! 	typedef slist<resolve_type> resolvelist_type;
  	resolvelist_type resolvelist;

--- 188,192 ----
  	};

! 	typedef std::list<resolve_type> resolvelist_type;//slist
  	resolvelist_type resolvelist;

***************
*** 204,208 ****

  public:
! 	string filename;
  	bool read_only;
  	bool intrans;
--- 204,208 ----

  public:
! 	std::string filename;
  	bool read_only;
  	bool intrans;
***************
*** 343,347 ****
  {
  public:
! 	vector<objects_iterator> a;

  	virtual valtype_type GetValType() const NOTHROW { return VALTYPE_COLLECTION; }
--- 343,347 ----
  {
  public:
! 	std::vector<objects_iterator> a;

  	virtual valtype_type GetValType() const NOTHROW { return VALTYPE_COLLECTION; }

Index: CoreMetaAttribute.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Core/CoreMetaAttribute.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CoreMetaAttribute.h	7 Aug 2000 17:21:00 -0000	1.4
--- CoreMetaAttribute.h	13 Oct 2004 15:17:54 -0000	1.5
***************
*** 38,43 ****
  	CCoreMetaObject *object;
  	attrid_type attrid;
! 	string token;
! 	string name;
  	valtype_type valtype;

--- 38,43 ----
  	CCoreMetaObject *object;
  	attrid_type attrid;
! 	std::string token;
! 	std::string name;
  	valtype_type valtype;

Index: CoreMetaObject.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Core/CoreMetaObject.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CoreMetaObject.cpp	27 Jan 2002 03:23:00 -0000	1.5
--- CoreMetaObject.cpp	13 Oct 2004 15:17:54 -0000	1.6
***************
*** 88,92 ****
  	COMTRY
  	{
! 		typedef CCoreCollection<ICoreMetaAttributes, vector<ICoreMetaAttribute*>,
  			ICoreMetaAttribute, CCoreMetaAttribute> COMTYPE;

--- 88,92 ----
  	COMTRY
  	{
! 		typedef CCoreCollection<ICoreMetaAttributes, std::vector<ICoreMetaAttribute*>,
  			ICoreMetaAttribute, CCoreMetaAttribute> COMTYPE;

Index: CoreMetaObject.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Core/CoreMetaObject.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CoreMetaObject.h	19 Jul 2000 23:16:00 -0000	1.4
--- CoreMetaObject.h	13 Oct 2004 15:17:54 -0000	1.5
***************
*** 3,7 ****
  #define MGA_COREMETAOBJECT_H

! #include <slist>

  class CCoreMetaProject;
--- 3,7 ----
  #define MGA_COREMETAOBJECT_H

! #include <list>//slist

  class CCoreMetaProject;
***************
*** 44,56 ****

  public:
! 	typedef slist<CCoreMetaAttribute*> attributes_type;

  	CCoreMetaProject *project;
  	attributes_type attributes;
! 	vector<GUID> classids;

  	metaid_type metaid;
! 	string token;
! 	string name;

  // ------- Methods
--- 44,56 ----

  public:
! 	typedef std::list<CCoreMetaAttribute*> attributes_type;//slist

  	CCoreMetaProject *project;
  	attributes_type attributes;
! 	std::vector<GUID> classids;

  	metaid_type metaid;
! 	std::string token;
! 	std::string name;

  // ------- Methods
***************
*** 58,62 ****
  public:
  	const attributes_type &GetAttributes() const { return attributes; }
! 	const vector<GUID> &GetClassIDs() const { return classids; }
  	metaid_type GetMetaID() const { return metaid; }

--- 58,62 ----
  public:
  	const attributes_type &GetAttributes() const { return attributes; }
! 	const std::vector<GUID> &GetClassIDs() const { return classids; }
  	metaid_type GetMetaID() const { return metaid; }

Index: CoreMetaProject.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Core/CoreMetaProject.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CoreMetaProject.cpp	28 Jun 2001 05:40:00 -0000	1.5
--- CoreMetaProject.cpp	13 Oct 2004 15:17:54 -0000	1.6
***************
*** 124,128 ****
  	COMTRY
  	{
! 		typedef CCoreCollection<ICoreMetaObjects, vector<ICoreMetaObject*>, 
  			ICoreMetaObject, CCoreMetaObject> COMTYPE;

--- 124,128 ----
  	COMTRY
  	{
! 		typedef CCoreCollection<ICoreMetaObjects, std::vector<ICoreMetaObject*>, 
  			ICoreMetaObject, CCoreMetaObject> COMTYPE;

Index: CoreMetaProject.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Core/CoreMetaProject.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CoreMetaProject.h	19 Jul 2000 23:16:00 -0000	1.4
--- CoreMetaProject.h	13 Oct 2004 15:17:54 -0000	1.5
***************
*** 3,7 ****
  #define MGA_COREMETAPROJECT_H

! #include <slist>

  class CCoreMetaObject;
--- 3,7 ----
  #define MGA_COREMETAPROJECT_H

! #include <list>//slist

  class CCoreMetaObject;
***************
*** 49,58 ****
  public:

! 	typedef slist<CCoreMetaObject*> objects_type;
  	typedef objects_type::iterator objects_iterator;

  	objects_type objects;
! 	string name;
! 	string token;
  	GUID guid;
  };
--- 49,58 ----
  public:

! 	typedef std::list<CCoreMetaObject*> objects_type;//slist
  	typedef objects_type::iterator objects_iterator;

  	objects_type objects;
! 	std::string name;
! 	std::string token;
  	GUID guid;
  };

Index: CoreODBC.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Core/CoreODBC.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CoreODBC.cpp	2 Oct 2002 18:16:00 -0000	1.5
--- CoreODBC.cpp	13 Oct 2004 15:17:54 -0000	1.6
***************
*** 1,4 ****
--- 1,5 ----

  #include "stdafx.h"
+ #include <string>
  #include "CoreODBC.h"
  #include "CommonCollection.h"
***************
*** 60,64 ****

! sqlstring tablename(ICoreMetaObject *m) {
  	CComBSTR bb;
  	COMTHROW(m->get_Token(&bb));
--- 61,65 ----

! std::sqlstring tablename(ICoreMetaObject *m) {
  	CComBSTR bb;
  	COMTHROW(m->get_Token(&bb));
***************
*** 66,70 ****
  }

! sqlstring colname(ICoreMetaAttribute *m) {
  	CComBSTR bb;
  	COMTHROW(m->get_Token(&bb));
--- 67,71 ----
  }

! std::sqlstring colname(ICoreMetaAttribute *m) {
  	CComBSTR bb;
  	COMTHROW(m->get_Token(&bb));
***************
*** 371,379 ****
  		SQLTHROW(SQLBindParameter(hstmt, 1, SQL_PARAM_INPUT, SQL_C_UBIGINT, SQL_BIGINT, 20, 0,
                   &kk, 0, 0));
! 		vector<metaobjidpair_type> idpairs;
  		for(attrlist::iterator vv = pp->second.begin(); vv != pp->second.end(); vv++) {
  			CComPtr<ICoreMetaObject> mo;
  			COMTHROW((*vv)->get_Object(&mo));
! 			sqlstring oblister;
  			oblister.format("SELECT objid FROM \"%s\" WHERE \"%s\" = ?", tablename(mo), colname(*vv));
  			SQLTHROW(SQLExecDirect(hstmt, oblister, SQL_NTS));
--- 372,380 ----
  		SQLTHROW(SQLBindParameter(hstmt, 1, SQL_PARAM_INPUT, SQL_C_UBIGINT, SQL_BIGINT, 20, 0,
                   &kk, 0, 0));
! 		std::vector<metaobjidpair_type> idpairs;
  		for(attrlist::iterator vv = pp->second.begin(); vv != pp->second.end(); vv++) {
  			CComPtr<ICoreMetaObject> mo;
  			COMTHROW((*vv)->get_Object(&mo));
! 			std::sqlstring oblister;
  			oblister.format("SELECT objid FROM \"%s\" WHERE \"%s\" = ?", tablename(mo), colname(*vv));
  			SQLTHROW(SQLExecDirect(hstmt, oblister, SQL_NTS));
***************
*** 396,400 ****
  		SQLTHROW(SQLBindParameter(hstmt, 1, SQL_PARAM_INPUT, SQL_C_ULONG, SQL_INTEGER, 10, 0,
                    &opened_object, 0, 0));
! 		sqlstring oblocate;
  		oblocate.format("SELECT \"%s\" FROM \"%s\" WITH (UPDLOCK) WHERE objid = ?", colname(metaattribute), tablename(metaobject));
  		SQLTHROW(SQLExecDirect(hstmt, oblocate, SQL_NTS));
--- 397,401 ----
  		SQLTHROW(SQLBindParameter(hstmt, 1, SQL_PARAM_INPUT, SQL_C_ULONG, SQL_INTEGER, 10, 0,
                    &opened_object, 0, 0));
! 		std::sqlstring oblocate;
  		oblocate.format("SELECT \"%s\" FROM \"%s\" WITH (UPDLOCK) WHERE objid = ?", colname(metaattribute), tablename(metaobject));
  		SQLTHROW(SQLExecDirect(hstmt, oblocate, SQL_NTS));
***************
*** 521,525 ****
  		SQLTHROW(SQLBindParameter(hstmt, 2, SQL_PARAM_INPUT, SQL_C_ULONG, SQL_INTEGER, 10, 0,
  	                 &opened_object, 0, 0));
! 		sqlstring oblocate;
  		oblocate.format("UPDATE \"%s\" SET \"%s\"=? WHERE objid = ?", tablename(metaobject), colname(metaattribute));
  		SQLTHROW(SQLExecDirect(hstmt, oblocate, SQL_NTS));
--- 522,526 ----
  		SQLTHROW(SQLBindParameter(hstmt, 2, SQL_PARAM_INPUT, SQL_C_ULONG, SQL_INTEGER, 10, 0,
  	                 &opened_object, 0, 0));
! 		std::sqlstring oblocate;
  		oblocate.format("UPDATE \"%s\" SET \"%s\"=? WHERE objid = ?", tablename(metaobject), colname(metaattribute));
  		SQLTHROW(SQLExecDirect(hstmt, oblocate, SQL_NTS));
***************
*** 542,546 ****
  		SQLTHROW(SQLBindParameter(hstmt, 1, SQL_PARAM_INPUT, SQL_C_ULONG, SQL_INTEGER, 10, 0,
                    &objid, 0, 0));
! 		sqlstring oblocate;
  		oblocate.format("SELECT objid FROM \"%s\" WITH (UPDLOCK) WHERE objid = ?", tablename(metaobject));
  		SQLTHROW(SQLExecDirect(hstmt, oblocate, SQL_NTS));
--- 543,547 ----
  		SQLTHROW(SQLBindParameter(hstmt, 1, SQL_PARAM_INPUT, SQL_C_ULONG, SQL_INTEGER, 10, 0,
                    &objid, 0, 0));
! 		std::sqlstring oblocate;
  		oblocate.format("SELECT objid FROM \"%s\" WITH (UPDLOCK) WHERE objid = ?", tablename(metaobject));
  		SQLTHROW(SQLExecDirect(hstmt, oblocate, SQL_NTS));
***************
*** 571,579 ****
  		opened_object = OBJID_NONE;

! 		sqlstring obcreate;
  		obcreate.format("INSERT INTO \"%s\" DEFAULT VALUES", tablename(metaobject));
  		SQLTHROW(SQLExecDirect(hstmt, obcreate, SQL_NTS));

! 		sqlstring obgetid = "SELECT SCOPE_IDENTITY() AS [_SCI]";
  		SQLTHROW(SQLExecDirect(hstmt, obgetid, SQL_NTS));

--- 572,580 ----
  		opened_object = OBJID_NONE;

! 		std::sqlstring obcreate;
  		obcreate.format("INSERT INTO \"%s\" DEFAULT VALUES", tablename(metaobject));
  		SQLTHROW(SQLExecDirect(hstmt, obcreate, SQL_NTS));

! 		std::sqlstring obgetid = "SELECT SCOPE_IDENTITY() AS [_SCI]";
  		SQLTHROW(SQLExecDirect(hstmt, obgetid, SQL_NTS));

***************
*** 604,608 ****
  		SQLTHROW(SQLBindParameter(hstmt, 1, SQL_PARAM_INPUT, SQL_C_ULONG, SQL_INTEGER, 10, 0,
                    &opened_object, 0, 0));
! 		sqlstring oblocate;
  		oblocate.format("SELECT objid FROM \"%s\" WITH (HOLDLOCK) WHERE objid = ?", tablename(metaobject));
  		SQLTHROW(SQLExecDirect(hstmt, oblocate, SQL_NTS));
--- 605,609 ----
  		SQLTHROW(SQLBindParameter(hstmt, 1, SQL_PARAM_INPUT, SQL_C_ULONG, SQL_INTEGER, 10, 0,
                    &opened_object, 0, 0));
! 		std::sqlstring oblocate;
  		oblocate.format("SELECT objid FROM \"%s\" WITH (HOLDLOCK) WHERE objid = ?", tablename(metaobject));
  		SQLTHROW(SQLExecDirect(hstmt, oblocate, SQL_NTS));
***************
*** 624,628 ****
  		SQLTHROW(SQLBindParameter(hstmt, 1, SQL_PARAM_INPUT, SQL_C_ULONG, SQL_INTEGER, 10, 0,
                    &opened_object, 0, 0));
! 		sqlstring obdelete;
  		obdelete.format("DELETE \"%s\" WHERE objid = ?", tablename(metaobject));
  		SQLTHROW(SQLExecDirect(hstmt, obdelete, SQL_NTS));
--- 625,629 ----
  		SQLTHROW(SQLBindParameter(hstmt, 1, SQL_PARAM_INPUT, SQL_C_ULONG, SQL_INTEGER, 10, 0,
                    &opened_object, 0, 0));
! 		std::sqlstring obdelete;
  		obdelete.format("DELETE \"%s\" WHERE objid = ?", tablename(metaobject));
  		SQLTHROW(SQLExecDirect(hstmt, obdelete, SQL_NTS));
***************
*** 661,665 ****
  		CopyTo(connection, connstr);
  #define ODBCKEYWORDLEN 5   // "ODBC;"
!  		if( !(string(connstr, 0, ODBCKEYWORDLEN) == "ODBC;") )
  			HR_THROW(E_INVALID_USAGE);

--- 662,666 ----
  		CopyTo(connection, connstr);
  #define ODBCKEYWORDLEN 5   // "ODBC;"
! 		if( !(std::string(connstr, 0, ODBCKEYWORDLEN) == "ODBC;") )
  			HR_THROW(E_INVALID_USAGE);

***************
*** 688,693 ****
  		COMTHROW(metaproject->get_Objects(&mobs));
  		MGACOLL_ITERATE(ICoreMetaObject, mobs) {
! 			sqlstring tname = tablename(MGACOLL_ITER);
! sqlstring drop;
  drop.format("DROP TABLE \"%s\"", tname);
  if(create) SQLExecDirect(hstmt, drop, SQL_NTS);
--- 689,694 ----
  		COMTHROW(metaproject->get_Objects(&mobs));
  		MGACOLL_ITERATE(ICoreMetaObject, mobs) {
! 			std::sqlstring tname = tablename(MGACOLL_ITER);
! std::sqlstring drop;
  drop.format("DROP TABLE \"%s\"", tname);
  if(create) SQLExecDirect(hstmt, drop, SQL_NTS);
***************
*** 701,705 ****

! 			sqlstring creacmd("CREATE TABLE ");
  			if(!tableexists) {
  				if(!create) HR_THROW(E_ODBC);
--- 702,706 ----

! 			std::sqlstring creacmd("CREATE TABLE ");
  			if(!tableexists) {
  				if(!create) HR_THROW(E_ODBC);
***************
*** 722,726 ****
  									{SQL_FLOAT,  "DOUBLE PRECISION DEFAULT 0.0"}}; 
  				if(vt !=  VALTYPE_COLLECTION) {
! 					sqlstring cname = colname(MGACOLL_ITER);

  					if(tableexists) {
--- 723,727 ----
  									{SQL_FLOAT,  "DOUBLE PRECISION DEFAULT 0.0"}}; 
  				if(vt !=  VALTYPE_COLLECTION) {
! 					std::sqlstring cname = colname(MGACOLL_ITER);

  					if(tableexists) {
***************
*** 796,800 ****
  		COMTHROW(metaproject->get_Object(METAID_ROOT, &mo));

! 		sqlstring rootcreate;
  		rootcreate.format("SET IDENTITY_INSERT \"%s\" ON", tablename(mo));
  		SQLTHROW(SQLExecDirect(hstmt, rootcreate, SQL_NTS));
--- 797,801 ----
  		COMTHROW(metaproject->get_Object(METAID_ROOT, &mo));

! 		std::sqlstring rootcreate;
  		rootcreate.format("SET IDENTITY_INSERT \"%s\" ON", tablename(mo));
  		SQLTHROW(SQLExecDirect(hstmt, rootcreate, SQL_NTS));
***************
*** 889,892 ****
--- 890,895 ----
  }

+ namespace std
+ {
  sqlstring::sqlstring(const BSTR a) {
  	resize(SysStringLen(a),'x');
***************
*** 911,912 ****
--- 914,916 ----
     return *this;
  }
+ };
\ No newline at end of file

Index: CoreODBC.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Core/CoreODBC.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CoreODBC.h	21 Sep 2001 19:44:00 -0000	1.1
--- CoreODBC.h	13 Oct 2004 15:17:54 -0000	1.2
***************
*** 3,8 ****
  #define MGA_COREODBC_H

! #include <fstream.h>
! #include <slist>
  #include <hash_map>
  #include <map>
--- 3,8 ----
  #define MGA_COREODBC_H

! #include <fstream>//fstream.h
! #include <list>//slist
  #include <hash_map>
  #include <map>
***************
*** 16,28 ****

  // sqlstring
! 
  class sqlstring : public string {
  public:
  	sqlstring() { ; }
! 	sqlstring(const string a) : string(a) {; }
! 	sqlstring(const sqlstring &a) : string(a) {; }
  	sqlstring(const BSTR a);
! 	sqlstring(const char *a) : string(a) {; }
! 	sqlstring(const SQLCHAR *a) : string((char *)a) {; };
  	const sqlstring &format(char *templ, const sqlstring &p1);
  	const sqlstring &format(char *templ, const sqlstring &p1, const sqlstring &p2);
--- 16,29 ----

  // sqlstring
! namespace std
! {
  class sqlstring : public string {
  public:
  	sqlstring() { ; }
! 	sqlstring(const string a) : string(a) {; } 
! 	sqlstring(const sqlstring &a): string(a) {; }
  	sqlstring(const BSTR a);
! 	sqlstring(const char *a): string(a) {; }
! 	sqlstring(const SQLCHAR *a): string((char *)a) {; };
  	const sqlstring &format(char *templ, const sqlstring &p1);
  	const sqlstring &format(char *templ, const sqlstring &p1, const sqlstring &p2);
***************
*** 30,33 ****
--- 31,35 ----
  	operator string() { return *(string *)this; }
  };
+ };

***************
*** 58,64 ****

  public:
! 	typedef slist< CComObjPtr<ICoreMetaAttribute> > attrlist;
! 	typedef map<attrid_type, attrlist > pratype;
! 	typedef map<attrid_type, attrlist >::iterator praiterator;
  	pratype ptrrevattrs;
  	CComObjPtr<ICoreMetaProject> metaproject;
--- 60,66 ----

  public:
! 	typedef std::list< CComObjPtr<ICoreMetaAttribute> > attrlist;//slist
! 	typedef std::map<attrid_type, attrlist > pratype;
! 	typedef std::map<attrid_type, attrlist >::iterator praiterator;
  	pratype ptrrevattrs;
  	CComObjPtr<ICoreMetaProject> metaproject;
***************
*** 123,127 ****

  public:
! 	sqlstring connstr;
  	bool read_only;
  	bool intrans;
--- 125,129 ----

  public:
! 	std::sqlstring connstr;
  	bool read_only;
  	bool intrans;

Index: CoreObject.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Core/CoreObject.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** CoreObject.cpp	18 May 2004 13:30:59 -0000	1.13
--- CoreObject.cpp	13 Oct 2004 15:17:54 -0000	1.14
***************
*** 159,163 ****
  	COMTRY
  	{
! 		typedef CCoreCollection<ICoreAttributes, vector<ICoreAttribute*>,
  			ICoreAttribute, CCoreAttribute> COMTYPE;

--- 159,163 ----
  	COMTRY
  	{
! 		typedef CCoreCollection<ICoreAttributes, std::vector<ICoreAttribute*>,
  			ICoreAttribute, CCoreAttribute> COMTYPE;

***************
*** 357,364 ****
  	ASSERT( p != NULL );

! 	const vector<GUID> &classids = metaobject->GetClassIDs();

! 	vector<GUID>::const_iterator i = classids.begin();
! 	vector<GUID>::const_iterator e = classids.end();
  	while( i != e )
  	{
--- 357,364 ----
  	ASSERT( p != NULL );

! 	const std::vector<GUID> &classids = metaobject->GetClassIDs();

! 	std::vector<GUID>::const_iterator i = classids.begin();
! 	std::vector<GUID>::const_iterator e = classids.end();
  	while( i != e )
  	{
***************
*** 427,431 ****
  	ASSERT( FindAttribute(attribute->GetAttrID()) != NULL );

! 	attributes_iterator i = find(attributes.begin(), attributes.end(), attribute);
  	ASSERT( i != attributes.end() );

--- 427,431 ----
  	ASSERT( FindAttribute(attribute->GetAttrID()) != NULL );

! 	attributes_iterator i = std::find(attributes.begin(), attributes.end(), attribute);
  	ASSERT( i != attributes.end() );

***************
*** 434,438 ****

  void CCoreObject::GetAttributes(CCoreLockAttribute *lockattribute, 
! 	list<CCoreAttribute*> &controlled)
  {
  	ASSERT( lockattribute != NULL );
--- 434,438 ----

  void CCoreObject::GetAttributes(CCoreLockAttribute *lockattribute, 
! 	std::list<CCoreAttribute*> &controlled)
  {
  	ASSERT( lockattribute != NULL );
***************
*** 468,472 ****

! 	list<CCoreAttribute*> controlled;
  	GetAttributes(lockattribute, controlled);

--- 468,472 ----

! 	std::list<CCoreAttribute*> controlled;
  	GetAttributes(lockattribute, controlled);

***************
*** 502,506 ****
  	ASSERT( lockattribute != NULL );

! 	list<CCoreAttribute*> controlled;
  	GetAttributes(lockattribute, controlled);

--- 502,506 ----
  	ASSERT( lockattribute != NULL );

! 	std::list<CCoreAttribute*> controlled;
  	GetAttributes(lockattribute, controlled);

***************
*** 601,605 ****
  	COMTHROW( metaobject->get_Name(PutOut(metabstr)) );

! 	string metaname;
  	CopyTo(metabstr, metaname);

--- 601,605 ----
  	COMTHROW( metaobject->get_Name(PutOut(metabstr)) );

! 	std::string metaname;
  	CopyTo(metabstr, metaname);

Index: CoreObject.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Core/CoreObject.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CoreObject.h	14 Feb 2001 23:09:00 -0000	1.9
--- CoreObject.h	13 Oct 2004 15:17:54 -0000	1.10
***************
*** 12,16 ****

  #include <list>
! #include <slist>

  class CCoreProject;
--- 12,16 ----

  #include <list>
! //#include <slist>

  class CCoreProject;
***************
*** 74,82 ****
  	objid_type objid;

! 	typedef list<CCoreAttribute*> attributes_type;
  	typedef attributes_type::iterator attributes_iterator;
  	attributes_type attributes;

! 	typedef slist< CComObjPtr<IUnknown> > aggregates_type;
  	typedef aggregates_type::iterator aggregates_iterator;
  	aggregates_type aggregates;
--- 74,82 ----
  	objid_type objid;

! 	typedef std::list<CCoreAttribute*> attributes_type;
  	typedef attributes_type::iterator attributes_iterator;
  	attributes_type attributes;

! 	typedef std::list< CComObjPtr<IUnknown> > aggregates_type;//slist
  	typedef aggregates_type::iterator aggregates_iterator;
  	aggregates_type aggregates;
***************
*** 106,110 ****

  	void GetAttributes(CCoreLockAttribute *lockattribute,
! 		list<CCoreAttribute*> &controlled) NOTHROW;

  	void LoadAttributes(CCoreLockAttribute *lockattribute);
--- 106,110 ----

  	void GetAttributes(CCoreLockAttribute *lockattribute,
! 		std::list<CCoreAttribute*> &controlled) NOTHROW;

  	void LoadAttributes(CCoreLockAttribute *lockattribute);

Index: CoreProject.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Core/CoreProject.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** CoreProject.cpp	14 Sep 2004 14:00:07 -0000	1.13
--- CoreProject.cpp	13 Oct 2004 15:17:54 -0000	1.14
***************
*** 151,165 ****
  }

! string CCoreProject::GetFirstToken(BSTR connection)
  {
! 	string con;
  	CopyTo(connection, con);

  	int pos = con.find('=');
! 	if( pos != string::npos )
  		con.resize(pos);

  	pos = con.find(';');
! 	if( pos != string::npos )
  		con.resize(pos);

--- 151,165 ----
  }

! std::string CCoreProject::GetFirstToken(BSTR connection)
  {
! 	std::string con;
  	CopyTo(connection, con);

  	int pos = con.find('=');
! 	if( pos != std::string::npos )
  		con.resize(pos);

  	pos = con.find(';');
! 	if( pos != std::string::npos )
  		con.resize(pos);

***************
*** 177,181 ****
  	COMTRY
  	{
! 		string con = GetFirstToken(connection);

  		CComObjPtr<ICoreStorage> corestorage;
--- 177,181 ----
  	COMTRY
  	{
! 		std::string con = GetFirstToken(connection);

  		CComObjPtr<ICoreStorage> corestorage;
***************
*** 265,269 ****
  	COMTRY
  	{
! 		string con = GetFirstToken(connection);

  		CComObjPtr<ICoreStorage> corestorage;
--- 265,269 ----
  	COMTRY
  	{
! 		std::string con = GetFirstToken(connection);

  		CComObjPtr<ICoreStorage> corestorage;
***************
*** 467,473 ****
  STDMETHODIMP CCoreProject::UndoTransaction()
  {
! 	ASSERT( undos.size() >= redo_count && redo_count >= 0 );

! 	if( storage == NULL || InTransaction() || undos.size() <= redo_count )
  		COMRETURN(E_INVALID_USAGE);

--- 467,473 ----
  STDMETHODIMP CCoreProject::UndoTransaction()
  {
! 	ASSERT( (int) undos.size() >= redo_count && redo_count >= 0 );//zolmol!

! 	if( storage == NULL || InTransaction() || (int) undos.size() <= redo_count )//zolmol!
  		COMRETURN(E_INVALID_USAGE);

***************
*** 481,485 ****
  STDMETHODIMP CCoreProject::RedoTransaction()
  {
! 	ASSERT( undos.size() >= redo_count && redo_count >= 0 );

  	if( storage == NULL || InTransaction() || redo_count <= 0 )
--- 481,485 ----
  STDMETHODIMP CCoreProject::RedoTransaction()
  {
! 	ASSERT( (int) undos.size() >= redo_count && redo_count >= 0 );//zolmol!

  	if( storage == NULL || InTransaction() || redo_count <= 0 )
***************
*** 495,499 ****
  STDMETHODIMP CCoreProject::FlushUndoQueue()
  {
! 	ASSERT( undos.size() >= redo_count && redo_count >= 0 );

  	if( storage == NULL || InTransaction() )
--- 495,499 ----
  STDMETHODIMP CCoreProject::FlushUndoQueue()
  {
! 	ASSERT( (int) undos.size() >= redo_count && redo_count >= 0 );//zolmol!

  	if( storage == NULL || InTransaction() )
***************
*** 510,514 ****
  STDMETHODIMP CCoreProject::FlushRedoQueue()
  {
! 	ASSERT( undos.size() >= redo_count && redo_count >= 0 );

  	if( storage == NULL || InTransaction() )
--- 510,514 ----
  STDMETHODIMP CCoreProject::FlushRedoQueue()
  {
! 	ASSERT( (int) undos.size() >= redo_count && redo_count >= 0 );//zolmol!

  	if( storage == NULL || InTransaction() )
***************
*** 527,531 ****
  	CHECK_OUT(p);

! 	ASSERT( undos.size() >= redo_count );
  	*p = undos.size() - redo_count - (InTransaction() ? 1 : 0);
  	ASSERT( *p >= 0 );
--- 527,531 ----
  	CHECK_OUT(p);

! 	ASSERT( (int) undos.size() >= redo_count );//zolmol!
  	*p = undos.size() - redo_count - (InTransaction() ? 1 : 0);
  	ASSERT( *p >= 0 );
***************
*** 538,542 ****
  	CHECK_OUT(p);

! 	ASSERT( undos.size() >= redo_count );
  	*p = redo_count;

--- 538,542 ----
  	CHECK_OUT(p);

! 	ASSERT( (int) undos.size() >= redo_count );//zolmol!
  	*p = redo_count;

Index: CoreProject.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Core/CoreProject.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CoreProject.h	26 Jul 2001 18:18:00 -0000	1.7
--- CoreProject.h	13 Oct 2004 15:17:54 -0000	1.8
***************
*** 4,8 ****

  #include <list>
! #include <slist>
  #include <hash_map>
  #include "CommonVersionInfo.h"
--- 4,8 ----

  #include <list>
! //#include <slist>
  #include <hash_map>
  #include "CommonVersionInfo.h"
***************
*** 22,26 ****

  typedef CCoreTransactionItem *transaction_item_type;
! typedef slist<transaction_item_type> transaction_items_type;
  typedef transaction_items_type::iterator transaction_items_iterator;

--- 22,26 ----

  typedef CCoreTransactionItem *transaction_item_type;
! typedef std::list<transaction_item_type> transaction_items_type;//slist
  typedef transaction_items_type::iterator transaction_items_iterator;

***************
*** 31,55 ****
  } transaction_type;

! typedef list<transaction_type> transactions_type;
  typedef transactions_type::iterator transactions_iterator;

  typedef CCoreFinalTrItem *finaltr_item_type;
! typedef slist<finaltr_item_type> finaltr_items_type;
  typedef finaltr_items_type::iterator finaltr_items_iterator;

  typedef CCoreUndoItem *undo_item_type;
! typedef slist<undo_item_type> undo_items_type;
  typedef undo_items_type::iterator undo_items_iterator;

  typedef undo_items_type undo_type;
! typedef list<undo_type> undos_type;
  typedef undos_type::iterator undos_iterator;

! typedef hash_map<metaobjidpair_type, CCoreObject*, 
  	metaobjidpair_hashfunc, metaobjidpair_equalkey> object_lookup_type;
  typedef object_lookup_type::iterator object_lookup_iterator;

! typedef slist< CComObjPtr<CCoreTerritory> > pushed_territorys_type;
! typedef slist<CCoreTerritory*> created_territorys_type;

  // --------------------------- CCoreProject
--- 31,55 ----
  } transaction_type;

! typedef std::list<transaction_type> transactions_type;
  typedef transactions_type::iterator transactions_iterator;

  typedef CCoreFinalTrItem *finaltr_item_type;
! typedef std::list<finaltr_item_type> finaltr_items_type;//slist
  typedef finaltr_items_type::iterator finaltr_items_iterator;

  typedef CCoreUndoItem *undo_item_type;
! typedef std::list<undo_item_type> undo_items_type;//slist
  typedef undo_items_type::iterator undo_items_iterator;

  typedef undo_items_type undo_type;
! typedef std::list<undo_type> undos_type;
  typedef undos_type::iterator undos_iterator;

! typedef std::hash_map<metaobjidpair_type, CCoreObject*, 
  	metaobjidpair_hashfunc, metaobjidpair_equalkey> object_lookup_type;
  typedef object_lookup_type::iterator object_lookup_iterator;

! typedef std::list< CComObjPtr<CCoreTerritory> > pushed_territorys_type;//slist
! typedef std::list<CCoreTerritory*> created_territorys_type;//slist

  // --------------------------- CCoreProject
***************
*** 110,114 ****
  	STDMETHOD(PopTerritory)();

! 	string GetFirstToken(BSTR connection);

  // ------- Attributes
--- 110,114 ----
  	STDMETHOD(PopTerritory)();

! 	std::string GetFirstToken(BSTR connection);

  // ------- Attributes

Index: CoreRepository.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Core/CoreRepository.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CoreRepository.cpp	31 Oct 2001 00:37:00 -0000	1.6
--- CoreRepository.cpp	13 Oct 2004 15:17:54 -0000	1.7
***************
*** 3,7 ****
  #define INITGUID
  #include <initguid.h>
! #include <slist>
  #include "CoreRepository.h"
  #define	CIfacePtr CComObjPtr
--- 3,7 ----
  #define INITGUID
  #include <initguid.h>
! #include <list>//slist
  #include "CoreRepository.h"
  #define	CIfacePtr CComObjPtr
***************
*** 95,99 ****
  }

! string CCoreRepository::GetProjectToken()
  {
  	ASSERT( metaproject != NULL );
--- 95,99 ----
  }

! std::string CCoreRepository::GetProjectToken()
  {
  	ASSERT( metaproject != NULL );
***************
*** 104,108 ****
  		HR_THROW(E_METAPROJECT);

! 	string tmp;
  	CopyTo(name, tmp);

--- 104,108 ----
  		HR_THROW(E_METAPROJECT);

! 	std::string tmp;
  	CopyTo(name, tmp);

***************
*** 191,195 ****
  }

! string CCoreRepository::GetObjectToken()
  {
  	ASSERT( metaobject != NULL );
--- 191,195 ----
  }

! std::string CCoreRepository::GetObjectToken()
  {
  	ASSERT( metaobject != NULL );
***************
*** 200,204 ****
  		HR_THROW(E_METAPROJECT);

! 	string tmp;
  	CopyTo(name, tmp);

--- 200,204 ----
  		HR_THROW(E_METAPROJECT);

! 	std::string tmp;
  	CopyTo(name, tmp);

***************
*** 349,353 ****
  }

! string CCoreRepository::GetToken(ICoreMetaAttribute *p)
  {
  	if( p == NULL )
--- 349,353 ----
  }

! std::string CCoreRepository::GetToken(ICoreMetaAttribute *p)
  {
  	if( p == NULL )
***************
*** 360,364 ****
  		HR_THROW(E_METAPROJECT);

! 	string tmp;
  	CopyTo(name, tmp);

--- 360,364 ----
  		HR_THROW(E_METAPROJECT);

! 	std::string tmp;
  	CopyTo(name, tmp);

***************
*** 466,470 ****
  		ASSERT( metaobjects != NULL );

! 		typedef vector< CComObjPtr<ICoreMetaObject> > metaobjectlist_type;
  		metaobjectlist_type metaobjectlist;
  		GetAll<ICoreMetaObjects, ICoreMetaObject>(metaobjects, metaobjectlist);
--- 466,470 ----
  		ASSERT( metaobjects != NULL );

! 		typedef std::vector< CComObjPtr<ICoreMetaObject> > metaobjectlist_type;
  		metaobjectlist_type metaobjectlist;
  		GetAll<ICoreMetaObjects, ICoreMetaObject>(metaobjects, metaobjectlist);
***************
*** 514,518 ****
  		CComObjPtr<IInterfaceDef> reprootinterfacedef;
  		COMTHROW( reprootclassdef->CreateInterfaceDef(PutInVariant(OBJID_NULL),
! 			PutInBstr(string("I") + GetProjectToken()),
  			PutInVariant(GetGUID(1, ATTRID_NONE + ATTRID_COLLECTION)),
  			repdispatchdef, NULL, PutOut(reprootinterfacedef)) );
--- 514,518 ----
  		CComObjPtr<IInterfaceDef> reprootinterfacedef;
  		COMTHROW( reprootclassdef->CreateInterfaceDef(PutInVariant(OBJID_NULL),
! 			PutInBstr(std::string("I") + GetProjectToken()),
  			PutInVariant(GetGUID(1, ATTRID_NONE + ATTRID_COLLECTION)),
  			repdispatchdef, NULL, PutOut(reprootinterfacedef)) );
***************
*** 563,567 ****
  			COMTHROW( reprootinterfacedef->CreatePropertyDef(
  				PutInVariant(OBJID_NULL),
! 				PutInBstr(string("ObjID_") + GetObjectToken()),
  				GetMetaID(), SQL_C_LONG,
  				PutOut(propertydef)) );
--- 563,567 ----
  			COMTHROW( reprootinterfacedef->CreatePropertyDef(
  				PutInVariant(OBJID_NULL),
! 				PutInBstr(std::string("ObjID_") + GetObjectToken()),
  				GetMetaID(), SQL_C_LONG,
  				PutOut(propertydef)) );
***************
*** 582,586 ****

  		COMTHROW( corerootobj->put_Name(
! 			PutInBstr(string("MGA ") + GetProjectToken() + " Root Object")) );

  		CComObjPtr<IRepositoryObject> reprootobj;
--- 582,586 ----

  		COMTHROW( corerootobj->put_Name(
! 			PutInBstr(std::string("MGA ") + GetProjectToken() + " Root Object")) );

  		CComObjPtr<IRepositoryObject> reprootobj;
***************
*** 686,690 ****
  		ASSERT( metaattrs != NULL );

! 		typedef vector< CComObjPtr<ICoreMetaAttribute> > metaattrlist_type;
  		metaattrlist_type metaattrlist;
  		GetAll<ICoreMetaAttributes,ICoreMetaAttribute>(metaattrs, metaattrlist);
--- 686,690 ----
  		ASSERT( metaattrs != NULL );

! 		typedef std::vector< CComObjPtr<ICoreMetaAttribute> > metaattrlist_type;
  		metaattrlist_type metaattrlist;
  		GetAll<ICoreMetaAttributes,ICoreMetaAttribute>(metaattrs, metaattrlist);
***************
*** 765,769 ****
  	}

! 	string name(GetPropertyName());
  	DISPID dispid(attrid);

--- 765,769 ----
  	}

! 	std::string name(GetPropertyName());
  	DISPID dispid(attrid);

***************
*** 825,831 ****
  // ------- CollDefs

! inline string CCoreRepository::GetCollInterfaceName(ICoreMetaAttribute *metaaattribute)
  {
! 	return string("I") + GetToken(metaattribute);
  }

--- 825,831 ----
  // ------- CollDefs

! inline std::string CCoreRepository::GetCollInterfaceName(ICoreMetaAttribute *metaaattribute)
  {
! 	return std::string("I") + GetToken(metaattribute);
  }

***************
*** 908,913 ****
  // ------- Project

! void CCoreRepository::GetConnUserPswd(string &connection, 
! 	string &conn, string &user, string &pswd)
  {
  	conn.erase();
--- 908,913 ----
  // ------- Project

! void CCoreRepository::GetConnUserPswd(std::string &connection, 
! 	std::string &conn, std::string &user, std::string &pswd)
  {
  	conn.erase();
***************
*** 922,926 ****
  			end = connection.size();

! 		string keyval(connection, pos, end-pos);
  		pos = end+1;

--- 922,926 ----
  			end = connection.size();

! 		std::string keyval(connection, pos, end-pos);
  		pos = end+1;

***************
*** 931,936 ****
  		if( mid != keyval.npos )
  		{
! 			string key(keyval, 0, mid);
! 			string val(keyval, mid+1);

  			if( key == "USER" )
--- 931,936 ----
  		if( mid != keyval.npos )
  		{
! 			std::string key(keyval, 0, mid);
! 			std::string val(keyval, mid+1);

  			if( key == "USER" )
***************
*** 974,981 ****
  		ASSERT( repository != NULL );

! 		string connall;
  		CopyTo(connection, connall);

! 		string conn, user, pswd;
  		GetConnUserPswd(connall, conn, user, pswd);

--- 974,981 ----
  		ASSERT( repository != NULL );

! 		std::string connall;
  		CopyTo(connection, connall);

! 		std::string conn, user, pswd;
  		GetConnUserPswd(connall, conn, user, pswd);

***************
*** 1010,1017 ****
  		ASSERT( repository != NULL );

! 		string connall;
  		CopyTo(connection, connall);

! 		string conn, user, pswd;
  		GetConnUserPswd(connall, conn, user, pswd);

--- 1010,1017 ----
  		ASSERT( repository != NULL );

! 		std::string connall;
  		CopyTo(connection, connall);

! 		std::string conn, user, pswd;
  		GetConnUserPswd(connall, conn, user, pswd);

***************
*** 1349,1353 ****
  			COMTHROW( objcol->get_Count(&c) );

! 			vector<metaobjidpair_type> idpairs;

  			for(long i = 1; i <= c; i++)
--- 1349,1353 ----
  			COMTHROW( objcol->get_Count(&c) );

! 			std::vector<metaobjidpair_type> idpairs;

  			for(long i = 1; i <= c; i++)
***************
*** 1370,1374 ****
  			ASSERT( c == 0 || c == 1 );

! 			vector<metaobjidpair_type> idpairs;

  			if( c != 0 )
--- 1370,1374 ----
  			ASSERT( c == 0 || c == 1 );

! 			std::vector<metaobjidpair_type> idpairs;

  			if( c != 0 )
***************
*** 1519,1525 ****
--- 1519,1527 ----
  			{
  				CComObjPtr<IRepositoryObject> repobj;
+ #pragma warning( disable: 4244) // conversion from 'long' to 'short', possible loss of data
  				COMTHROW( repository->get_Object(
  					PutInVariant(GetObjectOBJID(idpair.metaid, idpair.objid)),
  					PutOut(repobj)) );
+ #pragma warning( default: 4244) // conversion from 'long' to 'short', possible loss of data
  				ASSERT( repobj != NULL );

***************
*** 1586,1590 ****
  }

! void CCoreRepository::AddIDPair(IObjectCol *objcol, long i, vector<metaobjidpair_type> &idpairs)
  {
  	ASSERT( objcol != NULL );
--- 1588,1592 ----
  }

! void CCoreRepository::AddIDPair(IObjectCol *objcol, long i, std::vector<metaobjidpair_type> &idpairs)
  {
  	ASSERT( objcol != NULL );

Index: CoreRepository.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Core/CoreRepository.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CoreRepository.h	11 Apr 2001 05:54:00 -0000	1.4
--- CoreRepository.h	13 Oct 2004 15:17:54 -0000	1.5
***************
*** 39,43 ****
  	void CloseMetaProject() NOTHROW;

! 	string GetProjectToken();

  // ------- MetaObject
--- 39,43 ----
  	void CloseMetaProject() NOTHROW;

! 	std::string GetProjectToken();

  // ------- MetaObject
***************
*** 55,59 ****
  	void CloseMetaObject() NOTHROW;

! 	string GetObjectToken();
  	metaid_type GetMetaID() { metaid_type a; COMTHROW( get_MetaID(&a) ); return a; }

--- 55,59 ----
  	void CloseMetaObject() NOTHROW;

! 	std::string GetObjectToken();
  	metaid_type GetMetaID() { metaid_type a; COMTHROW( get_MetaID(&a) ); return a; }

***************
*** 76,80 ****
  	long GetMaxSize(ICoreMetaAttribute *p = NULL);
  	attrid_type GetLockAttrID(ICoreMetaAttribute *p = NULL);
! 	string GetToken(ICoreMetaAttribute *p = NULL);

  // ------- GUID and OBJID
--- 76,80 ----
  	long GetMaxSize(ICoreMetaAttribute *p = NULL);
  	attrid_type GetLockAttrID(ICoreMetaAttribute *p = NULL);
! 	std::string GetToken(ICoreMetaAttribute *p = NULL);

  // ------- GUID and OBJID
***************
*** 122,126 ****

  public:
! 	string GetTypeLibName() { return string("MGA ") + GetProjectToken() + " Type Information Model"; }
  	GUID GetTypeLibGUID() { return GetGUID(0,0); }
  	OBJID GetTypeLibOBJID() { return GetOBJID(0,0); }
--- 122,126 ----

  public:
! 	std::string GetTypeLibName() { return std::string("MGA ") + GetProjectToken() + " Type Information Model"; }
  	GUID GetTypeLibGUID() { return GetGUID(0,0); }
  	OBJID GetTypeLibOBJID() { return GetOBJID(0,0); }
***************
*** 135,143 ****

  public:
! 	string GetClassName() { return GetObjectToken(); }
  	GUID GetClassGUID() { return GetGUID(0, GetMetaID()); }
  	OBJID GetClassOBJID() { return GetOBJID(0, GetMetaID()); }

! 	string GetInterfaceName() { return string("I") + GetObjectToken(); }
  	GUID GetInterfaceGUID() { return GetGUID(1, GetMetaID()); }

--- 135,143 ----

  public:
! 	std::string GetClassName() { return GetObjectToken(); }
  	GUID GetClassGUID() { return GetGUID(0, GetMetaID()); }
  	OBJID GetClassOBJID() { return GetOBJID(0, GetMetaID()); }

! 	std::string GetInterfaceName() { return std::string("I") + GetObjectToken(); }
  	GUID GetInterfaceGUID() { return GetGUID(1, GetMetaID()); }

***************
*** 147,151 ****

  public:
! 	string GetPropertyName() NOTHROW { return GetToken(); }
  	void CheckIsEqual(ICoreMetaAttribute *p, ICoreMetaAttribute *q);

--- 147,151 ----

  public:
! 	std::string GetPropertyName() NOTHROW { return GetToken(); }
  	void CheckIsEqual(ICoreMetaAttribute *p, ICoreMetaAttribute *q);

***************
*** 162,166 ****
  	} colldef_type;

! 	typedef slist<colldef_type> colldefs_type;
  	typedef colldefs_type::iterator colldefs_iterator;

--- 162,166 ----
  	} colldef_type;

! 	typedef std::list<colldef_type> colldefs_type;//slist
  	typedef colldefs_type::iterator colldefs_iterator;

***************
*** 168,175 ****

  public:
! 	string GetCollInterfaceName(ICoreMetaAttribute *metaaattribute);
  	GUID GetCollInterfaceGUID(ICoreMetaAttribute *metaattribute)
  		{ return GetGUID(2, GetAttrID(metaattribute)); }
! 	string GetCollRelationshipName(ICoreMetaAttribute *pointer, ICoreMetaAttribute *collection)
  		{ return GetToken(collection) + " - " + GetToken(pointer); }

--- 168,175 ----

  public:
! 	std::string GetCollInterfaceName(ICoreMetaAttribute *metaaattribute);
  	GUID GetCollInterfaceGUID(ICoreMetaAttribute *metaattribute)
  		{ return GetGUID(2, GetAttrID(metaattribute)); }
! 	std::string GetCollRelationshipName(ICoreMetaAttribute *pointer, ICoreMetaAttribute *collection)
  		{ return GetToken(collection) + " - " + GetToken(pointer); }

***************
*** 185,192 ****

  private:
! 	string connstr;
  public:
! 	void GetConnUserPswd(string &connection, 
! 		string &conn, string &user, string &pswd);

  	STDMETHODIMP OpenProject(BSTR connection, VARIANT_BOOL *mode);
--- 185,192 ----

  private:
! 	std::string connstr;
  public:
! 	void GetConnUserPswd(std::string &connection, 
! 		std::string &conn, std::string &user, std::string &pswd);

  	STDMETHODIMP OpenProject(BSTR connection, VARIANT_BOOL *mode);
***************
*** 216,224 ****

  		objid_type next;				// OBJID_NONE if not loaded
! 		vector<objid_type> returned;
  	};

! 	typedef hash_map< metaid_type, objid_gen_type, hash<metaid_type>,
! 		equal_to<metaid_type> > objid_gens_type;
  	typedef objid_gens_type::iterator objid_gens_iterator;

--- 216,224 ----

  		objid_type next;				// OBJID_NONE if not loaded
! 		std::vector<objid_type> returned;
  	};

! 	typedef std::hash_map< metaid_type, objid_gen_type, std::hash<metaid_type>,
! 		std::equal_to<metaid_type> > objid_gens_type;
  	typedef objid_gens_type::iterator objid_gens_iterator;

***************
*** 255,259 ****

  public:
! 	void AddIDPair(IObjectCol *objcol, long index, vector<metaobjidpair_type> &idpairs);

  	STDMETHODIMP get_AttributeValue(VARIANT *p);
--- 255,259 ----

  public:
! 	void AddIDPair(IObjectCol *objcol, long index, std::vector<metaobjidpair_type> &idpairs);

  	STDMETHODIMP get_AttributeValue(VARIANT *p);

Index: CoreTerritory.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Core/CoreTerritory.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CoreTerritory.cpp	28 Jun 2001 05:40:00 -0000	1.4
--- CoreTerritory.cpp	13 Oct 2004 15:17:54 -0000	1.5
***************
*** 64,68 ****
  	COMTRY
  	{
! 		typedef CCoreCollection<ICoreAttributes, vector<ICoreAttribute*>,
  			ICoreAttribute, CCoreLockAttribute> COMTYPE;

--- 64,68 ----
  	COMTRY
  	{
! 		typedef CCoreCollection<ICoreAttributes, std::vector<ICoreAttribute*>,
  			ICoreAttribute, CCoreLockAttribute> COMTYPE;

***************
*** 70,74 ****
  		CreateComObject(q);

! 		typedef hash_set< CCoreLockAttribute*, ptr_hashfunc<CCoreLockAttribute>, 
  			ptr_equalkey<CCoreLockAttribute> > join_type;

--- 70,74 ----
  		CreateComObject(q);

! 		typedef std::hash_set< CCoreLockAttribute*, ptr_hashfunc<CCoreLockAttribute>, 
  			ptr_equalkey<CCoreLockAttribute> > join_type;

***************
*** 109,113 ****
  	COMTRY
  	{
! 		typedef hash_set< CCoreLockAttribute*, ptr_hashfunc<CCoreLockAttribute>, 
  			ptr_equalkey<CCoreLockAttribute> > join_type;

--- 109,113 ----
  	COMTRY
  	{
! 		typedef std::hash_set< CCoreLockAttribute*, ptr_hashfunc<CCoreLockAttribute>, 
  			ptr_equalkey<CCoreLockAttribute> > join_type;

Index: CoreTerritory.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Core/CoreTerritory.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CoreTerritory.h	5 Jul 2000 19:16:00 -0000	1.1
--- CoreTerritory.h	13 Oct 2004 15:17:54 -0000	1.2
***************
*** 15,23 ****
  // --------------------------- typedefs

! typedef hash_map< CComObjPtr<CCoreLockAttribute>, locking_type, 
  	ptr_hashfunc<CCoreLockAttribute>, ptr_equalkey<CCoreLockAttribute> > lockmap_type;
  typedef lockmap_type::iterator lockmap_iterator;

! typedef list<lockmap_type> lockmaps_type;
  typedef lockmaps_type::iterator lockmaps_iterator;

--- 15,23 ----
  // --------------------------- typedefs

! typedef std::hash_map< CComObjPtr<CCoreLockAttribute>, locking_type, 
  	ptr_hashfunc<CCoreLockAttribute>, ptr_equalkey<CCoreLockAttribute> > lockmap_type;
  typedef lockmap_type::iterator lockmap_iterator;

! typedef std::list<lockmap_type> lockmaps_type;
  typedef lockmaps_type::iterator lockmaps_iterator;

Index: CoreUtilities.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Core/CoreUtilities.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CoreUtilities.h	14 Sep 2004 14:00:27 -0000	1.5
--- CoreUtilities.h	13 Oct 2004 15:17:54 -0000	1.6
***************
*** 49,53 ****
  { CopyTo((long*)&idpair, (long*)&idpair + 2, v); }

! inline void CopyTo(const vector<metaobjidpair_type> &idpairs, VARIANT *v)
  { CopyTo((long*)idpairs.begin(), (long*)idpairs.end(), v); }

--- 49,53 ----
  { CopyTo((long*)&idpair, (long*)&idpair + 2, v); }

! inline void CopyTo(const std::vector<metaobjidpair_type> &idpairs, VARIANT *v)
  { CopyTo((long*)idpairs.begin(), (long*)idpairs.end(), v); }

Index: StdAfx.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Core/StdAfx.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** StdAfx.h	14 Sep 2004 14:01:07 -0000	1.7
--- StdAfx.h	13 Oct 2004 15:17:54 -0000	1.8
***************
*** 25,31 ****

  #define _NOTHREADS
! #include <stl_config.h>
! #undef __SGI_STL_NO_ARROW_OPERATOR
! #define __SGI_STL_INTERNAL_RELOPS

  #define ASSERT ATLASSERT
--- 25,30 ----

  #define _NOTHREADS
! 
! #include <stl_user_config.h>

  #define ASSERT ATLASSERT