Skip to content

Commit

Permalink
[yaml-cpp] Fix _NOEXCEPT
Browse files Browse the repository at this point in the history
  • Loading branch information
alexkaratarakis committed Jun 15, 2018
1 parent 7ba1c76 commit 239b353
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 1 deletion.
36 changes: 36 additions & 0 deletions ports/yaml-cpp/0001-noexcept.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
diff --git a/include/yaml-cpp/exceptions.h b/include/yaml-cpp/exceptions.h
index 9c96859..a6045ee 100644
--- a/include/yaml-cpp/exceptions.h
+++ b/include/yaml-cpp/exceptions.h
@@ -15,10 +15,10 @@

// This is here for compatibility with older versions of Visual Studio
// which don't support noexcept
-#ifdef _MSC_VER
- #define YAML_CPP_NOEXCEPT _NOEXCEPT
-#else
+#if _MSC_VER >= 1900
#define YAML_CPP_NOEXCEPT noexcept
+#else
+ #define YAML_CPP_NOEXCEPT _NOEXCEPT
#endif

namespace YAML {
diff --git a/src/exceptions.cpp b/src/exceptions.cpp
index 9b6d891..931b4bc 100644
--- a/src/exceptions.cpp
+++ b/src/exceptions.cpp
@@ -2,10 +2,10 @@

// This is here for compatibility with older versions of Visual Studio
// which don't support noexcept
-#ifdef _MSC_VER
- #define YAML_CPP_NOEXCEPT _NOEXCEPT
-#else
+#if _MSC_VER >= 1900
#define YAML_CPP_NOEXCEPT noexcept
+#else
+ #define YAML_CPP_NOEXCEPT _NOEXCEPT
#endif

namespace YAML {
2 changes: 1 addition & 1 deletion ports/yaml-cpp/CONTROL
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Source: yaml-cpp
Version: 0.6.2
Version: 0.6.2-1
Description: yaml-cpp is a YAML parser and emitter in C++ matching the YAML 1.2 spec.
2 changes: 2 additions & 0 deletions ports/yaml-cpp/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ vcpkg_from_github(
REF yaml-cpp-0.6.2
SHA512 fea8ce0a20a00cbc75023d1db442edfcd32d0ac57a3c41b32ec8d56f87cc1d85d7dd7a923ce662f5d3a315f91a736d6be0d649997acd190915c1d68cc93795e4
HEAD_REF master
PATCHES
${CMAKE_CURRENT_LIST_DIR}/0001-noexcept.patch
)

vcpkg_configure_cmake(
Expand Down

0 comments on commit 239b353

Please sign in to comment.