[Gcblue-commits] gcb_wx/include/database tcDatabase.h,1.4,1.5

[Xavi <xr...@us...>]

Update of /cvsroot/gcblue/gcb_wx/include/database
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12965

Modified Files:
	tcDatabase.h 
Log Message:
+ newline at the end of file
+ added ifdef where needed
+ removed typedef declaration; instead it uses gctypes.h

Index: tcDatabase.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcDatabase.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcDatabase.h	25 Mar 2004 01:33:38 -0000	1.4
--- tcDatabase.h	28 Mar 2004 19:02:47 -0000	1.5
***************
*** 23,27 ****
--- 23,29 ----
  #define _TCDATABASE_H_
  
+ #if _MSC_VER > 1000
  #pragma once
+ #endif // _MSC_VER > 1000
  
  #include "tcPool.h"
***************
*** 31,42 ****
  #include "tcDatabaseObject.h"
  
! #include "wx/wx.h" 
  #ifdef WIN32
! #include "wx/msw/private.h" // for MS Windows specific definitions
  #endif
  
! #ifndef UINT16
! typedef unsigned short UINT16; 
! #endif
  
  namespace Database 
--- 33,42 ----
  #include "tcDatabaseObject.h"
  
! #include <wx/wx.h>
  #ifdef WIN32
! #include <wx/msw/private.h> // for MS Windows specific definitions
  #endif
  
! #include "gctypes.h"
  
  namespace Database 
***************
*** 83,87 ****
        void LoadDBCSV(std::string suffix = "");
        void SaveDBCSV(std::string suffix = "");
!       void LoadDBXml(std::string suffix = "");
        void SaveDBXml(std::string suffix = "");
        void RandomizePlatforms(void);
--- 83,87 ----
        void LoadDBCSV(std::string suffix = "");
        void SaveDBCSV(std::string suffix = "");
! 	  void LoadDBXml(std::string suffix = "");
        void SaveDBXml(std::string suffix = "");
        void RandomizePlatforms(void);
***************
*** 89,93 ****
        int Serialize(tcFile& file, bool mbLoad);
        int SerializeCSV(std::string suffix, bool mbLoad);
!       void SerializeXml(std::string suffix, bool load);
        tcDatabase();
        ~tcDatabase();
--- 89,93 ----
        int Serialize(tcFile& file, bool mbLoad);
        int SerializeCSV(std::string suffix, bool mbLoad);
! 	  void SerializeXml(std::string suffix, bool load);
        tcDatabase();
        ~tcDatabase();