summaryrefslogtreecommitdiff
path: root/src/hashcomp.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/hashcomp.cpp')
-rw-r--r--src/hashcomp.cpp18
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