mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 18:31:15 +08:00
[yaml-cpp] Fix regression on non-windows
This commit is contained in:
parent
dbbab2a9a3
commit
f5bc21d802
@ -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 {
|
||||
|
@ -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.
|
||||
|
Loading…
x
Reference in New Issue
Block a user