[GME-commit] GMESRC/GME/XmlBackEnd CoreXmlFile.cpp,1.1,1.2 CoreXmlFile.h,1.1,1.2 StdAfx.h,1.1,1.2 XmlBackEnd.dsp,1.3,1.4

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


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

Modified Files:
	CoreXmlFile.cpp CoreXmlFile.h StdAfx.h XmlBackEnd.dsp 
Log Message:
GME ported to STLport
-std:: prefix added to stl classes and methods



CVS User: zolmol

Index: CoreXmlFile.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/XmlBackEnd/CoreXmlFile.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CoreXmlFile.cpp	14 Sep 2004 15:40:01 -0000	1.1
--- CoreXmlFile.cpp	13 Oct 2004 15:17:55 -0000	1.2
***************
*** 10,14 ****
  
  
! void bin2string( const unsigned char * bytes, int len, string& str )
  {
      char hex[3];
--- 10,14 ----
  
  
! void bin2string( const unsigned char * bytes, int len, std::string& str )
  {
      char hex[3];
***************
*** 55,59 ****
  }
  
! void guid2str( GUID guid, string& str )
  {
      if( guid == GUID_NULL )
--- 55,59 ----
  }
  
! void guid2str( GUID guid, std::string& str )
  {
      if( guid == GUID_NULL )
***************
*** 76,82 ****
  }
  
! void replaceSpaceWithUnderscore( string& str )
  {
!     for( int i=0; i<str.size(); ++i )
          if( str[i] == ' ' )
              str[i] = '_';
--- 76,82 ----
  }
  
! void replaceSpaceWithUnderscore( std::string& str )
  {
!     for( unsigned int i=0; i < str.size(); ++i )
          if( str[i] == ' ' )
              str[i] = '_';
***************
*** 185,189 ****
  }
  
! void XmlAttrLong::toString(string& str) const
  {
      static char buf[100];
--- 185,189 ----
  }
  
! void XmlAttrLong::toString(std::string& str) const
  {
      static char buf[100];
***************
*** 224,228 ****
  }
  
! void XmlAttrReal::toString(string& str) const
  {
      static char buf[100];
--- 224,228 ----
  }
  
! void XmlAttrReal::toString(std::string& str) const
  {
      static char buf[100];
***************
*** 258,262 ****
  }
  
! void XmlAttrString::toString(string& str) const
  {
      str = m_value;
--- 258,262 ----
  }
  
! void XmlAttrString::toString(std::string& str) const
  {
      str = m_value;
***************
*** 299,303 ****
  }
  
! void XmlAttrBinary::toString(string& str) const
  {
      bin2string( m_value.begin(), m_value.size(), str );
--- 299,303 ----
  }
  
! void XmlAttrBinary::toString(std::string& str) const
  {
      bin2string( m_value.begin(), m_value.size(), str );
***************
*** 336,340 ****
  }
  
! void XmlAttrLock::toString(string& str) const
  {
      static char buf[100];
--- 336,340 ----
  }
  
! void XmlAttrLock::toString(std::string& str) const
  {
      static char buf[100];
***************
*** 404,408 ****
  	ASSERT( metaattributes != NULL );
  
! 	typedef vector< CComObjPtr<ICoreMetaAttribute> > metaattributelist_type;
  	metaattributelist_type metaattributelist;
  	GetAll<ICoreMetaAttributes, ICoreMetaAttribute>(metaattributes, metaattributelist);
--- 404,408 ----
  	ASSERT( metaattributes != NULL );
  
! 	typedef std::vector< CComObjPtr<ICoreMetaAttribute> > metaattributelist_type;
  	metaattributelist_type metaattributelist;
  	GetAll<ICoreMetaAttributes, ICoreMetaAttribute>(metaattributes, metaattributelist);
***************
*** 688,692 ****
              if( m_undoMap.find(it->second) == m_undoMap.end() )
              {
!                 pair<UndoMapIter, bool> t = m_undoMap.insert( UndoMap::value_type(it->second,UndoItem(m_openedObject, m_metaAttributeId, CComVariant()) ));
                  getPointer( pointerAttr, PutOut(t.first->second.m_value) );
              }
--- 688,692 ----
              if( m_undoMap.find(it->second) == m_undoMap.end() )
              {
!                 std::pair<UndoMapIter, bool> t = m_undoMap.insert( UndoMap::value_type(it->second,UndoItem(m_openedObject, m_metaAttributeId, CComVariant()) ));
                  getPointer( pointerAttr, PutOut(t.first->second.m_value) );
              }
***************
*** 701,705 ****
              if( m_undoMap.find(it->second) == m_undoMap.end() )
              {
!                 pair<UndoMapIter, bool> t = m_undoMap.insert( UndoMap::value_type(it->second,UndoItem(m_openedObject, m_metaAttributeId, CComVariant()) ));
                  it->second->toVariant( PutOut(t.first->second.m_value) );
              }
--- 701,705 ----
              if( m_undoMap.find(it->second) == m_undoMap.end() )
              {
!                 std::pair<UndoMapIter, bool> t = m_undoMap.insert( UndoMap::value_type(it->second,UndoItem(m_openedObject, m_metaAttributeId, CComVariant()) ));
                  it->second->toVariant( PutOut(t.first->second.m_value) );
              }
***************
*** 722,726 ****
              if( m_undoMap.find(it->second) == m_undoMap.end() )
              {
!                 pair<UndoMapIter, bool> t = m_undoMap.insert( UndoMap::value_type(it->second,UndoItem(m_openedObject, m_metaAttributeId, CComVariant()) ));
                  it->second->toVariant( PutOut(t.first->second.m_value) );
              }
--- 722,726 ----
              if( m_undoMap.find(it->second) == m_undoMap.end() )
              {
!                 std::pair<UndoMapIter, bool> t = m_undoMap.insert( UndoMap::value_type(it->second,UndoItem(m_openedObject, m_metaAttributeId, CComVariant()) ));
                  it->second->toVariant( PutOut(t.first->second.m_value) );
              }
***************
*** 1103,1107 ****
      //   MGX="C:\temp\test1" vssdatabase="frfre" vsspath="dede" user="fdasfdsfds" password="defrefre"
  
!     string conn;
      CopyTo(connection, conn);
      const char * connectionString = conn.c_str();
--- 1103,1107 ----
      //   MGX="C:\temp\test1" vssdatabase="frfre" vsspath="dede" user="fdasfdsfds" password="defrefre"
  
!     std::string conn;
      CopyTo(connection, conn);
      const char * connectionString = conn.c_str();
***************
*** 1111,1116 ****
      
      int          size = conn.size();
!     string       key;
!     string       val;
      bool         keyCollecting = true;
      bool         startedValue  = false;
--- 1111,1116 ----
      
      int          size = conn.size();
!     std::string       key;
!     std::string       val;
      bool         keyCollecting = true;
      bool         startedValue  = false;
***************
*** 1208,1216 ****
  /*void CCoreXmlFile::setFileNamesOnOpen(BSTR connection)
  {
!     string conn;
  
      CopyTo(connection, conn);
  
!     if( !(string(conn, 0, 4) == "MGX=") )
  	    HR_THROW(E_INVALID_USAGE);
  
--- 1208,1216 ----
  /*void CCoreXmlFile::setFileNamesOnOpen(BSTR connection)
  {
!     std::string conn;
  
      CopyTo(connection, conn);
  
!     if( !(std::string(conn, 0, 4) == "MGX=") )
  	    HR_THROW(E_INVALID_USAGE);
  
***************
*** 1240,1248 ****
  }*/
  
! void CCoreXmlFile::getContainerFileName(XmlObject * obj, string& str, bool fullpath)
  {
      ASSERT( obj->isContainer() );
  
!     string guidStr;
      guid2str( obj->m_guid, guidStr );
  
--- 1240,1248 ----
  }*/
  
! void CCoreXmlFile::getContainerFileName(XmlObject * obj, std::string& str, bool fullpath)
  {
      ASSERT( obj->isContainer() );
  
!     std::string guidStr;
      guid2str( obj->m_guid, guidStr );
  
***************
*** 1416,1420 ****
  {
      ASSERT( attr!= NULL );
!     vector<metaobjidpair_type> idpairs;
      for( XmlObjSetIter it = attr->m_children.begin(); it != attr->m_children.end(); ++it )
      {
--- 1416,1420 ----
  {
      ASSERT( attr!= NULL );
!     std::vector<metaobjidpair_type> idpairs;
      for( XmlObjSetIter it = attr->m_children.begin(); it != attr->m_children.end(); ++it )
      {
***************
*** 1857,1861 ****
          HR_THROW(E_INVALID_USAGE);
  
!     string fileName;
      getContainerFileName(container, fileName);
  
--- 1857,1861 ----
          HR_THROW(E_INVALID_USAGE);
  
!     std::string fileName;
      getContainerFileName(container, fileName);
  
***************
*** 1887,1891 ****
  void CCoreXmlFile::writeObject(XmlObject * obj, FILE * file, bool container, const char * prefix)
  {        
!     string                          str;
      CComObjPtr<ICoreMetaObject>     metaobject;
      CComBSTR                        metaToken;
--- 1887,1891 ----
  void CCoreXmlFile::writeObject(XmlObject * obj, FILE * file, bool container, const char * prefix)
  {        
!     std::string                          str;
      CComObjPtr<ICoreMetaObject>     metaobject;
      CComBSTR                        metaToken;
***************
*** 1906,1910 ****
          CComObjPtr<ICoreMetaAttribute>   metaAttrib;
          CComBSTR                         attribToken;
!         string                           attrVal;
  
          COMTHROW( metaobject->get_Attribute( it->first, PutOut(metaAttrib) ) );
--- 1906,1910 ----
          CComObjPtr<ICoreMetaAttribute>   metaAttrib;
          CComBSTR                         attribToken;
!         std::string                           attrVal;
  
          COMTHROW( metaobject->get_Attribute( it->first, PutOut(metaAttrib) ) );
***************
*** 1932,1936 ****
              char buf[200];
              sprintf(buf, "%S", attribToken );        
!             string attribToken2 = buf;
              replaceSpaceWithUnderscore(attribToken2);
  
--- 1932,1936 ----
              char buf[200];
              sprintf(buf, "%S", attribToken );        
!             std::string attribToken2 = buf;
              replaceSpaceWithUnderscore(attribToken2);
  
***************
*** 1943,1947 ****
      // child is written if it is not the root, a model or a folder
      // and the parent of the child is a us according to m_parentMap
!     string newPrefix = prefix;
      newPrefix += "\t";
      for( it=obj->m_attributes.begin(); it!=obj->m_attributes.end(); ++it )
--- 1943,1947 ----
      // child is written if it is not the root, a model or a folder
      // and the parent of the child is a us according to m_parentMap
!     std::string newPrefix = prefix;
      newPrefix += "\t";
      for( it=obj->m_attributes.begin(); it!=obj->m_attributes.end(); ++it )
***************
*** 2007,2011 ****
  void CCoreXmlFile::fullReadContainer(XmlObject * container)
  {
!     string fileName;
      getContainerFileName(container, fileName);
  
--- 2007,2011 ----
  void CCoreXmlFile::fullReadContainer(XmlObject * container)
  {
!     std::string fileName;
      getContainerFileName(container, fileName);
  
***************
*** 2058,2062 ****
--- 2058,2064 ----
      // get meta object
      CComObjPtr<ICoreMetaObject> metaobject;
+ #pragma warning( disable: 4244) // conversion from 'long' to 'short', possible loss of data
      COMTHROW( m_metaProject->get_Object( metaid, PutOut(metaobject) ) );
+ #pragma warning( default: 4244) // conversion from 'long' to 'short', possible loss of data
  
      // find or create object
***************
*** 2128,2132 ****
      // read children
      DOMNodeList * children = e->getChildNodes();
!     for( int i=0; i<children->getLength(); ++i )
      {
          DOMNode * node = children->item(i);
--- 2130,2134 ----
      // read children
      DOMNodeList * children = e->getChildNodes();
!     for( int i=0; i< (int) children->getLength(); ++i )
      {
          DOMNode * node = children->item(i);
***************
*** 2301,2309 ****
  }
  
! void CCoreXmlFile::getSourceSafePath(XmlObject * obj, string& str)
  {
      ASSERT( m_sourceControl == SC_SOURCESAFE );
  
!     string fileName;
      getContainerFileName( obj, fileName, false );
  
--- 2303,2311 ----
  }
  
! void CCoreXmlFile::getSourceSafePath(XmlObject * obj, std::string& str)
  {
      ASSERT( m_sourceControl == SC_SOURCESAFE );
  
!     std::string fileName;
      getContainerFileName( obj, fileName, false );
  
***************
*** 2317,2321 ****
      ASSERT( obj != NULL );
  
!     string fileName;
      getContainerFileName( obj, fileName );
  
--- 2319,2323 ----
      ASSERT( obj != NULL );
  
!     std::string fileName;
      getContainerFileName( obj, fileName );
  
***************
*** 2339,2343 ****
      if( m_sourceControl == SC_SOURCESAFE )
      {
!         string fullPath;
          getSourceSafePath( obj, fullPath );
          CComBSTR fullPath2 = fullPath.c_str();
--- 2341,2345 ----
      if( m_sourceControl == SC_SOURCESAFE )
      {
!         std::string fullPath;
          getSourceSafePath( obj, fullPath );
          CComBSTR fullPath2 = fullPath.c_str();
***************
*** 2368,2372 ****
      else if( m_sourceControl == SC_CLEARCASE )
      {
!         string fileName;
          getContainerFileName( obj, fileName, true );
          return isFileCheckedOutCC( fileName.c_str() );
--- 2370,2374 ----
      else if( m_sourceControl == SC_CLEARCASE )
      {
!         std::string fileName;
          getContainerFileName( obj, fileName, true );
          return isFileCheckedOutCC( fileName.c_str() );
***************
*** 2382,2386 ****
      if( m_sourceControl == SC_SOURCESAFE )
      {
!         string fullPath;
          getSourceSafePath( obj, fullPath );
          CComBSTR fullPath2 = fullPath.c_str();
--- 2384,2388 ----
      if( m_sourceControl == SC_SOURCESAFE )
      {
!         std::string fullPath;
          getSourceSafePath( obj, fullPath );
          CComBSTR fullPath2 = fullPath.c_str();
***************
*** 2392,2396 ****
      else if( m_sourceControl == SC_CLEARCASE )
      {
!         string fileName;
          getContainerFileName( obj, fileName, true );
          checkOutFileCC( fileName.c_str() );
--- 2394,2398 ----
      else if( m_sourceControl == SC_CLEARCASE )
      {
!         std::string fileName;
          getContainerFileName( obj, fileName, true );
          checkOutFileCC( fileName.c_str() );
***************
*** 2402,2406 ****
      ASSERT( container->isContainer() );
  
!     string fileName;
      getContainerFileName(container, fileName);
  
--- 2404,2408 ----
      ASSERT( container->isContainer() );
  
!     std::string fileName;
      getContainerFileName(container, fileName);
  
***************
*** 2604,2608 ****
  void CCoreXmlFile::getLatestVerCC( const char * path )
  {
!     string cmd = "update ";
      cmd += path;
  
--- 2606,2610 ----
  void CCoreXmlFile::getLatestVerCC( const char * path )
  {
!     std::string cmd = "update ";
      cmd += path;
  

Index: CoreXmlFile.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/XmlBackEnd/CoreXmlFile.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CoreXmlFile.h	14 Sep 2004 15:40:01 -0000	1.1
--- CoreXmlFile.h	13 Oct 2004 15:17:55 -0000	1.2
***************
*** 3,7 ****
  
  #include "resource.h"
! #include <fstream.h>
  #include <list>
  #include <map>
--- 3,7 ----
  
  #include "resource.h"
! #include <fstream>//fstream.h
  #include <list>
  #include <map>
***************
*** 45,54 ****
  class XmlObject;
  
! typedef set<XmlObject*>                 XmlObjSet;
  typedef XmlObjSet::iterator             XmlObjSetIter;
! typedef vector<XmlObject*>              XmlObjVec;
  typedef XmlObjVec::iterator             XmlObjVecIter;
! typedef map<metaid_type,attrid_type>    ParentMap;
! typedef map<GUID, XmlObject*,GUID_less> GUIDToXmlObjectMap;
  typedef GUIDToXmlObjectMap::iterator    GUIDToXmlObjectMapIter;
  
--- 45,54 ----
  class XmlObject;
  
! typedef std::set<XmlObject*>                 XmlObjSet;
  typedef XmlObjSet::iterator             XmlObjSetIter;
! typedef std::vector<XmlObject*>              XmlObjVec;
  typedef XmlObjVec::iterator             XmlObjVecIter;
! typedef std::map<metaid_type,attrid_type>    ParentMap;
! typedef std::map<GUID, XmlObject*,GUID_less> GUIDToXmlObjectMap;
  typedef GUIDToXmlObjectMap::iterator    GUIDToXmlObjectMapIter;
  
***************
*** 70,77 ****
      virtual void         toVariant   (VARIANT *p) const  {}
      virtual void         fromString  (const char * str)  {}
!     virtual void         toString    (string& str) const {}
  };
  
! typedef map<attrid_type,XmlAttrBase*>   AttribMap;
  typedef AttribMap::iterator             AttribMapIter;
  
--- 70,77 ----
      virtual void         toVariant   (VARIANT *p) const  {}
      virtual void         fromString  (const char * str)  {}
!     virtual void         toString    (std::string& str) const {}
  };
  
! typedef std::map<attrid_type,XmlAttrBase*>   AttribMap;
  typedef AttribMap::iterator             AttribMapIter;
  
***************
*** 89,93 ****
  	virtual void         toVariant   (VARIANT *p) const;
      virtual void         fromString  (const char * str);
!     virtual void         toString    (string& str) const;
  protected:
      long    m_value;
--- 89,93 ----
  	virtual void         toVariant   (VARIANT *p) const;
      virtual void         fromString  (const char * str);
!     virtual void         toString    (std::string& str) const;
  protected:
      long    m_value;
***************
*** 107,111 ****
  	virtual void         toVariant   (VARIANT *p) const;
      virtual void         fromString  (const char * str);
!     virtual void         toString    (string& str) const;
  protected:
      double  m_value;
--- 107,111 ----
  	virtual void         toVariant   (VARIANT *p) const;
      virtual void         fromString  (const char * str);
!     virtual void         toString    (std::string& str) const;
  protected:
      double  m_value;
***************
*** 123,129 ****
  	virtual void         toVariant   (VARIANT *p) const;
      virtual void         fromString  (const char * str);
!     virtual void         toString    (string& str) const;
  protected:
!     string  m_value;
  };
  
--- 123,129 ----
  	virtual void         toVariant   (VARIANT *p) const;
      virtual void         fromString  (const char * str);
!     virtual void         toString    (std::string& str) const;
  protected:
!     std::string  m_value;
  };
  
***************
*** 139,143 ****
  	virtual void         toVariant   (VARIANT *p) const;
      virtual void         fromString  (const char * str);
!     virtual void         toString    (string& str) const;
  protected:
      bindata m_value;
--- 139,143 ----
  	virtual void         toVariant   (VARIANT *p) const;
      virtual void         fromString  (const char * str);
!     virtual void         toString    (std::string& str) const;
  protected:
      bindata m_value;
***************
*** 157,161 ****
  	virtual void         toVariant   (VARIANT *p) const;
      virtual void         fromString  (const char * str);
!     virtual void         toString    (string& str) const;
  protected:
      lockval_type    m_value;
--- 157,161 ----
  	virtual void         toVariant   (VARIANT *p) const;
      virtual void         fromString  (const char * str);
!     virtual void         toString    (std::string& str) const;
  protected:
      lockval_type    m_value;
***************
*** 237,241 ****
  };
  
! typedef vector<UnresolvedPointer>       UnresolvedPointerVec;
  typedef UnresolvedPointerVec::iterator  UnresolvedPointerVecIt;
  
--- 237,241 ----
  };
  
! typedef std::vector<UnresolvedPointer>       UnresolvedPointerVec;
  typedef UnresolvedPointerVec::iterator  UnresolvedPointerVecIt;
  
***************
*** 254,258 ****
  };
  
! typedef map<XmlAttrBase*, UndoItem>  UndoMap;
  typedef UndoMap::iterator            UndoMapIter;
  
--- 254,258 ----
  };
  
! typedef std::map<XmlAttrBase*, UndoItem>  UndoMap;
  typedef UndoMap::iterator            UndoMapIter;
  
***************
*** 329,333 ****
      void         setFileNames           ();
  
!     void         getContainerFileName   (XmlObject * obj, string& str, bool fullpath=true);
      
      // graph operatrions
--- 329,333 ----
      void         setFileNames           ();
  
!     void         getContainerFileName   (XmlObject * obj, std::string& str, bool fullpath=true);
      
      // graph operatrions
***************
*** 404,408 ****
      void         openSourceSafeDatabase ();
  
!     void         getSourceSafePath      (XmlObject * obj, string& str);
  
      bool         isContainerReadOnly    (XmlObject * obj);
--- 404,408 ----
      void         openSourceSafeDatabase ();
  
!     void         getSourceSafePath      (XmlObject * obj, std::string& str);
  
      bool         isContainerReadOnly    (XmlObject * obj);
***************
*** 454,462 ****
      bool                            m_opened;
      bool                            m_modified;
!     string                          m_parentFolderPath;   // absolute path of the folder contains the project folder
!     string                          m_folderPath;   // absolute path of the folder contains the project files
!     string                          m_cacheFileName;
!     string                          m_projectFileName;
!     string                          m_projectName;
      bool                            m_inTransaction;
  
--- 454,462 ----
      bool                            m_opened;
      bool                            m_modified;
!     std::string                          m_parentFolderPath;   // absolute path of the folder contains the project folder
!     std::string                          m_folderPath;   // absolute path of the folder contains the project files
!     std::string                          m_cacheFileName;
!     std::string                          m_projectFileName;
!     std::string                          m_projectName;
      bool                            m_inTransaction;
  
***************
*** 465,477 ****
  
      // sourcesafe
!     string                          m_vssDatabaseStr;
!     string                          m_vssParentPath;
!     string                          m_vssPath;
      CComObjPtr<IVSSDatabase>        m_vssDatabase;
!     string                          m_vssUser;
!     string                          m_vssPassword;
  
      // clearcase
!     string                          m_clearCaseString;
      CComObjPtr<IClearCase>          m_clearCase;
      CComObjPtr<IClearTool>          m_clearTool;
--- 465,477 ----
  
      // sourcesafe
!     std::string                          m_vssDatabaseStr;
!     std::string                          m_vssParentPath;
!     std::string                          m_vssPath;
      CComObjPtr<IVSSDatabase>        m_vssDatabase;
!     std::string                          m_vssUser;
!     std::string                          m_vssPassword;
  
      // clearcase
!     std::string                          m_clearCaseString;
      CComObjPtr<IClearCase>          m_clearCase;
      CComObjPtr<IClearTool>          m_clearTool;

Index: StdAfx.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/XmlBackEnd/StdAfx.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StdAfx.h	14 Sep 2004 15:40:01 -0000	1.1
--- StdAfx.h	13 Oct 2004 15:17:55 -0000	1.2
***************
*** 26,32 ****
  
  #define _NOTHREADS
! #include <stl_config.h>
! #undef __SGI_STL_NO_ARROW_OPERATOR
! #define __SGI_STL_INTERNAL_RELOPS
  
  
--- 26,31 ----
  
  #define _NOTHREADS
! 
! #include <stl_user_config.h>
  
  

Index: XmlBackEnd.dsp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/XmlBackEnd/XmlBackEnd.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** XmlBackEnd.dsp	28 Sep 2004 15:06:34 -0000	1.3
--- XmlBackEnd.dsp	13 Oct 2004 15:17:55 -0000	1.4
***************
*** 44,48 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c
! # ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /I "./" /I "../Include" /I "../Include/ODBC" /I "../Include/repository" /I "../Interfaces" /I "../Include/STL" /I "../Common" /I "../Gme" /I "../Core" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /FR /YX /FD /GZ /c
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
--- 44,48 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c
! # ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /I "./" /I "../Include" /I "../Include/ODBC" /I "../Include/repository" /I "../Interfaces" /I "../Include/STLport" /I "../Common" /I "../Gme" /I "../Core" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /FR /YX /FD /GZ /c
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
***************
*** 81,85 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MD /W3 /GX /O1 /I "../Include" /I "../Include/ODBC" /I "../Include/repository" /I "../Interfaces" /I "../Include/STL" /I "../Common" /I "../Gme" /I "../Core" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /D "_ATL_STATIC_REGISTRY" /YX /FD /c
! # ADD CPP /nologo /MD /W3 /GX /Zi /O1 /I "./" /I "../Include" /I "../Include/ODBC" /I "../Include/repository" /I "../Interfaces" /I "../Include/STL" /I "../Common" /I "../Gme" /I "../Core" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /D "_ATL_STATIC_REGISTRY" /FR /YX /FD /c
  # ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
  # ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
--- 81,85 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MD /W3 /GX /O1 /I "../Include" /I "../Include/ODBC" /I "../Include/repository" /I "../Interfaces" /I "../Include/STL" /I "../Common" /I "../Gme" /I "../Core" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /D "_ATL_STATIC_REGISTRY" /YX /FD /c
! # ADD CPP /nologo /MD /W3 /GX /Zi /O1 /I "./" /I "../Include" /I "../Include/ODBC" /I "../Include/repository" /I "../Interfaces" /I "../Include/STLport" /I "../Common" /I "../Gme" /I "../Core" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /D "_ATL_STATIC_REGISTRY" /FR /YX /FD /c
  # ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
  # ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"



More information about the GME-commit mailing list