summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2008-06-12 17:40:40 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2008-06-12 17:40:40 +0000
commite56613b0035f2e9acf912af4ab68ad410100e1ea (patch)
treefa2d4ffdd3b668ff3451fa766d0afcf4317961c0
parent04b09e3b2cfd929b42dccc40626b07679c7eff09 (diff)
This should do the job, dont quote me on it.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9892 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--include/hash_map.h23
1 files changed, 16 insertions, 7 deletions
diff --git a/include/hash_map.h b/include/hash_map.h
index b922f6173..345420fc2 100644
--- a/include/hash_map.h
+++ b/include/hash_map.h
@@ -18,14 +18,23 @@
* 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
+ #else
+ #include <tr1/unordered_map>
+ #define hash_map unordered_map
+ #define nspace std::tr1
+ #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;
#endif
+
+
#endif
+