Some documentation corrections, thanks jdhore.

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

diff --git a/include/hash_map.h b/include/hash_map.h
index 345420fc242dc94a515ae7678cc11984d3024b80..dfce5d94a1558d0f698cad1b1c20187d5474363a 100644 (file)
--- a/include/hash_map.h
+++ b/include/hash_map.h
@@ -15,23 +15,31 @@
 #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
                #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