[GME-commit] GMESRC/GME/Meta Meta.dsp,1.17,1.18 MetaUtilities.cpp,1.7,1.8 MetaUtilities.h,1.8,1.9 MgaMetaAttribute.cpp,1.2,1.3 MgaMetaPointerItem.cpp,1.1,1.2 MgaMetaProject.cpp,1.4,1.5 MgaMetaProject.h,1.4,1.5 MgaMetaRegNode.cpp,1.1,1.2StdAfx.h,1.4,1.5

Wed Oct 13 11:17:58 CDT 2004

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

Modified Files:
	Meta.dsp MetaUtilities.cpp MetaUtilities.h 
	MgaMetaAttribute.cpp MgaMetaPointerItem.cpp MgaMetaProject.cpp 
	MgaMetaProject.h MgaMetaRegNode.cpp StdAfx.h 
Log Message:
GME ported to STLport
-std:: prefix added to stl classes and methods

CVS User: zolmol

Index: Meta.dsp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Meta/Meta.dsp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Meta.dsp	22 Jul 2004 14:26:50 -0000	1.17
--- Meta.dsp	13 Oct 2004 15:17:55 -0000	1.18
***************
*** 43,47 ****
  # 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 "../Interfaces" /I "../Include/STL" /I "../Common" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /Yu"StdAfx.h" /FD /c
  # SUBTRACT CPP /Fr
  # ADD BASE RSC /l 0x409 /d "NDEBUG"
--- 43,47 ----
  # 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 "../Interfaces" /I "../Include/STLport" /I "../Common" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /Yu"StdAfx.h" /FD /c
  # SUBTRACT CPP /Fr
  # ADD BASE 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:"0x60500000" /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:"0x60500000" /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 "../Interfaces" /I "../Include/STL" /I "../Common" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /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 "../Interfaces" /I "../Include/STLport" /I "../Common" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /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:"0x60500000" /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
  # Begin Custom Build - Performing registration
  OutDir=.\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:"0x60500000" /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\lib"
  # Begin Custom Build - Performing registration
  OutDir=.\Debug

Index: MetaUtilities.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Meta/MetaUtilities.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MetaUtilities.cpp	2 Oct 2002 18:17:00 -0000	1.7
--- MetaUtilities.cpp	13 Oct 2004 15:17:55 -0000	1.8
***************
*** 67,71 ****
--- 67,73 ----
  	ASSERT( v.vt == VT_I4 );

+ #pragma warning( disable: 4244) // conversion from 'long' to 'short', possible loss of data
  	return v.lVal;
+ #pragma warning( default: 4244) // conversion from 'long' to 'short', possible loss of data
  }

***************
*** 229,233 ****
  		ASSERT( v.vt == VT_BSTR );

! 		string dispname;
  		CopyTo(v, dispname);

--- 231,235 ----
  		ASSERT( v.vt == VT_BSTR );

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

Index: MetaUtilities.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Meta/MetaUtilities.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MetaUtilities.h	29 Jun 2001 05:07:00 -0000	1.8
--- MetaUtilities.h	13 Oct 2004 15:17:55 -0000	1.9
***************
*** 16,20 ****

  class CCoreObjectPtr;
! typedef vector<CCoreObjectPtr> coreobjects_type;
  typedef coreobjects_type::iterator coreobjects_iterator;

--- 16,20 ----

  class CCoreObjectPtr;
! typedef std::vector<CCoreObjectPtr> coreobjects_type;
  typedef coreobjects_type::iterator coreobjects_iterator;

***************
*** 113,117 ****
  		self.GetCollectionValue(attrid, coreobjects);

! 		typedef CCoreCollection<COLLITF, vector<ITFTYPE*>, ITFTYPE, ITFTYPE> COMTYPE;

  		CComObjPtr<COMTYPE> coll;
--- 113,117 ----
  		self.GetCollectionValue(attrid, coreobjects);

! 		typedef CCoreCollection<COLLITF, std::vector<ITFTYPE*>, ITFTYPE, ITFTYPE> COMTYPE;

  		CComObjPtr<COMTYPE> coll;
***************
*** 147,153 ****
  		self.GetCollectionValue(attrid, coreobjects);

! 		sort(coreobjects.begin(), coreobjects.end(), objid_morethan());

! 		typedef CCoreCollection<COLLITF, vector<ITFTYPE*>, ITFTYPE, ITFTYPE> COMTYPE;

  		CComObjPtr<COMTYPE> coll;
