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/Define.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/Define.h')
| -rw-r--r-- | src/common/Define.h | 6 |
1 files changed, 0 insertions, 6 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 |