[paragui-cvs] CVS: paragui/src/themes theme_priv.h,1.3,1.4

[Alexander Pipelka <address@hidden>]

Update of /cvsroot/paragui/paragui/src/themes
In directory subversions:/tmp/cvs-serv7373/src/themes

Modified Files:
        theme_priv.h 
Log Message:
fixed GCC 3.1 compiling
added PG_Singleton



Index: theme_priv.h
===================================================================
RCS file: /cvsroot/paragui/paragui/src/themes/theme_priv.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** theme_priv.h        15 Apr 2002 13:35:36 -0000      1.3
--- theme_priv.h        25 Jun 2002 20:38:42 -0000      1.4
***************
*** 108,112 ****
--- 108,116 ----
  struct pg_hashstr {
        size_t operator()(std::string s1) const {
+ #if PG_VERSIONNUM(__GNUC__, __GNUC_MINOR__, 0) >= PG_VERSIONNUM(3, 1, 0)
+               return __gnu_cxx::hash<const char *>()(s1.c_str());
+ #else
                return std::hash<const char *>()(s1.c_str());
+ #endif
        }
  };
***************
*** 131,137 ****
  
  #ifdef HASH_MAP_INC
!       typedef std::hash_map<std::string, THEME_FILENAME*, pg_hashstr> 
MAP_FILENAME;
!       typedef std::hash_map<std::string, THEME_GRADIENT*, pg_hashstr> 
MAP_GRADIENT;
!       typedef std::hash_map<std::string, THEME_PROPERTY*, pg_hashstr> 
MAP_PROPERTY;
  #else
        typedef std::map<std::string, THEME_FILENAME*> MAP_FILENAME;
--- 135,141 ----
  
  #ifdef HASH_MAP_INC
!       typedef STL_MAP<std::string, THEME_FILENAME*, pg_hashstr> MAP_FILENAME;
!       typedef STL_MAP<std::string, THEME_GRADIENT*, pg_hashstr> MAP_GRADIENT;
!       typedef STL_MAP<std::string, THEME_PROPERTY*, pg_hashstr> MAP_PROPERTY;
  #else
        typedef std::map<std::string, THEME_FILENAME*> MAP_FILENAME;
***************
*** 157,161 ****
  
  #ifdef HASH_MAP_INC
!       typedef std::hash_map<std::string, THEME_OBJECT*, pg_hashstr> 
MAP_OBJECT;
  #else
        typedef std::map<std::string, THEME_OBJECT*> MAP_OBJECT;
--- 161,165 ----
  
  #ifdef HASH_MAP_INC
!       typedef STL_MAP<std::string, THEME_OBJECT*, pg_hashstr> MAP_OBJECT;
  #else
        typedef std::map<std::string, THEME_OBJECT*> MAP_OBJECT;
***************
*** 196,200 ****
  
  #ifdef HASH_MAP_INC
!       typedef std::hash_map<std::string, THEME_WIDGET*, pg_hashstr> 
MAP_WIDGET;
  #else
        typedef std::map<std::string, THEME_WIDGET*> MAP_WIDGET;
--- 200,204 ----
  
  #ifdef HASH_MAP_INC
!       typedef STL_MAP<std::string, THEME_WIDGET*, pg_hashstr> MAP_WIDGET;
  #else
        typedef std::map<std::string, THEME_WIDGET*> MAP_WIDGET;