mirror of
https://github.com/mangosfour/server.git
synced 2025-12-12 10:37:03 +00:00
[12777] Updated clang compiler definitions usage
removed few msvc disabled warnings rules
This commit is contained in:
parent
79141ea6a1
commit
0e0edcd9bb
2 changed files with 2 additions and 8 deletions
|
|
@ -52,19 +52,13 @@
|
||||||
# define COMPILER COMPILER_INTEL
|
# define COMPILER COMPILER_INTEL
|
||||||
#elif defined(__clang__)
|
#elif defined(__clang__)
|
||||||
# define COMPILER COMPILER_CLANG
|
# define COMPILER COMPILER_CLANG
|
||||||
# pragma error "FATAL ERROR: clang used"
|
|
||||||
#elif defined( __GNUC__ ) && !defined(__clang__)
|
#elif defined( __GNUC__ ) && !defined(__clang__)
|
||||||
# define COMPILER COMPILER_GNU
|
# define COMPILER COMPILER_GNU
|
||||||
#else
|
#else
|
||||||
# pragma error "FATAL ERROR: Unknown compiler."
|
# pragma error "FATAL ERROR: Unknown compiler."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if COMPILER == COMPILER_MICROSOFT
|
#if COMPILER == COMPILER_CLANG
|
||||||
# pragma warning( disable : 4267 ) // conversion from 'size_t' to 'int', possible loss of data
|
|
||||||
# pragma warning( disable : 4786 ) // identifier was truncated to '255' characters in the debug information
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined( __clang__)
|
|
||||||
#define COMPILE_ASSERT(exp, name) _Static_assert((exp), #name)
|
#define COMPILE_ASSERT(exp, name) _Static_assert((exp), #name)
|
||||||
#else
|
#else
|
||||||
#define COMPILE_ASSERT(exp, name) static_assert((exp), #name)
|
#define COMPILE_ASSERT(exp, name) static_assert((exp), #name)
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "12776"
|
#define REVISION_NR "12777"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue