Fix _NOEXCEPT not available in VS2017 15.8. Use noexcept for VS2015+ (#597)

0f9a586c · Alexander Karatarakis · Jesse Beder · 4fb1c4b9 · 0f9a586c · 0f9a586c
Commit 0f9a586c authored Jun 30, 2018 by Alexander Karatarakis Committed by Jesse Beder Jun 30, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

include/yaml-cpp/exceptions.h
+1 -1

src/exceptions.cpp
+1 -1

No files found.
--- a/include/yaml-cpp/exceptions.h
+++ b/include/yaml-cpp/exceptions.h
@@ -15,7 +15,7 @@

 // This is here for compatibility with older versions of Visual Studio
 // which don't support noexcept
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
    #define YAML_CPP_NOEXCEPT _NOEXCEPT
 #else
    #define YAML_CPP_NOEXCEPT noexcept

--- a/src/exceptions.cpp
+++ b/src/exceptions.cpp
@@ -2,7 +2,7 @@

 // This is here for compatibility with older versions of Visual Studio
 // which don't support noexcept
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
    #define YAML_CPP_NOEXCEPT _NOEXCEPT
 #else
    #define YAML_CPP_NOEXCEPT noexcept