--- 147,153 ----
  		self.GetCollectionValue(attrid, coreobjects);

! 		std::sort(coreobjects.begin(), coreobjects.end(), objid_morethan());

! 		typedef CCoreCollection<COLLITF, std::vector<ITFTYPE*>, ITFTYPE, ITFTYPE> COMTYPE;

  		CComObjPtr<COMTYPE> coll;
***************
*** 217,221 ****
  		self.GetCollectionValue(collid, coreobjects);

! 		typedef CCoreCollection<COLLITF, vector<ITFTYPE*>, ITFTYPE, ITFTYPE> COMTYPE;

  		CComObjPtr<COMTYPE> coll;
--- 217,221 ----
  		self.GetCollectionValue(collid, coreobjects);

! 		typedef CCoreCollection<COLLITF, std::vector<ITFTYPE*>, ITFTYPE, ITFTYPE> COMTYPE;

  		CComObjPtr<COMTYPE> coll;
***************
*** 291,297 ****
  		self.GetCollectionValue(collid, coreobjects);

! 		sort(coreobjects.begin(), coreobjects.end(), objid_morethan());

! 		typedef CCoreCollection<COLLITF, vector<ITFTYPE*>, ITFTYPE, ITFTYPE> COMTYPE;

  		CComObjPtr<COMTYPE> coll;
--- 291,297 ----
  		self.GetCollectionValue(collid, coreobjects);

! 		std::sort(coreobjects.begin(), coreobjects.end(), objid_morethan());

! 		typedef CCoreCollection<COLLITF, std::vector<ITFTYPE*>, ITFTYPE, ITFTYPE> COMTYPE;

  		CComObjPtr<COMTYPE> coll;
***************
*** 456,460 ****
  } pathitem_type;

! typedef vector<pathitem_type> pathitems_type;

  typedef struct jointpath_type
--- 456,460 ----
  } pathitem_type;

! typedef std::vector<pathitem_type> pathitems_type;

  typedef struct jointpath_type
***************
*** 464,468 ****
  } jointpath_type;

! typedef vector<jointpath_type> jointpaths_type;

  // --------------------------- STL function objects
--- 464,468 ----
  } jointpath_type;

! typedef std::vector<jointpath_type> jointpaths_type;

  // --------------------------- STL function objects

Index: MgaMetaAttribute.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Meta/MgaMetaAttribute.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MgaMetaAttribute.cpp	28 Jun 2001 05:40:00 -0000	1.2
--- MgaMetaAttribute.cpp	13 Oct 2004 15:17:55 -0000	1.3
***************
*** 17,21 ****
  		me.GetCollectionValue(ATTRID_ATTRLINK_ATTR_PTR, coreobjects);

! 		typedef CCoreCollection<IMgaMetaFCOs, vector<IMgaMetaFCO*>, IMgaMetaFCO, IMgaMetaFCO> COMTYPE;

  		CComObjPtr<COMTYPE> coll;
--- 17,21 ----
  		me.GetCollectionValue(ATTRID_ATTRLINK_ATTR_PTR, coreobjects);

! 		typedef CCoreCollection<IMgaMetaFCOs, std::vector<IMgaMetaFCO*>, IMgaMetaFCO, IMgaMetaFCO> COMTYPE;

  		CComObjPtr<COMTYPE> coll;

Index: MgaMetaPointerItem.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Meta/MgaMetaPointerItem.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MgaMetaPointerItem.cpp	5 Jul 2000 19:17:00 -0000	1.1
--- MgaMetaPointerItem.cpp	13 Oct 2004 15:17:55 -0000	1.2
***************
*** 17,21 ****

  	// return if not equal
! 	if( !equal(e - len, e, begin(token)) )
  		return false;

--- 17,21 ----

  	// return if not equal
! 	if( !std::equal(e - len, e, begin(token)) )
  		return false;

***************
*** 49,53 ****

  #ifdef _DEBUG
! 	string s;
  	CopyTo(bstr, s);

--- 49,53 ----

  #ifdef _DEBUG
! 	std::string s;
  	CopyTo(bstr, s);

