X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fhash_map.h;h=3665d9b1a17e0b8f1247b1a18a0826e8914b323b;hb=48103a05e75dc208bcd01b62b19ae01158c01b50;hp=ad38d426aac39abe7e3d4446acb82667f2115a76;hpb=9cf56d917d92959701694477f7944d45ad2c38ed;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/hash_map.h b/include/hash_map.h
index ad38d426a..3665d9b1a 100644
--- a/include/hash_map.h
+++ b/include/hash_map.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -14,15 +14,33 @@
 #ifndef INSPIRCD_HASHMAP_H
 #define INSPIRCD_HASHMAP_H
 
-#include "inspircd_config.h"
-
+/** Where hash_map is varies from compiler to compiler
+ * as it is not standard.
+ */
 #ifndef WIN32
-#include <ext/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
-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
+