diff options
| author | Adam <adam@sigterm.info> | 2012-10-12 14:50:05 -0700 |
|---|---|---|
| committer | Adam <adam@sigterm.info> | 2012-10-12 14:50:05 -0700 |
| commit | c05ad37bfd03486475889485606ed5cffc7bf5a2 (patch) | |
| tree | fe01825889769500a0f080371a0714aa15505b9a /include/hash_map.h | |
| parent | e496d321efe3e9b27f2f116bd22a05ec44aec564 (diff) | |
| parent | 5b9682275e384635a1fd9f7320cf4d9a604a43b4 (diff) | |
Merge pull request #320 from ChrisTX/insp20+cleanupwin
Windows: In-depth cleanup (see details)
Diffstat (limited to 'include/hash_map.h')
| -rw-r--r-- | include/hash_map.h | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/include/hash_map.h b/include/hash_map.h index 313b216a7..6be2da6ca 100644 --- 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. |