[paragui-cvs] CVS: paragui/src/core pgcolors.cpp,1.1,1.1.6.1 pgsurfacecache.cpp,1.2,1.2.4.1

[Alexander Pipelka <address@hidden>]

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

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



Index: pgcolors.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgcolors.cpp,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -C2 -r1.1 -r1.1.6.1
*** pgcolors.cpp        15 Apr 2002 14:53:56 -0000      1.1
--- pgcolors.cpp        29 May 2002 22:11:45 -0000      1.1.6.1
***************
*** 408,414 ****
        colors["magenta1"] = magenta1;
        colors["VioletRed2"] = VioletRed2;
! #ifndef __BORLANDC__
!       colors["tan"] = tan;
! #endif
        colors["SeaGreen2"] = SeaGreen2;
        colors["gray59"] = gray59;
--- 408,417 ----
        colors["magenta1"] = magenta1;
        colors["VioletRed2"] = VioletRed2;
! //#ifdef __BORLANDC__
! //#else
! //#if PG_VERSIONNUM(__GNUC__, __GNUC_MINOR__, 0) < PG_VERSIONNUM(3, 1, 0)
! //    colors["tan"] = tan;
! //#endif
! //#endif
        colors["SeaGreen2"] = SeaGreen2;
        colors["gray59"] = gray59;

Index: pgsurfacecache.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgsurfacecache.cpp,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -r1.2 -r1.2.4.1
*** pgsurfacecache.cpp  26 Apr 2002 12:43:22 -0000      1.2
--- pgsurfacecache.cpp  29 May 2002 22:11:45 -0000      1.2.4.1
***************
*** 57,63 ****
  
  // Don't need custom comparision for strings.
! typedef std::hash_map<std::string, pg_surface_cache_t*, pg_surface_hash> 
pg_surfacemap_t;
  // Don't need custom hash or comparision functions when the key is a long.
! typedef std::hash_map<unsigned long, pg_surface_cache_t* > 
pg_surfacemap_index_t;
  
  typedef pg_surfacemap_t::iterator pg_surfacemap_iter_t;
--- 57,63 ----
  
  // Don't need custom comparision for strings.
! typedef STL_MAP<std::string, pg_surface_cache_t*, pg_surface_hash> 
pg_surfacemap_t;
  // Don't need custom hash or comparision functions when the key is a long.
! typedef STL_MAP<unsigned long, pg_surface_cache_t* > pg_surfacemap_index_t;
  
  typedef pg_surfacemap_t::iterator pg_surfacemap_iter_t;