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

[12773] Fixed clang compilation

Browse source
This commit is contained in:
sanctum32 2013-12-31 00:59:16 +02:00 • committed by Antz
parent 0df5d7fccb
commit c96c752759
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,8 +21,10 @@
#include "Platform/CompilerDefs.h" #include "Platform/CompilerDefs.h"
#include "Platform/Define.h" #include "Platform/Define.h"
#if COMPILER == COMPILER_CLANG
#if COMPILER == COMPILER_INTEL # include <tr1/unordered_map>
# include <tr1/unordered_set>
#elif COMPILER == COMPILER_INTEL
# include <ext/hash_map> # include <ext/hash_map>
# include <ext/hash_set> # include <ext/hash_set>
#elif COMPILER == COMPILER_GNU && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 3) #elif COMPILER == COMPILER_GNU && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 3)
@ -87,12 +89,17 @@ 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
# 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_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
# define HASH_NAMESPACE_START namespace std { namespace tr1 { # define HASH_NAMESPACE_START namespace std { namespace tr1 {
# define HASH_NAMESPACE_END } } # define HASH_NAMESPACE_END } }
#elif COMPILER == COMPILER_GNU && __GNUC__ >= 3 #elif COMPILER == COMPILER_GNU && __GNUC__ >= 3 && (__GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ < 3)
# define UNORDERED_MAP __gnu_cxx::hash_map # define UNORDERED_MAP __gnu_cxx::hash_map
# define UNORDERED_SET __gnu_cxx::hash_set # define UNORDERED_SET __gnu_cxx::hash_set
# define HASH_NAMESPACE_START namespace __gnu_cxx { # define HASH_NAMESPACE_START namespace __gnu_cxx {

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "12772" #define REVISION_NR "12773"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__