[paragui-cvs] CVS: paragui/include paraconfig.h,1.3.6.1,1.3.6.2 pgcolors.h,1.3,1.3.6.1 pgrectlist.h,1.3,1.3.6.1

[Alexander Pipelka <address@hidden>]

Update of /cvsroot/paragui/paragui/include
In directory subversions:/tmp/cvs-serv15065/include

Modified Files:
      Tag: devel-1-0
        paraconfig.h pgcolors.h pgrectlist.h 
Log Message:
GCC 3.1 compilation fixes
Thanks Guillaume Cottenceau <address@hidden>



Index: paraconfig.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/paraconfig.h,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -C2 -r1.3.6.1 -r1.3.6.2
*** paraconfig.h        2 May 2002 08:45:35 -0000       1.3.6.1
--- paraconfig.h        29 May 2002 22:11:45 -0000      1.3.6.2
***************
*** 33,36 ****
--- 33,38 ----
  #undef VERSION
  
+ #define PG_VERSIONNUM(X, Y, Z) ((X)*1000 + (Y)*100 + (Z))
+ 
  #if (defined(WIN32) || defined(__WIN32__)) && (defined(_MSC_VER) || 
defined(__BCPLUSPLUS__))
  #include "paraconfig_win32.h"
***************
*** 73,81 ****
--- 75,88 ----
  #define HASH_MAP_INC <ext/hash_map>
  #define MAP_INC <ext/hash_map>
+ #if PG_VERSIONNUM(__GNUC__, __GNUC_MINOR__, 0) >= PG_VERSIONNUM(3, 1, 0)
+ #define STL_MAP __gnu_cxx::hash_map
+ #else
  #define STL_MAP std::hash_map
+ #endif
  #else
  #define MAP_INC <map>
  #define STL_MAP std::map
  #endif
+ 
  
  //

Index: pgcolors.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgcolors.h,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -C2 -r1.3 -r1.3.6.1
*** pgcolors.h  15 Apr 2002 13:35:35 -0000      1.3
--- pgcolors.h  29 May 2002 22:11:45 -0000      1.3.6.1
***************
*** 556,562 ****
  const SDL_Color VioletRed2 = {238, 58, 140};
  const SDL_Color violetred2 = {238, 58, 140};
! #ifndef __BORLANDC__
! const SDL_Color tan = {210, 180, 140};
! #endif
  const SDL_Color SeaGreen2 = {78, 238, 148};
  const SDL_Color seagreen2 = {78, 238, 148};
--- 556,565 ----
  const SDL_Color VioletRed2 = {238, 58, 140};
  const SDL_Color violetred2 = {238, 58, 140};
! //#ifdef __BORLANDC__
! //#else
! //#if PG_VERSIONNUM(__GNUC__, __GNUC_MINOR__, 0) < PG_VERSIONNUM(3, 1, 0)
! //const SDL_Color tan = {210, 180, 140};
! //#endif
! //#endif
  const SDL_Color SeaGreen2 = {78, 238, 148};
  const SDL_Color seagreen2 = {78, 238, 148};

Index: pgrectlist.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgrectlist.h,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -C2 -r1.3 -r1.3.6.1
*** pgrectlist.h        15 Apr 2002 13:35:35 -0000      1.3
--- pgrectlist.h        29 May 2002 22:11:45 -0000      1.3.6.1
***************
*** 30,33 ****
--- 30,34 ----
  #define PG_RECTLIST_H
  
+ #include "paragui.h"
  #include "pgrect.h"
  #include <vector>