From 3122f1fcf3e7812db804f205ba45a5b713053d25 Mon Sep 17 00:00:00 2001 From: sanctum32 Date: Mon, 2 Feb 2015 21:09:50 +0000 Subject: [PATCH] finally fixed clangs... --- src/framework/Utilities/UnorderedMapSet.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/framework/Utilities/UnorderedMapSet.h b/src/framework/Utilities/UnorderedMapSet.h index e6dc84ed1..43fecea53 100644 --- a/src/framework/Utilities/UnorderedMapSet.h +++ b/src/framework/Utilities/UnorderedMapSet.h @@ -96,17 +96,16 @@ HASH_NAMESPACE_END # define HASH_NAMESPACE_END } using std::hash_map; using std::hash_set; -#elif COMPILER == COMPILER_CLANG -# 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 +#elif COMPILER == COMPILER_CLANG && __clang_major__ =< 3 && __clang_minor < 7 +# 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_CLANG && (__clang_major__ > 3 || __clang_major__ == 3 && __clang_minor >= 7) +# define UNORDERED_MAP std::unordered_map +# define UNORDERED_SET std::unordered_set # define HASH_NAMESPACE_START namespace std { namespace tr1 { # define HASH_NAMESPACE_END } } -# endif #elif COMPILER == COMPILER_GNU && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 3) # define UNORDERED_MAP std::tr1::unordered_map # define UNORDERED_SET std::tr1::unordered_set