Various rehash fixes that it seems were introduced by untested code.

[user/henk/code/inspircd.git] / include / hash_map.h

diff --git a/include/hash_map.h b/include/hash_map.h
index 36e0b2b028b7db2fd826ad917372d5aaab743a3b..dad08aa934e649f4e906749e853eb99370c8fad2 100644 (file)
--- a/include/hash_map.h
+++ b/include/hash_map.h
@@ -1 +1,45 @@
-/*       +------------------------------------+\r *       | Inspire Internet Relay Chat Daemon |\r *       +------------------------------------+\r *\r *  InspIRCd: (C) 2002-2007 InspIRCd Development Team\r * See: http://www.inspircd.org/wiki/index.php/Credits\r *\r * This program is free but copyrighted software; see\r *            the file COPYING for details.\r *\r * ---------------------------------------------------\r */\r \r#ifndef INSPIRCD_HASHMAP_H\r#define INSPIRCD_HASHMAP_H\r\r#include "inspircd_config.h"\r\r/** Where hash_map is varies from compiler to compiler\r * as it is not standard.\r */\r#ifndef WIN32\r#include <ext/hash_map>\r/** Oddball linux namespace for hash_map */\r#define nspace __gnu_cxx\r#else\r#include <hash_map>\r#define nspace stdext\r/** Oddball windows namespace for hash_map */\rusing stdext::hash_map;\r#endif\r\r#endif\r
\ 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