mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-12 10:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

finally fixed clangs...

Browse source
This commit is contained in:
sanctum32 2015-02-02 21:09:50 +00:00 • committed by Antz
parent 46c8c24e7c
commit 3122f1fcf3
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/framework/Utilities/UnorderedMapSet.h
View file

@ -96,17 +96,16 @@ HASH_NAMESPACE_END
# define HASH_NAMESPACE_END } # define HASH_NAMESPACE_END }
using std::hash_map; using std::hash_map;
using std::hash_set; using std::hash_set;
#elif COMPILER == COMPILER_CLANG #elif COMPILER == COMPILER_CLANG && __clang_major__ =< 3 && __clang_minor < 7
# if __clang_major__ == 3 && __clang_minor < 7 # define UNORDERED_MAP std::tr1::unordered_map
# define UNORDERED_MAP std::tr1::unordered_map # define UNORDERED_SET std::tr1::unordered_set
# define UNORDERED_SET std::tr1::unordered_set # define HASH_NAMESPACE_START namespace std { namespace tr1 {
# else # define HASH_NAMESPACE_END } }
# define UNORDERED_MAP std::unordered_map #elif COMPILER == COMPILER_CLANG && (__clang_major__ > 3 || __clang_major__ == 3 && __clang_minor >= 7)
# define UNORDERED_SET std::unordered_set # define UNORDERED_MAP std::unordered_map
# endif # define UNORDERED_SET std::unordered_set
# define HASH_NAMESPACE_START namespace std { namespace tr1 { # define HASH_NAMESPACE_START namespace std { namespace tr1 {
# define HASH_NAMESPACE_END } } # define HASH_NAMESPACE_END } }
# endif
#elif COMPILER == COMPILER_GNU && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 3) #elif COMPILER == COMPILER_GNU && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 3)
# define UNORDERED_MAP std::tr1::unordered_map # define UNORDERED_MAP std::tr1::unordered_map
# define UNORDERED_SET std::tr1::unordered_set # define UNORDERED_SET std::tr1::unordered_set