X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=include%2Fhash_map.h;h=93341b5e00fcea4e3cc498b41345427c7e108ad1;hb=8ab1381e8d277152d99a72f33f3d1c0564060fee;hp=345420fc242dc94a515ae7678cc11984d3024b80;hpb=e56613b0035f2e9acf912af4ab68ad410100e1ea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/hash_map.h b/include/hash_map.h
index 345420fc2..93341b5e0 100644
--- a/include/hash_map.h
+++ b/include/hash_map.h
@@ -2,39 +2,57 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 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
 
-/** Where hash_map is varies from compiler to compiler
- * as it is not standard.
- */
-#ifndef WIN32
-	#ifndef HASHMAP_DEPRECATED
-		#include <ext/hash_map>
-		/** Oddball linux namespace for hash_map */
-		#define nspace __gnu_cxx
+#include "inspircd_config.h"
+
+	/** Where hash_map is varies from compiler to compiler
+	 * as it is not standard unless we have tr1.
+	 */
+	#ifndef WIN32
+		#ifdef HASHMAP_DEPRECATED
+			// GCC4+ has deprecated hash_map and uses tr1. But of course, uses a different include to MSVC. FOR FUCKS SAKE.
+			#include <tr1/unordered_map>
+			#define HAS_TR1_UNORDERED
+		#else
+			#include <ext/hash_map>
+			/** Oddball linux namespace for hash_map */
+			#define nspace __gnu_cxx
+			#define BEGIN_HASHMAP_NAMESPACE namespace nspace {
+			#define END_HASHMAP_NAMESPACE }
+		#endif
 	#else
-		#include <tr1/unordered_map>
+		#if _MSC_VER >= 1600
+			// New MSVC has tr1. Just to make things fucked up, though, MSVC and GCC use different includes! FFS.
+			#include <unordered_map>
+			#define HAS_TR1_UNORDERED
+			#define HASHMAP_DEPRECATED
+		#else
+			/** Oddball windows namespace for hash_map */
+			#include <hash_map>
+			#define nspace stdext
+			using stdext::hash_map;
+			#define BEGIN_HASHMAP_NAMESPACE namespace nspace {
+			#define END_HASHMAP_NAMESPACE }
+		#endif
+	#endif
+
+	// tr1: restoring sanity to our headers. now if only compiler vendors could agree on a FUCKING INCLUDE FILE.
+	#ifdef HAS_TR1_UNORDERED
 		#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;
-#endif
-
-
 
 #endif
-