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:07:24 +0200 |
commit | b74aadca23ec644e34381643330fc78a473ff02f (patch) | |
tree | 0c92e6e0de5f34b3aa6be946359c0e808b91692f /src/common/Utilities/Random.h | |
parent | a2eb1c00669f1f3c2e4f7ab4a0cd2b3cbda5e11f (diff) |
Core/Define: Remove the conditional macro for constexpr.
* Not needed anymore since the requirements were raised to MSVC 2015.
(cherry picked from commit da3c03a48bdf0ef4add6aa1f718ca761afeaebbb)
Diffstat (limited to 'src/common/Utilities/Random.h')
-rw-r--r-- | src/common/Utilities/Random.h | 4 |
1 files changed, 2 insertions, 2 deletions
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(); |