Wed Oct 13 11:18:00 CDT 2004

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

Modified Files:
	Mga.dsp MgaAttribute.cpp MgaComplexOps.cpp MgaComplexOps.h 
	MgaConnection.cpp MgaConnection.h MgaDeriveOps.cpp MgaFCO.cpp 
	MgaFCO.h MgaFilter.h MgaFolder.cpp MgaLibOps.cpp MgaLibOps.h 
	MgaModel.cpp MgaProject.cpp MgaProject.h MgaReference.cpp 
	MgaReference.h MgaSet.cpp MgaSet.h MgaTerritory.h MgaTrukk.h 
	StdAfx.h 
Log Message:
GME ported to STLport
-std:: prefix added to stl classes and methods

CVS User: zolmol

Index: Mga.dsp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/Mga.dsp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Mga.dsp	22 Jul 2004 14:26:50 -0000	1.25
--- Mga.dsp	13 Oct 2004 15:17:55 -0000	1.26
***************
*** 44,48 ****
  # 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 /W4 /Gm /GX /ZI /Od /I "../include/STL" /I "../common" /I "../Interfaces" /D "WIN32" /D "_DEBUG" /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"
--- 44,48 ----
  # 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 /W4 /Gm /GX /ZI /Od /I "../include/STLport" /I "../common" /I "../Interfaces" /D "WIN32" /D "_DEBUG" /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"
***************
*** 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 /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:"0x60600000" /subsystem:windows /dll /map /debug /machine:I386 /pdbtype:sept
  # Begin Custom Build - Performing registration
  OutDir=.\Debug
--- 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 /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:"0x60600000" /subsystem:windows /dll /map /debug /machine:I386 /pdbtype:sept /libpath:"..\lib"
  # Begin Custom Build - Performing registration
  OutDir=.\Debug
***************
*** 79,83 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
! # ADD CPP /nologo /MD /W3 /GX /Zi /O1 /I "../include/STL" /I "../common" /I "../Interfaces" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_STATIC_REGISTRY" /FR /Yu"stdafx.h" /FD /c
  # ADD BASE RSC /l 0x409 /d "NDEBUG"
  # ADD RSC /l 0x409 /d "NDEBUG"
--- 79,83 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
! # ADD CPP /nologo /MD /W3 /GX /Zi /O1 /I "../include/STLport" /I "../common" /I "../Interfaces" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_STATIC_REGISTRY" /FR /Yu"stdafx.h" /FD /c
  # ADD BASE RSC /l 0x409 /d "NDEBUG"
  # ADD RSC /l 0x409 /d "NDEBUG"
***************
*** 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 /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:"0x60600000" /subsystem:windows /dll /map /debug /machine:I386
  # Begin Custom Build - Performing registration
  OutDir=.\Release
--- 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 /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:"0x60600000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\lib"
  # Begin Custom Build - Performing registration
  OutDir=.\Release

