diff --git a/src/framework/Utilities/UnorderedMap.h b/src/framework/Utilities/UnorderedMap.h index a60319d5c..a24a4288f 100644 --- a/src/framework/Utilities/UnorderedMap.h +++ b/src/framework/Utilities/UnorderedMap.h @@ -24,7 +24,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 @@ -45,7 +45,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 std::__gnu_cxx::hash_map diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index b5f334137..3148c14c1 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "6810" + #define REVISION_NR "6811" #endif // __REVISION_NR_H__