diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-06-16 10:40:15 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-06-16 15:28:26 -0700 |
| commit | f5bc21d8022027da1c728fc89abb57719be46fba (patch) | |
| tree | 0c6d88d5fcbcb2a6da9d24279198a10375e3e644 | |
| parent | dbbab2a9a3ecd17342aa0fa6d51cd7a51a273e19 (diff) | |
| download | vcpkg-f5bc21d8022027da1c728fc89abb57719be46fba.tar.gz vcpkg-f5bc21d8022027da1c728fc89abb57719be46fba.zip | |
[yaml-cpp] Fix regression on non-windows
| -rw-r--r-- | ports/yaml-cpp/0001-noexcept.patch | 26 | ||||
| -rw-r--r-- | ports/yaml-cpp/CONTROL | 2 |
2 files changed, 9 insertions, 19 deletions
diff --git a/ports/yaml-cpp/0001-noexcept.patch b/ports/yaml-cpp/0001-noexcept.patch index eb208eb5e..e5e1882c0 100644 --- a/ports/yaml-cpp/0001-noexcept.patch +++ b/ports/yaml-cpp/0001-noexcept.patch @@ -2,35 +2,25 @@ 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 @@
+@@ -15,7 +15,7 @@
// 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
++#if defined(_MSC_VER) && _MSC_VER < 1900
+ #define YAML_CPP_NOEXCEPT _NOEXCEPT
+ #else
#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 @@
+@@ -2,7 +2,7 @@
// 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
++#if defined(_MSC_VER) && _MSC_VER < 1900
+ #define YAML_CPP_NOEXCEPT _NOEXCEPT
+ #else
#define YAML_CPP_NOEXCEPT noexcept
-+#else
-+ #define YAML_CPP_NOEXCEPT _NOEXCEPT
- #endif
-
- namespace YAML {
diff --git a/ports/yaml-cpp/CONTROL b/ports/yaml-cpp/CONTROL index bec9b7e13..0689f8d4e 100644 --- a/ports/yaml-cpp/CONTROL +++ b/ports/yaml-cpp/CONTROL @@ -1,3 +1,3 @@ Source: yaml-cpp -Version: 0.6.2-1 +Version: 0.6.2-2 Description: yaml-cpp is a YAML parser and emitter in C++ matching the YAML 1.2 spec. |