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

[12774] more clang fixes

Browse source
This commit is contained in:
sanctum32 2013-12-31 01:27:30 +02:00 • committed by Antz
parent c96c752759
commit 3f914fc7a2
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/framework/Platform/Define.h
View file

@ -97,7 +97,7 @@ typedef ACE_SHLIB_HANDLE MANGOS_LIBRARY_HANDLE;
# define MANGOS_INLINE # define MANGOS_INLINE
#endif //!DEBUG #endif //!DEBUG
#if COMPILER == COMPILER_GNU #if COMPILER == COMPILER_GNU || COMPILER == COMPILER_CLANG
# define ATTR_NORETURN __attribute__((noreturn)) # define ATTR_NORETURN __attribute__((noreturn))
# define ATTR_PRINTF(F,V) __attribute__ ((format (printf, F, V))) # define ATTR_PRINTF(F,V) __attribute__ ((format (printf, F, V)))
#else // COMPILER != COMPILER_GNU #else // COMPILER != COMPILER_GNU

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

@ -21,6 +21,7 @@
#include "Platform/CompilerDefs.h" #include "Platform/CompilerDefs.h"
#include "Platform/Define.h" #include "Platform/Define.h"
#if COMPILER == COMPILER_CLANG #if COMPILER == COMPILER_CLANG
# include <tr1/unordered_map> # include <tr1/unordered_map>
# include <tr1/unordered_set> # include <tr1/unordered_set>
@ -30,7 +31,7 @@
#elif COMPILER == COMPILER_GNU && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 3) #elif COMPILER == COMPILER_GNU && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 3)
# include <tr1/unordered_map> # include <tr1/unordered_map>
# include <tr1/unordered_set> # include <tr1/unordered_set>
#elif COMPILER == COMPILER_GNU && __GNUC__ >= 3 #elif COMPILER == COMPILER_GNU && __GNUC__ >= 3 && (__GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ < 3)
# include <ext/hash_map> # include <ext/hash_map>
# include <ext/hash_set> # include <ext/hash_set>
#elif COMPILER == COMPILER_MICROSOFT && (_MSC_VER > 1500 || _MSC_VER == 1500 && _HAS_TR1) // VC9.0 SP1 and later #elif COMPILER == COMPILER_MICROSOFT && (_MSC_VER > 1500 || _MSC_VER == 1500 && _HAS_TR1) // VC9.0 SP1 and later

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 "12773" #define REVISION_NR "12774"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__