Index: MgaAttribute.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaAttribute.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** MgaAttribute.cpp	11 Mar 2002 22:15:00 -0000	1.13
--- MgaAttribute.cpp	13 Oct 2004 15:17:55 -0000	1.14
***************
*** 172,176 ****
  class attrnotifytask : public DeriveTreeTask {
  	//##ModelId=3C5AA09E026D
! 	bool Do(CoreObj self, vector<CoreObj> *peers = NULL) {
  		ObjForCore(self)->SelfMark(OBJEVENT_ATTR);
  		return true;
--- 172,176 ----
  class attrnotifytask : public DeriveTreeTask {
  	//##ModelId=3C5AA09E026D
! 	bool Do(CoreObj self, std::vector<CoreObj> *peers = NULL) {
  		ObjForCore(self)->SelfMark(OBJEVENT_ATTR);
  		return true;
***************
*** 597,601 ****
  class regnotifytask : public DeriveTreeTask {
  	//##ModelId=3C5AA09E02A9
! 	bool Do(CoreObj self, vector<CoreObj> *peers = NULL) {
  		ObjForCore(self)->SelfMark(OBJEVENT_REGISTRY);
  		return true;
--- 597,601 ----
  class regnotifytask : public DeriveTreeTask {
  	//##ModelId=3C5AA09E02A9
! 	bool Do(CoreObj self, std::vector<CoreObj> *peers = NULL) {
  		ObjForCore(self)->SelfMark(OBJEVENT_REGISTRY);
  		return true;
***************
*** 787,791 ****
  			CHECK_OUTPTRPAR(pVal);
  			long dummy;
! 			hash_set<CComBSTRNoAt, CComBSTR_hashfunc> match;
  			CoreObj s = fco->self;
  			if(!s.IsFCO()) virtuals = VARIANT_FALSE;
--- 787,791 ----
  			CHECK_OUTPTRPAR(pVal);
  			long dummy;
! 			std::hash_set<CComBSTRNoAt, CComBSTR_hashfunc> match;
  			CoreObj s = fco->self;
  			if(!s.IsFCO()) virtuals = VARIANT_FALSE;

Index: MgaComplexOps.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaComplexOps.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MgaComplexOps.cpp	2 Jun 2004 21:43:19 -0000	1.8
--- MgaComplexOps.cpp	13 Oct 2004 15:17:55 -0000	1.9
***************
*** 868,872 ****
  // !!! RECURSIVE 
  ///////////////////
! void ReDeriveNewObjs(CMgaProject *mgaproject, vector<CoreObj> &orignobjs, int cnt, int targetlevel) {
  	ASSERT(targetlevel >= 1);
  	if(cnt < 1) return;
--- 868,872 ----
  // !!! RECURSIVE 
  ///////////////////
! void ReDeriveNewObjs(CMgaProject *mgaproject, std::vector<CoreObj> &orignobjs, int cnt, int targetlevel) {
  	ASSERT(targetlevel >= 1);
  	if(cnt < 1) return;
***************
*** 880,884 ****
  		coreobjhash derivmovedlist;
  		long instance = ITER[ATTRID_PERMISSIONS] & INSTANCE_FLAG;
! 		vector<CoreObj> newderiveds(cnt);
  		for(i = 0; i< cnt; i++) {
  			ObjTreeDerive(mgaproject, orignobjs[i], newderiveds[i], derivcrealist, instance);
--- 880,884 ----
  		coreobjhash derivmovedlist;
  		long instance = ITER[ATTRID_PERMISSIONS] & INSTANCE_FLAG;
! 		std::vector<CoreObj> newderiveds(cnt);
  		for(i = 0; i< cnt; i++) {
  			ObjTreeDerive(mgaproject, orignobjs[i], newderiveds[i], derivcrealist, instance);
***************
*** 900,904 ****

  void ReDeriveNewObj(CMgaProject *mgaproject, CoreObj &orignobj, int targetlevel) {
!    vector<CoreObj> vv(1);
     vv[0] = orignobj;
     ReDeriveNewObjs(mgaproject, vv, 1, targetlevel);
--- 900,904 ----

  void ReDeriveNewObj(CMgaProject *mgaproject, CoreObj &orignobj, int targetlevel) {
!    std::vector<CoreObj> vv(1);
     vv[0] = orignobj;
     ReDeriveNewObjs(mgaproject, vv, 1, targetlevel);
***************
*** 942,946 ****
  		int i = 0;

! 		vector<CoreObj> nobjs(cnt);
  		MGACOLL_ITERATE(IMgaFCO, copylist) {
  			CoreObj oldobj = CoreObj(MGACOLL_ITER);
--- 942,946 ----
  		int i = 0;

! 		std::vector<CoreObj> nobjs(cnt);
  		MGACOLL_ITERATE(IMgaFCO, copylist) {
  			CoreObj oldobj = CoreObj(MGACOLL_ITER);
***************
*** 1101,1105 ****
  // !!! RECURSIVE 
  ///////////////////
! void DeriveMoveds(CMgaProject *mgaproject, vector<CoreObj> &orignobjs, vector<int> &extmoved, int cnt, int targetlevel)
  {
  	if(cnt < 1) return;
--- 1101,1105 ----
  // !!! RECURSIVE 
  ///////////////////
! void DeriveMoveds(CMgaProject *mgaproject, std::vector<CoreObj> &orignobjs, std::vector<int> &extmoved, int cnt, int targetlevel)
  {
  	if(cnt < 1) return;
***************
*** 1117,1121 ****
  			coreobjhash derivmovedlist;
  			long instance = ITER[ATTRID_PERMISSIONS] & INSTANCE_FLAG;
! 			vector<CoreObj> newderiveds(cnt);
  			for(i = 0; i< cnt; i++) {
  				if(extmoved[i] < 0) {	// the movedobject is a newcomer in the basetype, derive new obj in subtype
--- 1117,1121 ----
  			coreobjhash derivmovedlist;
  			long instance = ITER[ATTRID_PERMISSIONS] & INSTANCE_FLAG;
! 			std::vector<CoreObj> newderiveds(cnt);
  			for(i = 0; i< cnt; i++) {
  				if(extmoved[i] < 0) {	// the movedobject is a newcomer in the basetype, derive new obj in subtype
***************
*** 1216,1221 ****
  			int i = 0;

! 			vector<CoreObj> nobjs(cnt);
! 			vector<int> moved_into(cnt);  // >= 0 for objects moved inside the tree, -1 for newcomers
  			MGACOLL_ITERATE(IMgaFCO, movelist) {
  				CoreObj cur = nobjs[i] = CoreObj(MGACOLL_ITER);
--- 1216,1221 ----
  			int i = 0;

! 			std::vector<CoreObj> nobjs(cnt);
! 			std::vector<int> moved_into(cnt);  // >= 0 for objects moved inside the tree, -1 for newcomers
  			MGACOLL_ITERATE(IMgaFCO, movelist) {
  				CoreObj cur = nobjs[i] = CoreObj(MGACOLL_ITER);

Index: MgaComplexOps.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaComplexOps.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MgaComplexOps.h	2 Jun 2004 21:43:19 -0000	1.1
--- MgaComplexOps.h	13 Oct 2004 15:17:55 -0000	1.2
***************
*** 14,18 ****

  void ObjTreeDist(CoreObj self, int derdist);
! void ReDeriveNewObjs(CMgaProject *mgaproject, vector<CoreObj> &orignobjs, int cnt, int targetlevel);
  void shiftlist(coreobjpairhash &list1, coreobjhash &list2);

--- 14,18 ----

  void ObjTreeDist(CoreObj self, int derdist);
! void ReDeriveNewObjs(CMgaProject *mgaproject, std::vector<CoreObj> &orignobjs, int cnt, int targetlevel);
  void shiftlist(coreobjpairhash &list1, coreobjhash &list2);

***************
*** 26,30 ****
  bool ObjTreeReconnectFoldersToo(CoreObj self, coreobjpairhash &crealist, CoreObj const &derivtgt = NULLCOREOBJ);

! void DeriveMoveds(CMgaProject *mgaproject, vector<CoreObj> &orignobjs, vector<int> &extmoved, int cnt, int targetlevel);

--- 26,30 ----
  bool ObjTreeReconnectFoldersToo(CoreObj self, coreobjpairhash &crealist, CoreObj const &derivtgt = NULLCOREOBJ);

! void DeriveMoveds(CMgaProject *mgaproject, std::vector<CoreObj> &orignobjs, std::vector<int> &extmoved, int cnt, int targetlevel);

Index: MgaConnection.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaConnection.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** MgaConnection.cpp	28 Feb 2002 06:43:00 -0000	1.15
--- MgaConnection.cpp	13 Oct 2004 15:17:55 -0000	1.16
***************
*** 139,143 ****
  class AddConnPTask : public DeriveTreeTask {
  	CComBSTR rolename;
! 	bool Do(CoreObj self, vector<CoreObj> *peers) {
  	   CoreObj role;
  	   CMgaProject *mgaproject = ObjForCore(self)->mgaproject;
--- 139,143 ----
  class AddConnPTask : public DeriveTreeTask {
  	CComBSTR rolename;
! 	bool Do(CoreObj self, std::vector<CoreObj> *peers) {
  	   CoreObj role;
  	   CMgaProject *mgaproject = ObjForCore(self)->mgaproject;
***************
*** 184,188 ****
  	   long c = 0;
  	   if(refs) COMTHROW(refs->get_Count(&c));
! 	   vector<CoreObj> peers(c+2);
  	   CHECK_INSTRPAR(rolename);
  	   CHECK_MYINPTRPAR(target);
--- 184,188 ----
  	   long c = 0;
  	   if(refs) COMTHROW(refs->get_Count(&c));
! 	   std::vector<CoreObj> peers(c+2);
  	   CHECK_INSTRPAR(rolename);
  	   CHECK_MYINPTRPAR(target);
***************
*** 239,243 ****
  	CComBSTR newrname;

! 	bool Do(CoreObj self, vector<CoreObj> *peers = NULL) {
  		self[ATTRID_NAME] = newrname;
  		COMTHROW(ObjForCore(CoreObj(self[ATTRID_CONNROLE]))->Check());
--- 239,243 ----
  	CComBSTR newrname;

! 	bool Do(CoreObj self, std::vector<CoreObj> *peers = NULL) {
  		self[ATTRID_NAME] = newrname;
  		COMTHROW(ObjForCore(CoreObj(self[ATTRID_CONNROLE]))->Check());
***************
*** 292,296 ****

! bool RemoveConnPTask::Do(CoreObj self, vector<CoreObj> *peers) {
  		CoreObj fco = self[ATTRID_CONNROLE];
  		CoreObj target = self[ATTRID_XREF];
--- 292,296 ----

! bool RemoveConnPTask::Do(CoreObj self, std::vector<CoreObj> *peers) {
  		CoreObj fco = self[ATTRID_CONNROLE];
  		CoreObj target = self[ATTRID_XREF];
***************
*** 400,404 ****
  		}
  		else {
! 			set<CoreObj> vv;
  			{
  				ITERATE_THROUGH(self[ATTRID_CONNROLE + ATTRID_COLLECTION]) {
--- 400,404 ----
  		}
  		else {
! 			std::set<CoreObj> vv;
  			{
  				ITERATE_THROUGH(self[ATTRID_CONNROLE + ATTRID_COLLECTION]) {

Index: MgaConnection.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaConnection.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MgaConnection.h	17 Dec 2003 13:45:03 -0000	1.5
--- MgaConnection.h	13 Oct 2004 15:17:55 -0000	1.6
***************
*** 140,144 ****
  class RemoveConnPTask : public DeriveTreeTask {
  	//##ModelId=3C5AA09B01C9
! 	bool Do(CoreObj self, vector<CoreObj> *peers = NULL);
  };

--- 140,144 ----
  class RemoveConnPTask : public DeriveTreeTask {
  	//##ModelId=3C5AA09B01C9
! 	bool Do(CoreObj self, std::vector<CoreObj> *peers = NULL);
  };

Index: MgaDeriveOps.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaDeriveOps.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MgaDeriveOps.cpp	11 Mar 2002 22:12:00 -0000	1.1
--- MgaDeriveOps.cpp	13 Oct 2004 15:17:55 -0000	1.2
***************
*** 213,217 ****
  // DeriveTreeTask
  // ----------------------------------------
! void DeriveTreeTask::_DoWithDeriveds(CoreObj self, vector<CoreObj> *peers) {
  		CoreObjs chds = self[masterattr + ATTRID_COLLECTION];  // do it first to enable delete operations...
  		if(!Do(self, peers)) return;
--- 213,217 ----
  // DeriveTreeTask
  // ----------------------------------------
! void DeriveTreeTask::_DoWithDeriveds(CoreObj self, std::vector<CoreObj> *peers) {
  		CoreObjs chds = self[masterattr + ATTRID_COLLECTION];  // do it first to enable delete operations...
  		if(!Do(self, peers)) return;
***************
*** 219,223 ****
  			if(peercnt) {
  				CoreObj r = ITER.FollowChain(ATTRID_FCOPARENT, selfdepth);
! 				vector<CoreObj> subpeers(peercnt);
  				for(int i = 0; i < internalpeercnt; i++) {			// first the internals
  					GetDerivedEquivalent((*peers)[i], r, subpeers[i], peerdepths[i]);
--- 219,223 ----
  			if(peercnt) {
  				CoreObj r = ITER.FollowChain(ATTRID_FCOPARENT, selfdepth);
! 				std::vector<CoreObj> subpeers(peercnt);
  				for(int i = 0; i < internalpeercnt; i++) {			// first the internals
  					GetDerivedEquivalent((*peers)[i], r, subpeers[i], peerdepths[i]);
***************
*** 240,244 ****
  // or ATTRID_MASTEROBJ. It is usually determined by the objecttype, but in case of 
  // references, it can be preset by the user.
! void DeriveTreeTask::DoWithDeriveds(CoreObj self, vector<CoreObj> *peers) {
  		if(GetMetaID(self) == DTID_FOLDER) Do(self, peers);  // no derived objects
  		else {
--- 240,244 ----
  // or ATTRID_MASTEROBJ. It is usually determined by the objecttype, but in case of 
  // references, it can be preset by the user.
! void DeriveTreeTask::DoWithDeriveds(CoreObj self, std::vector<CoreObj> *peers) {
  		if(GetMetaID(self) == DTID_FOLDER) Do(self, peers);  // no derived objects
  		else {

Index: MgaFCO.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaFCO.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** MgaFCO.cpp	27 Sep 2004 21:40:09 -0000	1.32
--- MgaFCO.cpp	13 Oct 2004 15:17:55 -0000	1.33
***************
*** 349,353 ****
  	CComBSTR oldname, newname;

! 	bool Do(CoreObj self, vector<CoreObj> *peers = NULL) {
  		if(!(oldname == CComBSTR(self[ATTRID_NAME]))) return false;
  		if(ObjForCore(self)->mgaproject->preferences & MGAPREF_NODUPLICATENAMES) {
--- 349,353 ----
  	CComBSTR oldname, newname;

! 	bool Do(CoreObj self, std::vector<CoreObj> *peers = NULL) {
  		if(!(oldname == CComBSTR(self[ATTRID_NAME]))) return false;
  		if(ObjForCore(self)->mgaproject->preferences & MGAPREF_NODUPLICATENAMES) {
***************
*** 758,762 ****
  		CoreObj s = self;
  		if(!s.IsFCO()) virtuals = VARIANT_FALSE;
! 		hash_set<CComBSTRNoAt, CComBSTR_hashfunc> match;
  		do {
  			CoreObjs children = s[ATTRID_REGNOWNER+ATTRID_COLLECTION];
--- 758,762 ----
  		CoreObj s = self;
  		if(!s.IsFCO()) virtuals = VARIANT_FALSE;
! 		std::hash_set<CComBSTRNoAt, CComBSTR_hashfunc> match;
  		do {
  			CoreObjs children = s[ATTRID_REGNOWNER+ATTRID_COLLECTION];

Index: MgaFCO.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaFCO.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** MgaFCO.h	27 Sep 2004 21:40:09 -0000	1.19
--- MgaFCO.h	13 Oct 2004 15:17:55 -0000	1.20
***************
*** 285,289 ****
  	}  self;

! 	typedef hash_map<CMgaTerritory*, CMgaAtom*, terr_hashfunc> pubfcohash;
  	pubfcohash pubfcos;
  	CMgaProject *mgaproject;
--- 285,289 ----
  	}  self;

! 	typedef std::hash_map<CMgaTerritory*, CMgaAtom*, terr_hashfunc> pubfcohash;
  	pubfcohash pubfcos;
  	CMgaProject *mgaproject;
***************
*** 292,298 ****
  	attrpool apool;
  	regnpool rpool;
! 	typedef hash_map<objid_type, CMgaConnPoint *, cp_hashfunc> cphash;
  	cphash connpointhash;
! 	typedef hash_map<objid_type, CMgaConstraint *, cp_hashfunc> cshash;
  	cshash constrainthash;

--- 292,298 ----
  	attrpool apool;
  	regnpool rpool;
! 	typedef std::hash_map<objid_type, CMgaConnPoint *, cp_hashfunc> cphash;
  	cphash connpointhash;
! 	typedef std::hash_map<objid_type, CMgaConstraint *, cp_hashfunc> cshash;
  	cshash constrainthash;

***************
*** 576,583 ****
  /* ******************* CollectionEx *************************************** */

! typedef CCoreCollectionEx<IMgaFCOs, vector<IMgaFCO*>, IMgaFCO, IMgaFCO, &CLSID_MgaFCOs, IDR_MGAFCOS> CMgaFCOs;
! typedef CCoreCollectionEx<IMgaFolders, vector<IMgaFolder*>, IMgaFolder, IMgaFolder, &CLSID_MgaFolders, IDR_MGAFOLDERS> CMgaFolders;
! typedef CCoreCollectionEx<IMgaObjects, vector<IMgaObject*>, IMgaObject, IMgaObject, &CLSID_MgaObjects, IDR_MGAOBJECTS> CMgaObjects;
! typedef CCoreCollectionEx<IMgaRegNodes, vector<IMgaRegNode*>, IMgaRegNode, IMgaRegNode, &CLSID_MgaRegNodes, IDR_MGAREGNODES> CMgaRegNodes;
  #define CREATEEXCOLLECTION_FOR(x, q) CComPtr<C##x##s> q; CreateComObject(q);
  #define EXCOLLECTIONTYPE_FOR(x) C##x##s 
--- 576,583 ----
  /* ******************* CollectionEx *************************************** */

! typedef CCoreCollectionEx<IMgaFCOs, std::vector<IMgaFCO*>, IMgaFCO, IMgaFCO, &CLSID_MgaFCOs, IDR_MGAFCOS> CMgaFCOs;
! typedef CCoreCollectionEx<IMgaFolders, std::vector<IMgaFolder*>, IMgaFolder, IMgaFolder, &CLSID_MgaFolders, IDR_MGAFOLDERS> CMgaFolders;
! typedef CCoreCollectionEx<IMgaObjects, std::vector<IMgaObject*>, IMgaObject, IMgaObject, &CLSID_MgaObjects, IDR_MGAOBJECTS> CMgaObjects;
! typedef CCoreCollectionEx<IMgaRegNodes, std::vector<IMgaRegNode*>, IMgaRegNode, IMgaRegNode, &CLSID_MgaRegNodes, IDR_MGAREGNODES> CMgaRegNodes;
  #define CREATEEXCOLLECTION_FOR(x, q) CComPtr<C##x##s> q; CreateComObject(q);
  #define EXCOLLECTIONTYPE_FOR(x) C##x##s 

Index: MgaFilter.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaFilter.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MgaFilter.h	11 Mar 2002 22:17:00 -0000	1.5
--- MgaFilter.h	13 Oct 2004 15:17:55 -0000	1.6
***************
*** 43,49 ****
  	unsigned long objtypes;
  	//##ModelId=3C5AA09002C6
! 	typedef hash_set<CComBSTRNoAt, CComBSTR_hashfunc> BSTRhash;
  	//##ModelId=3C5AA09002DA
! 	typedef hash_set<metaref_type, metaref_hashfunc> mrefhash;
  	mrefhash rolenums, kindnums;
  	BSTRhash rolenames, kindnames, names;
--- 43,49 ----
  	unsigned long objtypes;
  	//##ModelId=3C5AA09002C6
! 	typedef std::hash_set<CComBSTRNoAt, CComBSTR_hashfunc> BSTRhash;
  	//##ModelId=3C5AA09002DA
! 	typedef std::hash_set<metaref_type, metaref_hashfunc> mrefhash;
  	mrefhash rolenums, kindnums;
  	BSTRhash rolenames, kindnames, names;

Index: MgaFolder.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaFolder.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** MgaFolder.cpp	27 Sep 2004 21:40:09 -0000	1.25
--- MgaFolder.cpp	13 Oct 2004 15:17:55 -0000	1.26
***************
*** 73,77 ****
  		int i = 0;

! 		vector<CoreObj> nobjs(cnt);
  		MGACOLL_ITERATE(IMgaFolder, copylist) {
  			CoreObj oldobj = CoreObj(MGACOLL_ITER);
--- 73,77 ----
  		int i = 0;

! 		std::vector<CoreObj> nobjs(cnt);
  		MGACOLL_ITERATE(IMgaFolder, copylist) {
  			CoreObj oldobj = CoreObj(MGACOLL_ITER);
***************
*** 174,179 ****
  			int i = 0;

! 			vector<CoreObj> nobjs(cnt);
! 			vector<int> moved_into(cnt);  // >= 0 for objects moved inside the tree, -1 for newcomers
  			MGACOLL_ITERATE(IMgaFolder, movelist) {

--- 174,179 ----
  			int i = 0;

! 			std::vector<CoreObj> nobjs(cnt);
! 			std::vector<int> moved_into(cnt);  // >= 0 for objects moved inside the tree, -1 for newcomers
  			MGACOLL_ITERATE(IMgaFolder, movelist) {

***************
*** 439,447 ****
  {
  	n1.ToUpper(); n2.ToUpper();
! 	string s1, s2;
  	CopyTo( n1, s1); CopyTo( n2, s2);

  	// return false if both are not libraries
! 	if ( s1.find("MGA=") == string::npos || s2.find("MGA=") == string::npos) return false;

  	int i1 = s1.length() - 1; while ( i1 >= 0 && s1[i1] != '\\' && s1[i1] != ':' && s1[i1] != '=') --i1; //int i1 = s1.rfind( '\\' || '=');
--- 439,447 ----
  {
  	n1.ToUpper(); n2.ToUpper();
! 	std::string s1, s2;
  	CopyTo( n1, s1); CopyTo( n2, s2);

  	// return false if both are not libraries
! 	if ( s1.find("MGA=") == std::string::npos || s2.find("MGA=") == std::string::npos) return false;

  	int i1 = s1.length() - 1; while ( i1 >= 0 && s1[i1] != '\\' && s1[i1] != ':' && s1[i1] != '=') --i1; //int i1 = s1.rfind( '\\' || '=');
***************
*** 597,601 ****

  			bool found = false;
! 			map< objid_type, vector<CoreObj> > samename_objs;
  			CoreObjs children = self[ATTRID_FCOPARENT+ATTRID_COLLECTION];
  			ITERATE_THROUGH(children) {
--- 597,601 ----

  			bool found = false;
! 			std::map< objid_type, std::vector<CoreObj> > samename_objs;
  			CoreObjs children = self[ATTRID_FCOPARENT+ATTRID_COLLECTION];
  			ITERATE_THROUGH(children) {
***************
*** 619,624 ****

  #ifdef DEBUG
! 			map< objid_type, vector<CoreObj> >::iterator i = samename_objs.begin();
! 			map< objid_type, vector<CoreObj> >::iterator e = samename_objs.end();
  			for( ; i != e; ++i)
  			{
--- 619,624 ----

  #ifdef DEBUG
! 			std::map< objid_type, std::vector<CoreObj> >::iterator i = samename_objs.begin();
! 			std::map< objid_type, std::vector<CoreObj> >::iterator e = samename_objs.end();
  			for( ; i != e; ++i)
  			{
***************
*** 627,631 ****
  #endif

! 			string relpos_str;
  			CopyTo( relpos_b, relpos_str);

--- 627,631 ----
  #endif

! 			std::string relpos_str;
  			CopyTo( relpos_b, relpos_str);

***************
*** 634,639 ****

  			// take from the samename_objs map the element at relpos relative position
! 			map< objid_type, vector<CoreObj> >::iterator ii = samename_objs.begin();
! 			map< objid_type, vector<CoreObj> >::iterator ee = samename_objs.end();
  			for( int count = 0; count < relpos && ii != ee; ++ii)
  				++count;
--- 634,639 ----

  			// take from the samename_objs map the element at relpos relative position
! 			std::map< objid_type, std::vector<CoreObj> >::iterator ii = samename_objs.begin();
! 			std::map< objid_type, std::vector<CoreObj> >::iterator ee = samename_objs.end();
  			for( int count = 0; count < relpos && ii != ee; ++ii)
  				++count;
***************
*** 642,646 ****
  			if( ii == ee) // no samename objects are present in such number 
  			{
! 				map< objid_type, vector<CoreObj> >::reverse_iterator rev_i = samename_objs.rbegin();
  				the_right_one = *(rev_i->second.begin());
  			}
--- 642,646 ----
  			if( ii == ee) // no samename objects are present in such number 
  			{
! 				std::map< objid_type, std::vector<CoreObj> >::reverse_iterator rev_i = samename_objs.rbegin();
  				the_right_one = *(rev_i->second.begin());
  			}
***************
*** 835,839 ****

  //##ModelId=3C5AA09F0015
! typedef hash_set<CoreObj, coreobj_hashfunc, coreobj_eqfunc> coreobjset;

  void EnumRefs(CoreObj &self, coreobjset fcoset, EXCOLLECTIONTYPE_FOR(MgaFCO) *q) {
--- 835,839 ----

  //##ModelId=3C5AA09F0015
! typedef std::hash_set<CoreObj, coreobj_hashfunc, coreobj_eqfunc> coreobjset;

  void EnumRefs(CoreObj &self, coreobjset fcoset, EXCOLLECTIONTYPE_FOR(MgaFCO) *q) {

Index: MgaLibOps.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaLibOps.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MgaLibOps.cpp	2 Jun 2004 21:43:19 -0000	1.7
--- MgaLibOps.cpp	13 Oct 2004 15:17:55 -0000	1.8
***************
*** 60,64 ****
  	} resolve_entry;

! 	vector<resolve_entry> resolve_entries;

  public:
--- 60,64 ----
  	} resolve_entry;

! 	std::vector<resolve_entry> resolve_entries;

  public:
***************
*** 101,105 ****
  	void fixPointers()
  	{
! 		vector<resolve_entry>::const_iterator i = resolve_entries.begin();
  		while( i != resolve_entries.end() )
  		{
--- 101,105 ----
  	void fixPointers()
  	{
! 		std::vector<resolve_entry>::const_iterator i = resolve_entries.begin();
  		while( i != resolve_entries.end() )
  		{
***************
*** 257,263 ****
  		CoreObjs newchildren = newnode[ATTRID_PARENT+ATTRID_COLLECTION];
  		Sort<long>(newchildren, ATTRID_RELID);
! 		vector<CoreObj> newvect;
! 		GetAll<ICoreObjects>(newchildren, newvect);
! 		vector<CoreObj>::iterator iter = newvect.begin(), iter_end = newvect.end();
  		if(iter != iter_end) {
  			long newrelid = (*iter)[ATTRID_RELID];
--- 257,263 ----
  		CoreObjs newchildren = newnode[ATTRID_PARENT+ATTRID_COLLECTION];
  		Sort<long>(newchildren, ATTRID_RELID);
! 		std::vector<CoreObj> newvect;
! 		GetAll2<ICoreObjects>(newchildren, newvect);
! 		std::vector<CoreObj>::iterator iter = newvect.begin(), iter_end = newvect.end();
  		if(iter != iter_end) {
  			long newrelid = (*iter)[ATTRID_RELID];
***************
*** 312,316 ****
  			steal(oldnode, newnode, ATTRID_SEGREF);
  			if(!CoreObj(oldnode[ATTRID_MASTEROBJ])) {
! 				vector<CoreObj> peer(1);
  				peer[0] = oldnode[ATTRID_REFERENCE];   // set the old val, it will
  													   // be updated through xref
--- 312,316 ----
  			steal(oldnode, newnode, ATTRID_SEGREF);
  			if(!CoreObj(oldnode[ATTRID_MASTEROBJ])) {
! 				std::vector<CoreObj> peer(1);
  				peer[0] = oldnode[ATTRID_REFERENCE];   // set the old val, it will
  													   // be updated through xref

Index: MgaLibOps.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaLibOps.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MgaLibOps.h	2 Jun 2004 21:43:19 -0000	1.1
--- MgaLibOps.h	13 Oct 2004 15:17:55 -0000	1.2
***************
*** 11,15 ****
  	} resolve_entry;

! 	vector<resolve_entry> resolve_entries;

  public:
--- 11,15 ----
  	} resolve_entry;

! 	std::vector<resolve_entry> resolve_entries;

  public:
***************
*** 52,56 ****
  	void fixPointers()
  	{
! 		vector<resolve_entry>::const_iterator i = resolve_entries.begin();
  		while( i != resolve_entries.end() )
  		{
--- 52,56 ----
  	void fixPointers()
  	{
! 		std::vector<resolve_entry>::const_iterator i = resolve_entries.begin();
  		while( i != resolve_entries.end() )
  		{

Index: MgaModel.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaModel.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** MgaModel.cpp	11 Mar 2002 22:18:00 -0000	1.9
--- MgaModel.cpp	13 Oct 2004 15:17:55 -0000	1.10
***************
*** 60,64 ****
  				CComPtr<IMgaMetaRoles> metars;	
  				COMTHROW(asp->get_Roles(filter, &metars));
! 				set<metaref_type> mrefs;
  				MGACOLL_ITERATE(IMgaMetaRole, metars) {
  						metaref_type r;	            				
--- 60,64 ----
  				CComPtr<IMgaMetaRoles> metars;	
  				COMTHROW(asp->get_Roles(filter, &metars));
! 				std::set<metaref_type> mrefs;
  				MGACOLL_ITERATE(IMgaMetaRole, metars) {
  						metaref_type r;	            				
***************
*** 71,75 ****
  				COMTHROW(asp->get_Parts(&metaps));
  #pragma warning(push,3)
! 				set<metaref_type> mrefs;
  #pragma warning(pop)
  				MGACOLL_ITERATE(IMgaMetaPart, metaps) {
--- 71,75 ----
  				COMTHROW(asp->get_Parts(&metaps));
  #pragma warning(push,3)
! 				std::set<metaref_type> mrefs;
  #pragma warning(pop)
  				MGACOLL_ITERATE(IMgaMetaPart, metaps) {
***************
*** 135,139 ****
  	CREATEEXCOLLECTION_FOR(MgaFCO, q); 

! 	typedef set<FCO*> colltype;
  	colltype coll;
  	{
--- 135,139 ----
  	CREATEEXCOLLECTION_FOR(MgaFCO, q); 

! 	typedef std::set<FCO*> colltype;
  	colltype coll;
  	{

Index: MgaProject.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaProject.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** MgaProject.cpp	27 Sep 2004 21:40:09 -0000	1.58
--- MgaProject.cpp	13 Oct 2004 15:17:55 -0000	1.59
***************
*** 1169,1178 ****
  	ASSERT(p >= 0);
  	if(p)  {
! 		vector<CComBstrObj> vec;
  		vec.resize(p);
  		CopyTo(progids, vec.begin(), vec.end());
  		inautoaddoncreate = true;
  		CComBSTR errs;
! 		for(vector<CComBstrObj>::iterator i = vec.begin(); i < vec.end(); i++) {
  			try {
  				CComPtr<IMgaComponent> addon;
--- 1169,1178 ----
  	ASSERT(p >= 0);
  	if(p)  {
! 		std::vector<CComBstrObj> vec;
  		vec.resize(p);
  		CopyTo(progids, vec.begin(), vec.end());
  		inautoaddoncreate = true;
  		CComBSTR errs;
! 		for(std::vector<CComBstrObj>::iterator i = vec.begin(); i < vec.end(); i++) {
  			try {
  				CComPtr<IMgaComponent> addon;
***************
*** 1628,1637 ****
  #include "../core/CoreUtilities.h"

! bool less<metaobjidpair_type>::operator ()(const metaobjidpair_type &a,const metaobjidpair_type &b) const {
  	if(a.metaid == b.metaid) return a.objid < b.objid;
  	return a.metaid < b.metaid;
  }

! void ClearLocks(ICoreStorage * storage, set<metaobjidpair_type> &mset, short mi, long oi, bool clear) {

  	metaobjidpair_type mm; 
--- 1628,1637 ----
  #include "../core/CoreUtilities.h"

! bool std::less<metaobjidpair_type>::operator ()(const metaobjidpair_type &a,const metaobjidpair_type &b) const {
  	if(a.metaid == b.metaid) return a.objid < b.objid;
  	return a.metaid < b.metaid;
  }

! void ClearLocks(ICoreStorage * storage, std::set<metaobjidpair_type> &mset, short mi, long oi, bool clear) {

  	metaobjidpair_type mm; 
***************
*** 1701,1705 ****
  	COMTHROW(storage->OpenProject(filename, NULL));
  	COMTHROW(storage->BeginTransaction());
! 	set<metaobjidpair_type> ccc;
  	ClearLocks(storage, ccc, 1, 1, clearlocks ? true : false);
  	COMTHROW(storage->CommitTransaction());
--- 1701,1705 ----
  	COMTHROW(storage->OpenProject(filename, NULL));
  	COMTHROW(storage->BeginTransaction());
! 	std::set<metaobjidpair_type> ccc;
  	ClearLocks(storage, ccc, 1, 1, clearlocks ? true : false);
  	COMTHROW(storage->CommitTransaction());

Index: MgaProject.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaProject.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** MgaProject.h	27 Sep 2004 21:40:09 -0000	1.27
--- MgaProject.h	13 Oct 2004 15:17:55 -0000	1.28
***************
*** 173,183 ****
  	int mgaversion;

! 	typedef slist<CMgaTerritory *> tercoll;    // elements do not hold a reference!!
  	tercoll allterrs;
! 	typedef slist<CMgaAddOn *> addoncoll;	   // elements do not hold a reference!!
  	addoncoll alladdons;
! 	typedef slist< IMgaComponent *> compcoll;  // this list holds a reference!!!!
  											   // (however, STL does not like smart pointers)
! 	typedef slist<CMgaClient *>clientcoll;	   // elements do not hold a reference!!
  	clientcoll	allclients;

--- 173,183 ----
  	int mgaversion;

! 	typedef std::list<CMgaTerritory *> tercoll;    // elements do not hold a reference!! //slist
  	tercoll allterrs;
! 	typedef std::list<CMgaAddOn *> addoncoll;	   // elements do not hold a reference!! //slist
  	addoncoll alladdons;
! 	typedef std::list< IMgaComponent *> compcoll;  // this list holds a reference!!!! //slist
  											   // (however, STL does not like smart pointers)
! 	typedef std::list<CMgaClient *>clientcoll;	   // elements do not hold a reference!! //slist
  	clientcoll	allclients;

***************
*** 187,193 ****
  	HRESULT popterr();

! 	typedef queue<FCOPtr>	objcoll;
  	objcoll changedobjs, notifyobjs, temporalobjs;
! 	typedef hash_set<FCOPtr, FCOPtr_hashfunc> objhash;
  	objhash deferredchecks;
  	bool checkoff;
--- 187,193 ----
  	HRESULT popterr();

! 	typedef std::queue<FCOPtr>	objcoll;
  	objcoll changedobjs, notifyobjs, temporalobjs;
! 	typedef std::hash_set<FCOPtr, FCOPtr_hashfunc> objhash;
  	objhash deferredchecks;
  	bool checkoff;

Index: MgaReference.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaReference.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MgaReference.cpp	11 Mar 2002 22:19:00 -0000	1.8
--- MgaReference.cpp	13 Oct 2004 15:17:55 -0000	1.9
***************
*** 40,44 ****
  }

! bool putreftask::Do(CoreObj self, vector<CoreObj> *peers) {
  	CoreObj t = self[ATTRID_REFERENCE];
  	if(!COM_EQUAL(t, (*peers)[0])) {
--- 40,44 ----
  }

! bool putreftask::Do(CoreObj self, std::vector<CoreObj> *peers) {
  	CoreObj t = self[ATTRID_REFERENCE];
  	if(!COM_EQUAL(t, (*peers)[0])) {
***************
*** 62,66 ****
  			CheckWrite();
  			CHECK_MYINPTRPARVALIDNULL(newVal);
! 			vector<CoreObj> peer(1);
  			peer[0] = CoreObj(newVal);
  			if(!(mgaproject->preferences & MGAPREF_FREEINSTANCEREFS)) {
--- 62,66 ----
  			CheckWrite();
  			CHECK_MYINPTRPARVALIDNULL(newVal);
! 			std::vector<CoreObj> peer(1);
  			peer[0] = CoreObj(newVal);
  			if(!(mgaproject->preferences & MGAPREF_FREEINSTANCEREFS)) {
***************
*** 140,144 ****
  		CoreObj base = self[ATTRID_DERIVED];
  		if(!base) COMTHROW(E_MGA_NOT_DERIVED);
! 		vector<CoreObj> peer(1);
  		CoreObj rb;
  		int d;
--- 140,144 ----
  		CoreObj base = self[ATTRID_DERIVED];
  		if(!base) COMTHROW(E_MGA_NOT_DERIVED);
! 		std::vector<CoreObj> peer(1);
  		CoreObj rb;
  		int d;

Index: MgaReference.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaReference.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MgaReference.h	11 Mar 2002 22:19:00 -0000	1.4
--- MgaReference.h	13 Oct 2004 15:17:55 -0000	1.5
***************
*** 54,58 ****
  class putreftask : public DeriveTreeTask {
  	//##ModelId=3C5AA08A0001
! 	bool Do(CoreObj self, vector<CoreObj> *peers = NULL);
  public:
  	// isext is true if the relation is sure to be external, false if not known
--- 54,58 ----
  class putreftask : public DeriveTreeTask {
  	//##ModelId=3C5AA08A0001
! 	bool Do(CoreObj self, std::vector<CoreObj> *peers = NULL);
  public:
  	// isext is true if the relation is sure to be external, false if not known

Index: MgaSet.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaSet.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** MgaSet.cpp	14 Jul 2004 19:30:14 -0000	1.9
--- MgaSet.cpp	13 Oct 2004 15:17:55 -0000	1.10
***************
*** 44,48 ****

  //##ModelId=3C5AA08902D1
! bool addmember::Do(CoreObj self, vector<CoreObj> *peers) {
  	CoreObjs members = self[ATTRID_SETMEMBER + ATTRID_COLLECTION];
  	FCO *fco = ObjForCore(self);
--- 44,48 ----

  //##ModelId=3C5AA08902D1
! bool addmember::Do(CoreObj self, std::vector<CoreObj> *peers) {
  	CoreObjs members = self[ATTRID_SETMEMBER + ATTRID_COLLECTION];
  	FCO *fco = ObjForCore(self);
***************
*** 75,79 ****
  		CheckWrite();
  		CHECK_MYINPTRPAR(member);
! 		vector<CoreObj> peers(2);
  		peers[0] = CoreObj(member);
  		peers[1] = NULLCOREOBJ;
--- 75,79 ----
  		CheckWrite();
  		CHECK_MYINPTRPAR(member);
! 		std::vector<CoreObj> peers(2);
  		peers[0] = CoreObj(member);
  		peers[1] = NULLCOREOBJ;
***************
*** 95,99 ****

  //##ModelId=3C5AA0890303
! bool removemember::Do(CoreObj self, vector<CoreObj> *peers) {
  	ObjForCore(CoreObj(self[ATTRID_XREF]))->SelfMark(OBJEVENT_SETEXCLUDED);
  	ObjForCore(CoreObj(self[ATTRID_SETMEMBER]))->SelfMark(OBJEVENT_RELATION);
--- 95,99 ----

  //##ModelId=3C5AA0890303
! bool removemember::Do(CoreObj self, std::vector<CoreObj> *peers) {
  	ObjForCore(CoreObj(self[ATTRID_XREF]))->SelfMark(OBJEVENT_SETEXCLUDED);
  	ObjForCore(CoreObj(self[ATTRID_SETMEMBER]))->SelfMark(OBJEVENT_RELATION);
***************
*** 171,175 ****
  		ITERATE_THROUGH(bmembers) {
  			CoreObj newmember;
! 			vector<CoreObj> peers(2);
  //  if it is external in the most original base, the target must be kept the same
  			bool isinternal = IsInternalRelation(ITER);
--- 171,175 ----
  		ITERATE_THROUGH(bmembers) {
  			CoreObj newmember;
! 			std::vector<CoreObj> peers(2);
  //  if it is external in the most original base, the target must be kept the same
  			bool isinternal = IsInternalRelation(ITER);

Index: MgaSet.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaSet.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MgaSet.h	11 Mar 2002 22:19:00 -0000	1.5
--- MgaSet.h	13 Oct 2004 15:17:55 -0000	1.6
***************
*** 57,61 ****
  class addmember : public DeriveTreeTask {
  	//##ModelId=3C5AA08902D1
! 	bool Do(CoreObj self, vector<CoreObj> *peers = NULL);
  public:
  	//##ModelId=3C5AA08902E5
--- 57,61 ----
  class addmember : public DeriveTreeTask {
  	//##ModelId=3C5AA08902D1
! 	bool Do(CoreObj self, std::vector<CoreObj> *peers = NULL);
  public:
  	//##ModelId=3C5AA08902E5
***************
*** 66,70 ****
  class removemember : public DeriveTreeTask {
  	//##ModelId=3C5AA0890303
! 	bool Do(CoreObj self, vector<CoreObj> *peers = NULL);
  };

--- 66,70 ----
  class removemember : public DeriveTreeTask {
  	//##ModelId=3C5AA0890303
! 	bool Do(CoreObj self, std::vector<CoreObj> *peers = NULL);
  };

Index: MgaTerritory.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaTerritory.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MgaTerritory.h	11 Mar 2002 21:44:00 -0000	1.1
--- MgaTerritory.h	13 Oct 2004 15:17:55 -0000	1.2
***************
*** 17,21 ****
  public:
      DEFSIG;
! 	typedef set<FCOPtr>	objsetcoll;
  	objsetcoll inobjs;
  	CMgaTerritory() {
--- 17,21 ----
  public:
      DEFSIG;
! 	typedef std::set<FCOPtr>	objsetcoll;
  	objsetcoll inobjs;
  	CMgaTerritory() {

Index: MgaTrukk.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaTrukk.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** MgaTrukk.h	2 Jun 2004 21:43:19 -0000	1.18
--- MgaTrukk.h	13 Oct 2004 15:17:55 -0000	1.19
***************
*** 17,21 ****
  // ----------------------------------------

! #define COLLECTIONTYPE_FOR2(t1, t2)  CCoreCollection<t2, vector<t1*>, t1, t1> 
  #define CREATECOLLECTION_FOR2(t1, t2, q) \
     CComPtr< COLLECTIONTYPE_FOR2(t1, t2) > q; CreateComObject(q);
--- 17,21 ----
  // ----------------------------------------

! #define COLLECTIONTYPE_FOR2(t1, t2)  CCoreCollection<t2, std::vector<t1*>, t1, t1> 
  #define CREATECOLLECTION_FOR2(t1, t2, q) \
     CComPtr< COLLECTIONTYPE_FOR2(t1, t2) > q; CreateComObject(q);
***************
*** 34,40 ****
  CoreObjs collifptr=ci; \
  ASSERT( collifptr != NULL );				\
! vector< CoreObj> vect;			\
! GetAll<ICoreObjects>(collifptr, vect);\
! vector< CoreObj>::iterator it_i = vect.begin(), it_e = vect.end();	\
  for(;it_i != it_e; it_i++ )

--- 34,40 ----
  CoreObjs collifptr=ci; \
  ASSERT( collifptr != NULL );				\
! std::vector< CoreObj> vect;			\
! GetAll2<ICoreObjects>(collifptr, vect);\
! std::vector< CoreObj>::iterator it_i = vect.begin(), it_e = vect.end();	\
  for(;it_i != it_e; it_i++ )

***************
*** 42,48 ****
  CoreObjs collifptr=ci; \
  ASSERT( collifptr != NULL );				\
! vector< CoreObj> vect;			\
! GetAll<ICoreObjects>(collifptr, vect);\
! vector< CoreObj>::iterator it_b = vect.begin(), it_i = vect.end();	\
  while(it_i-- != it_b) 

--- 42,48 ----
  CoreObjs collifptr=ci; \
  ASSERT( collifptr != NULL );				\
! std::vector< CoreObj> vect;			\
! GetAll2<ICoreObjects>(collifptr, vect);\
! std::vector< CoreObj>::iterator it_b = vect.begin(), it_i = vect.end();	\
  while(it_i-- != it_b) 

***************
*** 78,82 ****

  template<class COLLITF>
! void GetAll(COLLITF *coll, vector< CoreObj > &ret)
  {
  	ASSERT( coll != NULL );
--- 78,82 ----

  template<class COLLITF>
! void GetAll2(COLLITF *coll, std::vector< CoreObj > &ret)
  {
  	ASSERT( coll != NULL );
***************
*** 92,96 ****
  	if(count > 0) COMTHROW( coll->GetAll(count, &ret.front().p) );
  }
! 

--- 92,96 ----
  	if(count > 0) COMTHROW( coll->GetAll(count, &ret.front().p) );
  }
! //z! renamed to GetAll2 from GetAll

***************
*** 122,127 ****
  };

! typedef hash_map<CoreObj, CoreObj, coreobj_hashfunc, coreobj_eqfunc> coreobjpairhash;
! typedef hash_map<CoreObj, int, coreobj_hashfunc, coreobj_eqfunc> coreobjhash;

--- 122,127 ----
  };

! typedef std::hash_map<CoreObj, CoreObj, coreobj_hashfunc, coreobj_eqfunc> coreobjpairhash;
! typedef std::hash_map<CoreObj, int, coreobj_hashfunc, coreobj_eqfunc> coreobjhash;

***************
*** 133,140 ****
  void Sort(CoreObjs &coll, attrid_type  ai) {
  		CREATECOLLECTION_FOR(ICoreObject, q);
! 		vector< CoreObj> vect;			
! 		GetAll<ICoreObjects>(coll, vect);
! 		vector< CoreObj>::iterator it_i = vect.begin(), it_e = vect.end();	
! 		vector< CoreObj>::iterator it_j, it_min;
  		for(;it_i != it_e; it_i++ ) {
  			it_j = it_i;
--- 133,140 ----
  void Sort(CoreObjs &coll, attrid_type  ai) {
  		CREATECOLLECTION_FOR(ICoreObject, q);
! 		std::vector< CoreObj> vect;			
! 		GetAll2<ICoreObjects>(coll, vect);
! 		std::vector< CoreObj>::iterator it_i = vect.begin(), it_e = vect.end();	
! 		std::vector< CoreObj>::iterator it_j, it_min;
  		for(;it_i != it_e; it_i++ ) {
  			it_j = it_i;
***************
*** 322,332 ****
  	attrid_type masterattr;
  private:
! 	vector<int> peerdepths;
  	int selfdepth;
! 	virtual bool Do(CoreObj self, vector<CoreObj> *peers = NULL) = 0;
! 	void _DoWithDeriveds(CoreObj self, vector<CoreObj> *peers = NULL);
  public:
  	DeriveTreeTask() : endreserve(0), masterattr(0) { };
! 	void DoWithDeriveds(CoreObj self, vector<CoreObj> *peers = NULL);
  };

--- 322,332 ----
  	attrid_type masterattr;
  private:
! 	std::vector<int> peerdepths;
  	int selfdepth;
! 	virtual bool Do(CoreObj self, std::vector<CoreObj> *peers = NULL) = 0;
! 	void _DoWithDeriveds(CoreObj self, std::vector<CoreObj> *peers = NULL);
  public:
  	DeriveTreeTask() : endreserve(0), masterattr(0) { };
! 	void DoWithDeriveds(CoreObj self, std::vector<CoreObj> *peers = NULL);
  };

Index: StdAfx.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/StdAfx.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** StdAfx.h	12 Mar 2002 15:49:00 -0000	1.6
--- StdAfx.h	13 Oct 2004 15:17:55 -0000	1.7
***************
*** 23,32 ****
  #include <atlcom.h>
  #pragma warning(push,3)
! #include <stl_config.h>
! #undef __SGI_STL_NO_ARROW_OPERATOR
! #define __SGI_STL_INTERNAL_RELOPS
! #include <slist>
  #include <string>
- #include <slist>
  #include <set>
  #include <queue>
--- 23,31 ----
  #include <atlcom.h>
  #pragma warning(push,3)
! 
! #include <stl_user_config.h>
! 
! #include <list>//slist
  #include <string>
  #include <set>
  #include <queue>