From ad217ed2f4301ce984b4e0f4cf11e0006815b591 Mon Sep 17 00:00:00 2001 From: KingPin Date: Wed, 12 Nov 2008 06:41:30 -0600 Subject: [svn] * more fixes for hash/unordered map. source mangos. --HG-- branch : trunk --- src/framework/Utilities/UnorderedMap.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/framework/Utilities') 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 -#elif COMPILER == COMPILER_GNU && __GNUC__ >= 4 +#elif COMPILER == COMPILER_GNU && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 3) #include #elif COMPILER == COMPILER_GNU && __GNUC__ >= 3 #include @@ -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 -- cgit v1.2.3