m_filter Remove redundant flags field from FilterResult

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

diff --git a/include/hash_map.h b/include/hash_map.h
index 313b216a78520eba03581fe002290c185519fa01..6be2da6ca016dc29d540a32b27e3ae8cc4819522 100644 (file)
--- a/include/hash_map.h
+++ b/include/hash_map.h
@@ -28,7 +28,7 @@
        /** Where hash_map is varies from compiler to compiler
         * as it is not standard unless we have tr1.
         */
-       #ifndef WIN32
+       #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>
@@ -41,19 +41,9 @@
                        #define END_HASHMAP_NAMESPACE }
                #endif
        #else
-               #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
+               #include <unordered_map>
+               #define HAS_TR1_UNORDERED
+               #define HASHMAP_DEPRECATED
        #endif
 
        // tr1: restoring sanity to our headers. now if only compiler vendors could agree on a FUCKING INCLUDE FILE.