aboutsummaryrefslogtreecommitdiff
path: root/src/framework/Utilities
diff options
context:
space:
mode:
authorKingPin <none@none>2008-11-12 06:41:30 -0600
committerKingPin <none@none>2008-11-12 06:41:30 -0600
commitad217ed2f4301ce984b4e0f4cf11e0006815b591 (patch)
tree1f87d11e58187ba0f970fc5628dfa73471790735 /src/framework/Utilities
parent897a989080e92b99d86bd248467ddf5c0a32b986 (diff)
[svn] * more fixes for hash/unordered map. source mangos.
--HG-- branch : trunk
Diffstat (limited to 'src/framework/Utilities')
-rw-r--r--src/framework/Utilities/UnorderedMap.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/framework/Utilities/UnorderedMap.h b/src/framework/Utilities/UnorderedMap.h
index 4af2a1ae74d..1b9685e9523 100644
--- a/src/framework/Utilities/UnorderedMap.h
+++ b/src/framework/Utilities/UnorderedMap.h
@@ -26,7 +26,7 @@
#if COMPILER == COMPILER_INTEL
#include <ext/hash_map>
-#elif COMPILER == COMPILER_GNU && __GNUC__ >= 4
+#elif COMPILER == COMPILER_GNU && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 3)
#include <tr1/unordered_map>
#elif COMPILER == COMPILER_GNU && __GNUC__ >= 3
#include <ext/hash_map>
@@ -47,7 +47,7 @@ using stdext::hash_map;
#elif COMPILER == COMPILER_INTEL
#define UNORDERED_MAP std::hash_map
using std::hash_map;
-#elif COMPILER == COMPILER_GNU && __GNUC__ >= 4
+#elif COMPILER == COMPILER_GNU && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 3)
#define UNORDERED_MAP std::tr1::unordered_map
#elif COMPILER == COMPILER_GNU && __GNUC__ >= 3
#define UNORDERED_MAP __gnu_cxx::hash_map