diff options
| author | Jamie Madill <jmadill@chromium.org> | 2016-04-04 14:42:21 -0400 |
|---|---|---|
| committer | Jamie Madill <jmadill@chromium.org> | 2016-04-04 14:46:58 -0400 |
| commit | a068f084e0f652dad78bc6cc894ddf434478b937 (patch) | |
| tree | b94a3e9840c015995aa397bffc7445f1eb894680 /layers | |
| parent | f778c5c25847a6e819902af9d60b9921bba3bd0f (diff) | |
| download | usermoji-a068f084e0f652dad78bc6cc894ddf434478b937.tar.xz | |
layers: Fix MSVS noexcept warning in core_validation.
warning 4577: 'noexcept' used with no exception handling mode specified
Diffstat (limited to 'layers')
| -rw-r--r-- | layers/core_validation.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/layers/core_validation.h b/layers/core_validation.h index 3c3450d9..88300976 100644 --- a/layers/core_validation.h +++ b/layers/core_validation.h @@ -34,9 +34,12 @@ #define HAS_NOEXCEPT #endif #else -#if defined(__GXX_EXPERIMENTAL_CXX0X__) && __GNUC__ * 10 + __GNUC_MINOR__ >= 46 || \ - defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023026 +#if defined(__GXX_EXPERIMENTAL_CXX0X__) && __GNUC__ * 10 + __GNUC_MINOR__ >= 46 #define HAS_NOEXCEPT +#else +#if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023026 && defined(_HAS_EXCEPTIONS) && _HAS_EXCEPTIONS +#define HAS_NOEXCEPT +#endif #endif #endif |