[GME-commit] GMESRC/GME/Gme GME.dsp,1.93,1.94 GMEDoc.cpp,1.24,1.25
GMEDoc.h,1.10,1.11 StdAfx.h,1.10,1.11
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Wed Oct 13 11:17:57 CDT 2004
Update of /var/lib/gme/GMESRC/GME/Gme
In directory braindrain:/tmp/cvs-serv20870/Gme
Modified Files:
GME.dsp GMEDoc.cpp GMEDoc.h StdAfx.h
Log Message:
GME ported to STLport
-std:: prefix added to stl classes and methods
CVS User: zolmol
Index: GME.dsp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GME.dsp,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** GME.dsp 14 Sep 2004 14:12:30 -0000 1.93
--- GME.dsp 13 Oct 2004 15:17:55 -0000 1.94
***************
*** 44,48 ****
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c
! # ADD CPP /nologo /MD /W3 /GR /GX /Zi /O1 /I "../include/Stl" /I "../Common" /I "../Interfaces" /I "../Gme" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /FR /FD /c
# SUBTRACT CPP /YX /Yc /Yu
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
--- 44,48 ----
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c
! # ADD CPP /nologo /MD /W3 /GR /GX /Zi /O1 /I "../include/Stlport" /I "../Common" /I "../Interfaces" /I "../Gme" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /FR /FD /c
# SUBTRACT CPP /YX /Yc /Yu
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
***************
*** 55,59 ****
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
! # ADD LINK32 /nologo /subsystem:windows /map /debug /machine:I386
!ELSEIF "$(CFG)" == "GME - Win32 Debug"
--- 55,59 ----
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
! # ADD LINK32 /nologo /subsystem:windows /map /debug /machine:I386 /libpath:"..\lib"
!ELSEIF "$(CFG)" == "GME - Win32 Debug"
***************
*** 71,75 ****
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c
! # ADD CPP /nologo /MDd /W4 /Gm /GR /GX /ZI /Od /I "../include/Stl" /I "../Common" /I "../Interfaces" /I "../Gme" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /FR /Yu"stdafx.h" /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
--- 71,75 ----
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c
! # ADD CPP /nologo /MDd /W4 /Gm /GR /GX /ZI /Od /I "../include/Stlport" /I "../Common" /I "../Interfaces" /I "../Gme" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /FR /Yu"stdafx.h" /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
***************
*** 81,85 ****
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 /nologo /subsystem:windows /map /debug /machine:I386 /pdbtype:sept
!ENDIF
--- 81,85 ----
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 /nologo /subsystem:windows /map /debug /machine:I386 /pdbtype:sept /libpath:"..\lib"
!ENDIF
***************
*** 105,109 ****
# ADD CPP /I "../" /I "."
- # SUBTRACT CPP /I "../include/Stl"
!ENDIF
--- 105,108 ----
***************
*** 119,123 ****
# ADD CPP /I "../" /I "."
- # SUBTRACT CPP /I "../include/Stl"
!ENDIF
--- 118,121 ----
***************
*** 133,137 ****
# ADD CPP /I "../" /I "."
- # SUBTRACT CPP /I "../include/Stl"
!ENDIF
--- 131,134 ----
***************
*** 151,155 ****
# ADD CPP /I "../" /I "."
- # SUBTRACT CPP /I "../include/Stl"
!ENDIF
--- 148,151 ----
***************
*** 783,787 ****
USERDEP__READM="GMEVersion.h"
# Begin Custom Build
! InputDir=\Projects\GME\GMESRC\Doc
InputPath=..\..\Doc\README_in.txt
--- 779,783 ----
USERDEP__READM="GMEVersion.h"
# Begin Custom Build
! InputDir=\proj\cvs\gmex\GMESRC\Doc
InputPath=..\..\Doc\README_in.txt
***************
*** 795,799 ****
USERDEP__READM="GMEVersion.h"
# Begin Custom Build
! InputDir=\Projects\GME\GMESRC\Doc
InputPath=..\..\Doc\README_in.txt
--- 791,795 ----
USERDEP__READM="GMEVersion.h"
# Begin Custom Build
! InputDir=\proj\cvs\gmex\GMESRC\Doc
InputPath=..\..\Doc\README_in.txt
***************
*** 825,848 ****
# End Target
# End Project
! # Section GME : {E5FE98F1-B7AD-4ABE-89DB-87DDD9DB753E}
! # 2:21:DefaultSinkHeaderFile:search.h
! # 2:16:DefaultSinkClass:CSearch
! # End Section
! # Section GME : {E4EB8324-13F0-46CB-96A3-F539DF7F79D4}
! # 2:21:DefaultSinkHeaderFile:console.h
! # 2:16:DefaultSinkClass:CConsole
! # End Section
! # Section GME : {5C402C89-C848-11D3-9A6E-00902721DB65}
! # 2:5:Class:CActiveBrowser
! # 2:10:HeaderFile:activebrowser.h
! # 2:8:ImplFile:activebrowser.cpp
! # End Section
! # Section GME : {B786F53C-297F-4DB8-8060-D45057217AEE}
! # 2:21:DefaultSinkHeaderFile:objectinspector.h
! # 2:16:DefaultSinkClass:CObjectInspector
! # End Section
! # Section GME : {5C402C8B-C848-11D3-9A6E-00902721DB65}
! # 2:21:DefaultSinkHeaderFile:activebrowser.h
! # 2:16:DefaultSinkClass:CActiveBrowser
# End Section
# Section GME : {72ADFD7B-2C39-11D0-9903-00A0C91BC942}
--- 821,828 ----
# End Target
# End Project
! # Section GME : {B718CCF7-5055-40DD-9CBD-AB17F72AB113}
! # 2:5:Class:CSearch
! # 2:10:HeaderFile:search.h
! # 2:8:ImplFile:search.cpp
# End Section
# Section GME : {72ADFD7B-2C39-11D0-9903-00A0C91BC942}
***************
*** 851,859 ****
# 2:17:ID_INDICATOR_TIME:ID_INDICATOR_TIME
# End Section
- # Section GME : {B718CCF7-5055-40DD-9CBD-AB17F72AB113}
- # 2:5:Class:CSearch
- # 2:10:HeaderFile:search.h
- # 2:8:ImplFile:search.cpp
- # End Section
# Section GME : {72ADFD78-2C39-11D0-9903-00A0C91BC942}
# 1:10:IDB_SPLASH:112
--- 831,834 ----
***************
*** 869,871 ****
--- 844,867 ----
# 2:10:HeaderFile:console.h
# 2:8:ImplFile:cnsole.cpp
+ # End Section
+ # Section GME : {E5FE98F1-B7AD-4ABE-89DB-87DDD9DB753E}
+ # 2:21:DefaultSinkHeaderFile:search.h
+ # 2:16:DefaultSinkClass:CSearch
+ # End Section
+ # Section GME : {E4EB8324-13F0-46CB-96A3-F539DF7F79D4}
+ # 2:21:DefaultSinkHeaderFile:console.h
+ # 2:16:DefaultSinkClass:CConsole
+ # End Section
+ # Section GME : {5C402C89-C848-11D3-9A6E-00902721DB65}
+ # 2:5:Class:CActiveBrowser
+ # 2:10:HeaderFile:activebrowser.h
+ # 2:8:ImplFile:activebrowser.cpp
+ # End Section
+ # Section GME : {5C402C8B-C848-11D3-9A6E-00902721DB65}
+ # 2:21:DefaultSinkHeaderFile:activebrowser.h
+ # 2:16:DefaultSinkClass:CActiveBrowser
+ # End Section
+ # Section GME : {B786F53C-297F-4DB8-8060-D45057217AEE}
+ # 2:21:DefaultSinkHeaderFile:objectinspector.h
+ # 2:16:DefaultSinkClass:CObjectInspector
# End Section
Index: GMEDoc.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEDoc.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** GMEDoc.cpp 27 Sep 2004 22:01:39 -0000 1.24
--- GMEDoc.cpp 13 Oct 2004 15:17:55 -0000 1.25
***************
*** 102,106 ****
}
! bool CGMEDoc::CreateFcoList2(CGuiObjectList* list,CComPtr<IMgaFCOs> &fcos,CGMEView *view, unsigned int* p_howmany, bool* array[8])
{
bool all_containers = *array[ 0 ];
--- 102,106 ----
}
! bool CGMEDoc::CreateFcoList2(CGuiObjectList* list,CComPtr<IMgaFCOs> &fcos,CGMEView *view, long* p_howmany, bool* array[8])
{
bool all_containers = *array[ 0 ];
***************
*** 114,118 ****
bool any_conn = *array[ 7 ];
! unsigned int how_many = 0, now_how_many = 0;
try {
view->BeginTransaction(TRANSACTION_READ_ONLY);
--- 114,118 ----
bool any_conn = *array[ 7 ];
! long how_many = 0, now_how_many = 0;
try {
view->BeginTransaction(TRANSACTION_READ_ONLY);
***************
*** 144,150 ****
// some connections might have been added
! MGACOLL_ITERATE( IMgaFCO, fcos){
! ++now_how_many;
! } MGACOLL_ITERATE_END;
if( now_how_many > how_many)
--- 144,148 ----
// some connections might have been added
! COMTHROW( fcos->get_Count( &now_how_many) );
if( now_how_many > how_many)
***************
*** 262,266 ****
CComPtr<IMgaFCOs> fcos;
bool* b_array[8] = { &all_containers, &all_refs, &all_sets, &all_conns, &any_container, &any_ref, &any_set, &any_conn };
! unsigned int number_of_elems = 0;
if( !CreateFcoList2( list, fcos, view, &number_of_elems, b_array)) return;
--- 260,264 ----
CComPtr<IMgaFCOs> fcos;
bool* b_array[8] = { &all_containers, &all_refs, &all_sets, &all_conns, &any_container, &any_ref, &any_set, &any_conn };
! long number_of_elems = 0;
if( !CreateFcoList2( list, fcos, view, &number_of_elems, b_array)) return;
Index: GMEDoc.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEDoc.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** GMEDoc.h 27 Sep 2004 22:01:39 -0000 1.10
--- GMEDoc.h 13 Oct 2004 15:17:55 -0000 1.11
***************
*** 46,50 ****
static bool CreateFcoList(CGuiObjectList* list,CComPtr<IMgaFCOs> &fcos,CGMEView *view);
! static bool CreateFcoList2(CGuiObjectList* list,CComPtr<IMgaFCOs> &fcos,CGMEView *view, unsigned int *hm, bool* array[8]);
static bool CreateAnnotationList(CGuiAnnotatorList* list,CComPtr<IMgaRegNodes> &anns,CGMEView *view);
static void CopyClosureToClipboard(CGuiObjectList* list,CGuiAnnotatorList *annList,CGMEDataDescriptor* desc,CGMEView *view);
--- 46,50 ----
static bool CreateFcoList(CGuiObjectList* list,CComPtr<IMgaFCOs> &fcos,CGMEView *view);
! static bool CreateFcoList2(CGuiObjectList* list,CComPtr<IMgaFCOs> &fcos,CGMEView *view, long *howmany, bool* array[8]);
static bool CreateAnnotationList(CGuiAnnotatorList* list,CComPtr<IMgaRegNodes> &anns,CGMEView *view);
static void CopyClosureToClipboard(CGuiObjectList* list,CGuiAnnotatorList *annList,CGMEDataDescriptor* desc,CGMEView *view);
Index: StdAfx.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/StdAfx.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** StdAfx.h 22 Jul 2004 14:05:36 -0000 1.10
--- StdAfx.h 13 Oct 2004 15:17:55 -0000 1.11
***************
*** 30,36 ****
#include <atlcom.h>
! #include <stl_config.h>
! #undef __SGI_STL_NO_ARROW_OPERATOR
! #define __SGI_STL_INTERNAL_RELOPS
#include "..\Mga\MgaLib.h"
--- 30,34 ----
#include <atlcom.h>
! #include <stl_user_config.h>
#include "..\Mga\MgaLib.h"
More information about the GME-commit
mailing list