From 46c8c24e7c8c6f4e7d0c9170b0f00cb1e6a8d923 Mon Sep 17 00:00:00 2001 From: sanctum32 Date: Mon, 2 Feb 2015 20:43:42 +0000 Subject: [PATCH] another error correction --- src/framework/Utilities/UnorderedMapSet.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/framework/Utilities/UnorderedMapSet.h b/src/framework/Utilities/UnorderedMapSet.h index a1fc77d87..e6dc84ed1 100644 --- a/src/framework/Utilities/UnorderedMapSet.h +++ b/src/framework/Utilities/UnorderedMapSet.h @@ -97,14 +97,12 @@ HASH_NAMESPACE_END using std::hash_map; using std::hash_set; #elif COMPILER == COMPILER_CLANG -# if __clang_major__ >= 3 -# if __clang_minor >= 7 -# define UNORDERED_MAP std::unordered_map -# define UNORDERED_SET std::unordered_set -# else -# define UNORDERED_MAP std::tr1::unordered_map -# define UNORDERED_SET std::tr1::unordered_set -# endif +# if __clang_major__ == 3 && __clang_minor < 7 +# define UNORDERED_MAP std::tr1::unordered_map +# define UNORDERED_SET std::tr1::unordered_set +# else +# define UNORDERED_MAP std::unordered_map +# define UNORDERED_SET std::unordered_set # endif # define HASH_NAMESPACE_START namespace std { namespace tr1 { # define HASH_NAMESPACE_END } }