Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 23:50:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Define: Remove the conditional macro for constexpr.

Browse Source 
* Not needed anymore since the requirements were raised to MSVC 2015.
This commit is contained in:
Naios
2016-08-27 12:13:43 +02:00
parent 13e5817417
commit da3c03a48b
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/Define.h
View File

@@ -83,16 +83,10 @@
# define ATTR_NORETURN __attribute__((__noreturn__))
# define ATTR_PRINTF(F, V) __attribute__ ((__format__ (__printf__, F, V)))
# define ATTR_DEPRECATED __attribute__((__deprecated__))
# define TRINITY_CONSTEXPR constexpr
#else //COMPILER != COMPILER_GNU
# define ATTR_NORETURN
# define ATTR_PRINTF(F, V)
# define ATTR_DEPRECATED
#if _MSC_VER >= 1900
# define TRINITY_CONSTEXPR constexpr
#else
# define TRINITY_CONSTEXPR
#endif
#endif //COMPILER == COMPILER_GNU
#ifdef TRINITY_API_USE_DYNAMIC_LINKING

4
src/common/Utilities/Random.h
View File

@@ -67,8 +67,8 @@ class TC_COMMON_API SFMTEngine
public:
typedef uint32 result_type;
static TRINITY_CONSTEXPR result_type min() { return std::numeric_limits<result_type>::min(); }
static TRINITY_CONSTEXPR result_type max() { return std::numeric_limits<result_type>::max(); }
static constexpr result_type min() { return std::numeric_limits<result_type>::min(); }
static constexpr result_type max() { return std::numeric_limits<result_type>::max(); }
result_type operator()() const { return rand32(); }
static SFMTEngine& Instance();