diff --git a/src/framework/Utilities/UnorderedMapSet.h b/src/framework/Utilities/UnorderedMapSet.h index 3a36dba4b..3f7fdafc4 100644 --- a/src/framework/Utilities/UnorderedMapSet.h +++ b/src/framework/Utilities/UnorderedMapSet.h @@ -46,11 +46,16 @@ # define HASH_NAMESPACE_END } using std::hash_map; using std::hash_set; -#elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1500 && _HAS_TR1 +#elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1600 // VS100 # define UNORDERED_MAP std::tr1::unordered_map # define UNORDERED_SET std::tr1::unordered_set # define HASH_NAMESPACE_START namespace std { # define HASH_NAMESPACE_END } +#elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1500 && _HAS_TR1 +# define UNORDERED_MAP std::tr1::unordered_map +# define UNORDERED_SET std::tr1::unordered_set +# define HASH_NAMESPACE_START namespace std { namespace tr1 { +# define HASH_NAMESPACE_END } } #elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1300 # define UNORDERED_MAP stdext::hash_map # define UNORDERED_SET stdext::hash_set diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index c0db93c95..536c83b7c 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 "10375" + #define REVISION_NR "10376" #endif // __REVISION_NR_H__