Fix double-send of SSL metadata in openssl, possible segfault in gnutls

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

diff --git a/include/hash_map.h b/include/hash_map.h
index 3665d9b1a17e0b8f1247b1a18a0826e8914b323b..dad08aa934e649f4e906749e853eb99370c8fad2 100644 (file)
--- a/include/hash_map.h
+++ b/include/hash_map.h
@@ -2,20 +2,20 @@
  *       | 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.
+ * as it is not standard unless we have tr1.
  */
 #ifndef WIN32
        #ifndef HASHMAP_DEPRECATED
@@ -25,11 +25,13 @@
                #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 } } 
+               #define END_HASHMAP_NAMESPACE } }
        #endif
 #else
        #include <hash_map>
@@ -40,7 +42,4 @@
        #define END_HASHMAP_NAMESPACE }
 #endif
 
-
-
 #endif
-