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

diff --git a/include/hash_map.h b/include/hash_map.h
index 36e0b2b02..dad08aa93 100644
--- a/include/hash_map.h
+++ b/include/hash_map.h
@@ -1 +1,45 @@
-/*       +------------------------------------+
 *       | Inspire Internet Relay Chat Daemon |
 *       +------------------------------------+
 *
 *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
 * See: http://www.inspircd.org/wiki/index.php/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.
 */
#ifndef WIN32
#include <ext/hash_map>
/** Oddball linux namespace for hash_map */
#define nspace __gnu_cxx
#else
#include <hash_map>
#define nspace stdext
/** Oddball windows namespace for hash_map */
using stdext::hash_map;
#endif

#endif
\ No newline at end of file
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  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 unless we have tr1.
+ */
+#ifndef WIN32
+	#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
+	/** Oddball windows namespace for hash_map */
+	using stdext::hash_map;
+	#define BEGIN_HASHMAP_NAMESPACE namespace nspace {
+	#define END_HASHMAP_NAMESPACE }
+#endif
+
+#endif