[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paragui-cvs] CVS: paragui/src/themes theme_priv.h,1.3,1.3.6.1
From: |
Alexander Pipelka <address@hidden> |
Subject: |
[paragui-cvs] CVS: paragui/src/themes theme_priv.h,1.3,1.3.6.1 |
Date: |
Wed, 29 May 2002 18:11:48 -0400 |
Update of /cvsroot/paragui/paragui/src/themes
In directory subversions:/tmp/cvs-serv15065/src/themes
Modified Files:
Tag: devel-1-0
theme_priv.h
Log Message:
GCC 3.1 compilation fixes
Thanks Guillaume Cottenceau <address@hidden>
Index: theme_priv.h
===================================================================
RCS file: /cvsroot/paragui/paragui/src/themes/theme_priv.h,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -C2 -r1.3 -r1.3.6.1
*** theme_priv.h 15 Apr 2002 13:35:36 -0000 1.3
--- theme_priv.h 29 May 2002 22:11:46 -0000 1.3.6.1
***************
*** 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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paragui-cvs] CVS: paragui/src/themes theme_priv.h,1.3,1.3.6.1,
Alexander Pipelka <address@hidden> <=
- Prev by Date:
[paragui-cvs] CVS: paragui RELEASENOTES.final,1.1.1.1.6.2,1.1.1.1.6.3
- Next by Date:
[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
- Previous by thread:
[paragui-cvs] CVS: paragui RELEASENOTES.final,1.1.1.1.6.2,1.1.1.1.6.3
- Next by thread:
[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
- Index(es):