Core/Define: Remove the conditional macro for constexpr.

* Not needed anymore since the requirements were raised to MSVC 2015.

(cherry picked from commit da3c03a48bdf0ef4add6aa1f718ca761afeaebbb)

2 files changed, 2 insertions, 8 deletions

diff --git a/src/common/Define.h b/src/common/Define.h
index 784bb4dd8ca..d3e33f50099 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();