Index: MgaMetaProject.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Meta/MgaMetaProject.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MgaMetaProject.cpp	20 Jul 2004 13:55:46 -0000	1.4
--- MgaMetaProject.cpp	13 Oct 2004 15:17:55 -0000	1.5
***************
*** 451,460 ****
  	while( i != e )
  	{
! 		i = find_if(i, e, bind2nd(not_equal_to<wchar_t>(), L' '));
  		if( i == e )
  			break;

! 		bstr_const_iterator j = find(i, e, L' ');
! 		bstr_const_iterator k = find(j, e, L',');

  		jointpaths.push_back();
--- 451,460 ----
  	while( i != e )
  	{
! 		i = std::find_if(i, e, std::bind2nd( std::not_equal_to<wchar_t>(), L' '));
  		if( i == e )
  			break;

! 		bstr_const_iterator j = std::find(i, e, L' ');
! 		bstr_const_iterator k = std::find(j, e, L',');

  		jointpaths.push_back();

Index: MgaMetaProject.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Meta/MgaMetaProject.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MgaMetaProject.h	20 Jul 2004 13:55:46 -0000	1.4
--- MgaMetaProject.h	13 Oct 2004 15:17:55 -0000	1.5
***************
*** 71,75 ****

  public:
! 	typedef hash_map<metaref_type, IMgaMetaBase*, 
  		metaid_hashfunc, metaid_equalkey> metaobj_lookup_type;
  	typedef metaobj_lookup_type::iterator metaobj_lookup_iterator;
--- 71,75 ----

  public:
! 	typedef std::hash_map<metaref_type, IMgaMetaBase*, 
  		metaid_hashfunc, metaid_equalkey> metaobj_lookup_type;
  	typedef metaobj_lookup_type::iterator metaobj_lookup_iterator;

Index: MgaMetaRegNode.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Meta/MgaMetaRegNode.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MgaMetaRegNode.cpp	5 Jul 2000 19:17:00 -0000	1.1
--- MgaMetaRegNode.cpp	13 Oct 2004 15:17:55 -0000	1.2
***************
*** 15,19 ****
  		CCoreObjectPtr self(me);

! 		string path;
  		CopyTo(bpath, path);

--- 15,19 ----
  		CCoreObjectPtr self(me);

! 		std::string path;
  		CopyTo(bpath, path);

***************
*** 24,29 ****
  		for(;;)
  		{
! 			int pos = path.find('/');
! 			string name(path, 0, pos);

  			CComBstrObj bname;
--- 24,29 ----
  		for(;;)
  		{
! 			int pos = path.find('/');//pos will be either in range 0..len-1 or will be equal with string::npos 
! 			std::string name(path, 0, pos);

  			CComBstrObj bname;
***************
*** 67,71 ****
  			ASSERT( node != NULL );

! 			if( pos >= path.length() )
  			{
  				COMTHROW( ::QueryInterface(node, p) );
--- 67,71 ----
  			ASSERT( node != NULL );

! 			if( pos == std::string::npos) //zolmol! if( (unsigned int) pos >= path.length() )
  			{
  				COMTHROW( ::QueryInterface(node, p) );

Index: StdAfx.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Meta/StdAfx.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** StdAfx.h	28 Jun 2001 05:40:00 -0000	1.4
--- StdAfx.h	13 Oct 2004 15:17:55 -0000	1.5
***************
*** 22,28 ****
  #include <atlcom.h>

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

  #define ASSERT ATLASSERT
--- 22,26 ----
  #include <atlcom.h>

! #include <stl_user_config.h>

  #define ASSERT ATLASSERT
***************
*** 39,45 ****
  typedef IMgaConstraints IMgaMetaConstraints;

! typedef CCoreCollectionEx<IMgaMetaRoles, vector<IMgaMetaRole*>,
  			IMgaMetaRole, IMgaMetaRole, &CLSID_MgaMetaRoles, IDR_MGAMETAROLES> RolesExCOMType;
! typedef CCoreCollectionEx<IMgaMetaFCOs, vector<IMgaMetaFCO*>,
  			IMgaMetaFCO, IMgaMetaFCO, &CLSID_MgaMetaFCOs, IDR_MGAMETAFCOS> FCOsExCOMType;

--- 37,43 ----
  typedef IMgaConstraints IMgaMetaConstraints;

! typedef CCoreCollectionEx<IMgaMetaRoles, std::vector<IMgaMetaRole*>,
  			IMgaMetaRole, IMgaMetaRole, &CLSID_MgaMetaRoles, IDR_MGAMETAROLES> RolesExCOMType;
! typedef CCoreCollectionEx<IMgaMetaFCOs, std::vector<IMgaMetaFCO*>,
  			IMgaMetaFCO, IMgaMetaFCO, &CLSID_MgaMetaFCOs, IDR_MGAMETAFCOS> FCOsExCOMType;