diff options
| author | Martin Moene <martin.moene@gmail.com> | 2016-08-24 19:53:53 +0200 |
|---|---|---|
| committer | Martin Moene <martin.moene@gmail.com> | 2016-08-24 19:53:53 +0200 |
| commit | 3aea9f7201c4bcb03011b47ce296f3b4afaea7ff (patch) | |
| tree | 8c1c87899673dea7f0f76003beb429a64833df43 | |
| parent | 5112ba02f68501d2a566dcc9df480b417c060212 (diff) | |
| download | platform_external_Microsoft-GSL-3aea9f7201c4bcb03011b47ce296f3b4afaea7ff.tar.gz platform_external_Microsoft-GSL-3aea9f7201c4bcb03011b47ce296f3b4afaea7ff.tar.bz2 platform_external_Microsoft-GSL-3aea9f7201c4bcb03011b47ce296f3b4afaea7ff.zip | |
Define constexpr as /*constexpr*/ when unavailable (also noexcept)
| -rw-r--r-- | gsl/gsl | 4 | ||||
| -rw-r--r-- | gsl/gsl_byte | 4 | ||||
| -rw-r--r-- | gsl/gsl_util | 4 | ||||
| -rw-r--r-- | gsl/multi_span | 6 | ||||
| -rw-r--r-- | gsl/span | 6 | ||||
| -rw-r--r-- | gsl/string_span | 6 |
6 files changed, 15 insertions, 15 deletions
@@ -30,13 +30,13 @@ // No MSVC does constexpr fully yet #pragma push_macro("constexpr") -#define constexpr +#define constexpr /*constexpr*/ // MSVC 2013 workarounds #if _MSC_VER <= 1800 // noexcept is not understood #pragma push_macro("noexcept") -#define noexcept +#define noexcept /*noexcept*/ // turn off some misguided warnings #pragma warning(push) diff --git a/gsl/gsl_byte b/gsl/gsl_byte index cb096e7..91ce9d2 100644 --- a/gsl/gsl_byte +++ b/gsl/gsl_byte @@ -26,11 +26,11 @@ // constexpr is not understood #pragma push_macro("constexpr") -#define constexpr +#define constexpr /*constexpr*/ // noexcept is not understood #pragma push_macro("noexcept") -#define noexcept +#define noexcept /*noexcept*/ #endif // _MSC_VER <= 1800 diff --git a/gsl/gsl_util b/gsl/gsl_util index 4a0dabe..17a1edb 100644 --- a/gsl/gsl_util +++ b/gsl/gsl_util @@ -29,7 +29,7 @@ // No MSVC does constexpr fully yet #pragma push_macro("constexpr") -#define constexpr +#define constexpr /*constexpr*/ #pragma warning(push) #pragma warning(disable : 4127) // conditional expression is constant @@ -38,7 +38,7 @@ #if _MSC_VER <= 1800 // noexcept is not understood #pragma push_macro("noexcept") -#define noexcept +#define noexcept /*noexcept*/ // turn off some misguided warnings #pragma warning(push) diff --git a/gsl/multi_span b/gsl/multi_span index 5ddf6fa..0abc7c1 100644 --- a/gsl/multi_span +++ b/gsl/multi_span @@ -44,7 +44,7 @@ // No MSVC does constexpr fully yet #pragma push_macro("constexpr") -#define constexpr +#define constexpr /*constexpr*/ // VS 2013 workarounds #if _MSC_VER <= 1800 @@ -55,7 +55,7 @@ // noexcept is not understood #ifndef GSL_THROW_ON_CONTRACT_VIOLATION #pragma push_macro("noexcept") -#define noexcept /* nothing */ +#define noexcept /*noexcept*/ #endif // turn off some misguided warnings @@ -73,7 +73,7 @@ #pragma push_macro("noexcept") #endif -#define noexcept /* nothing */ +#define noexcept /*noexcept*/ #endif // GSL_THROW_ON_CONTRACT_VIOLATION @@ -44,7 +44,7 @@ // No MSVC does constexpr fully yet #pragma push_macro("constexpr") -#define constexpr +#define constexpr /*constexpr*/ // VS 2013 workarounds #if _MSC_VER <= 1800 @@ -56,7 +56,7 @@ // noexcept is not understood #ifndef GSL_THROW_ON_CONTRACT_VIOLATION #pragma push_macro("noexcept") -#define noexcept /* nothing */ +#define noexcept /*noexcept*/ #endif #pragma push_macro("alignof") @@ -77,7 +77,7 @@ #pragma push_macro("noexcept") #endif -#define noexcept /* nothing */ +#define noexcept /*noexcept*/ #endif // GSL_THROW_ON_CONTRACT_VIOLATION diff --git a/gsl/string_span b/gsl/string_span index 415744b..8e60183 100644 --- a/gsl/string_span +++ b/gsl/string_span @@ -30,7 +30,7 @@ // No MSVC does constexpr fully yet #pragma push_macro("constexpr") -#define constexpr /* nothing */ +#define constexpr /*constexpr*/ #pragma warning(push) @@ -50,7 +50,7 @@ // noexcept is not understood #ifndef GSL_THROW_ON_CONTRACT_VIOLATION #pragma push_macro("noexcept") -#define noexcept /* nothing */ +#define noexcept /*noexcept*/ #endif #endif // _MSC_VER <= 1800 @@ -67,7 +67,7 @@ #pragma push_macro("noexcept") #endif -#define noexcept /* nothing */ +#define noexcept /*noexcept*/ #endif // GSL_THROW_ON_CONTRACT_VIOLATION |