diff options
| author | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-06-12 19:29:42 +0000 |
|---|---|---|
| committer | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-06-12 19:29:42 +0000 |
| commit | b3e3b1f14e12b4b0a395ef8e2a4848f132e2c22b (patch) | |
| tree | 18a4627fa652e12055acf88bfac758df0ad85d89 /src/hashcomp.cpp | |
| parent | 06a25cab68a58a4c9e985a394590b3288de33723 (diff) | |
Now builds ok on gcc 4.3, not tested fully. Also UGLY, oh we hate you GCC, why couldnt you just use TR1 from the start???
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9894 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/hashcomp.cpp')
| -rw-r--r-- | src/hashcomp.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp index 19f2d601c..1bcb538f6 100644 --- a/src/hashcomp.cpp +++ b/src/hashcomp.cpp @@ -15,14 +15,7 @@ #include "inspircd.h" #include "hashcomp.h" -#ifndef WIN32 -#include <ext/hash_map> -#define nspace __gnu_cxx -#else -#include <hash_map> -#define nspace stdext -using stdext::hash_map; -#endif +#include "hash_map.h" /****************************************************** * @@ -68,9 +61,13 @@ void nspace::strlower(char *n) } #ifndef WIN32 -size_t nspace::hash<std::string>::operator()(const std::string &s) const + #ifdef HASHMAP_DEPRECATED + size_t nspace::insensitive::operator()(const std::string &s) const + #else + size_t nspace::hash<std::string>::operator()(const std::string &s) const + #endif #else -size_t nspace::hash_compare<std::string, std::less<std::string> >::operator()(const std::string &s) const + size_t nspace::hash_compare<std::string, std::less<std::string> >::operator()(const std::string &s) const #endif { /* XXX: NO DATA COPIES! :) @@ -85,6 +82,7 @@ size_t nspace::hash_compare<std::string, std::less<std::string> >::operator()(co return t; } + #ifndef WIN32 size_t nspace::hash<irc::string>::operator()(const irc::string &s) const #else |