Move nick change code out of cmd_nick; fixes double-invocation of hooks and may elimi...

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

diff --git a/include/hash_map.h b/include/hash_map.h
index f49b6a68ba5d3cf642d41806739c64e6dcf8b76b..1c6acf5e8df9f453f4a070cdbe43d515b586267f 100644 (file)
--- a/include/hash_map.h
+++ b/include/hash_map.h
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -14,32 +14,45 @@
 #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 }
+#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
-               /** Yay, we have tr1! */
-               #include <tr1/unordered_map>
-               /** Not so oddball linux namespace for hash_map with gcc 4.0 and above */
+               #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;
-       #define BEGIN_HASHMAP_NAMESPACE namespace nspace {
-       #define END_HASHMAP_NAMESPACE }
-#endif
 
 #endif