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

diff --git a/include/hash_map.h b/include/hash_map.h
index ad38d426a..dad08aa93 100644
--- a/include/hash_map.h
+++ b/include/hash_map.h
@@ -2,27 +2,44 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
- 
+
 #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 unless we have tr1.
+ */
 #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
+		/** Yay, we have tr1! */
+		#include <tr1/unordered_map>
+		/** Not so oddball linux namespace for hash_map with gcc 4.0 and above */
+		#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