diff options
| author | Naios <naios-dev@live.de> | 2016-08-27 12:13:43 +0200 |
|---|---|---|
| committer | Naios <naios-dev@live.de> | 2016-08-29 22:03:48 +0200 |
| commit | da3c03a48bdf0ef4add6aa1f718ca761afeaebbb (patch) | |
| tree | 5a976f749c739683068199e3356f89df125b08fd /src | |
| parent | 13e5817417f48374ff460c5ccdc5f149a1ae8791 (diff) | |
Core/Define: Remove the conditional macro for constexpr.
* Not needed anymore since the requirements were raised to MSVC 2015.
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/Define.h | 6 | ||||
| -rw-r--r-- | src/common/Utilities/Random.h | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/common/Define.h b/src/common/Define.h index d03d26ad780..c5b1cfcd095 100644 --- a/src/common/Define.h +++ b/src/common/Define.h @@ -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 diff --git a/src/common/Utilities/Random.h b/src/common/Utilities/Random.h index d7269928dfe..cf3c1602adf 100644 --- a/src/common/Utilities/Random.h +++ b/src/common/Utilities/Random.h @@ -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(); |