From a068f084e0f652dad78bc6cc894ddf434478b937 Mon Sep 17 00:00:00 2001 From: Jamie Madill Date: Mon, 4 Apr 2016 14:42:21 -0400 Subject: layers: Fix MSVS noexcept warning in core_validation. warning 4577: 'noexcept' used with no exception handling mode specified --- layers/core_validation.h | 7 +++++-- 1 file 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 -- cgit v1.2.3