diff options
| author | Henrik Edin <henrik.edin@mongodb.com> | 2018-11-14 14:30:19 -0500 |
|---|---|---|
| committer | Mathew Robinson <chasinglogic@gmail.com> | 2019-06-07 14:14:20 -0400 |
| commit | 12183cd80bbda93a9e94c803e182a649abaa360c (patch) | |
| tree | eb2a0e19beea5e578c9df0b0dfcdecb975f4ec11 | |
| parent | 67c0cd7a5194c06e0a08ffbef6afdb93200532c3 (diff) | |
| download | mongo-12183cd80bbda93a9e94c803e182a649abaa360c.tar.gz | |
SERVER-38098 Fix yaml-cpp compilation with Visual Studio 2017.
cherry picked from commit 0f9a586ca1dc29c2ecb8dd715a315b93e3f40f79
https://github.com/jbeder/yaml-cpp/commit/0f9a586ca1dc29c2ecb8dd715a315b93e3f40f79
(cherry picked from commit 866d4ba84171d7cc88876e2d0d8ae4eeb04ff019)
| -rw-r--r-- | src/third_party/yaml-cpp-0.6.2/include/yaml-cpp/exceptions.h | 2 | ||||
| -rw-r--r-- | src/third_party/yaml-cpp-0.6.2/src/exceptions.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/third_party/yaml-cpp-0.6.2/include/yaml-cpp/exceptions.h b/src/third_party/yaml-cpp-0.6.2/include/yaml-cpp/exceptions.h index 9c96859b2c9..87b92f5e946 100644 --- a/src/third_party/yaml-cpp-0.6.2/include/yaml-cpp/exceptions.h +++ b/src/third_party/yaml-cpp-0.6.2/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 diff --git a/src/third_party/yaml-cpp-0.6.2/src/exceptions.cpp b/src/third_party/yaml-cpp-0.6.2/src/exceptions.cpp index 9b6d8912c18..841549e0dfb 100644 --- a/src/third_party/yaml-cpp-0.6.2/src/exceptions.cpp +++ b/src/third_party/yaml-cpp-0.6.2/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 |