From b3e3b1f14e12b4b0a395ef8e2a4848f132e2c22b Mon Sep 17 00:00:00 2001
From: brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Thu, 12 Jun 2008 19:29:42 +0000
Subject: 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
---
 src/hashcomp.cpp | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'src/hashcomp.cpp')

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
-- 
cgit v1.2.3