Now builds ok on gcc 4.3, not tested fully. Also UGLY, oh we hate you GCC, why couldn...

[user/henk/code/inspircd.git] / include / hash_map.h

diff --git a/include/hash_map.h b/include/hash_map.h
index b922f61733893612ec8880cea8dfac1761ebbf67..3665d9b1a17e0b8f1247b1a18a0826e8914b323b 100644 (file)
--- a/include/hash_map.h
+++ b/include/hash_map.h
@@ -18,14 +18,29 @@
  * as it is not standard.
  */
 #ifndef WIN32
-#include <ext/hash_map>
-/** Oddball linux namespace for hash_map */
-#define nspace __gnu_cxx
+       #ifndef HASHMAP_DEPRECATED
+               #include <ext/hash_map>
+               /** Oddball linux namespace for hash_map */
+               #define nspace __gnu_cxx
+               #define BEGIN_HASHMAP_NAMESPACE namespace nspace {
+               #define END_HASHMAP_NAMESPACE }
+       #else
+               #include <tr1/unordered_map>
+               #define hash_map unordered_map
+               #define nspace std::tr1
+               #define BEGIN_HASHMAP_NAMESPACE namespace std { namespace tr1 {
+               #define END_HASHMAP_NAMESPACE } } 
+       #endif
 #else
-#include <hash_map>
-#define nspace stdext
-/** Oddball windows namespace for hash_map */
-using stdext::hash_map;
+       #include <hash_map>
+       #define nspace stdext
+       /** Oddball windows namespace for hash_map */
+       using stdext::hash_map;
+       #define BEGIN_HASHMAP_NAMESPACE namespace nspace {
+       #define END_HASHMAP_NAMESPACE }
 #endif
 
+
+
 #endif
+