From 8108b6cbf8397af553ea81872b5e27183e17552a Mon Sep 17 00:00:00 2001 From: "Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com)" Date: Wed, 26 Apr 2023 10:03:59 +0100 Subject: [PATCH] Fix Boost.Outcome breakage on MSVC in C++ 14. --- test/expected-pass.cpp | 2 +- test/tests/hooks.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/test/expected-pass.cpp b/test/expected-pass.cpp index 1b8bac88e2b..0ae627f23b5 100644 --- a/test/expected-pass.cpp +++ b/test/expected-pass.cpp @@ -16,7 +16,7 @@ // incorrect, but because the reference test suite is testing an Expected quite far away from // the latest WG21 proposal paper, and we're implementing that latest edition. -#if !defined(__GNUC__) || defined(__clang__) || __GNUC__ >= 7 +#if defined(__clang__) || __GNUC__ >= 7 || !defined(BOOST_MSVC) || (BOOST_MSVC > 0 && _HAS_CXX17) #include diff --git a/test/tests/hooks.cpp b/test/tests/hooks.cpp index 02af6648914..79616f78ff6 100644 --- a/test/tests/hooks.cpp +++ b/test/tests/hooks.cpp @@ -38,7 +38,6 @@ namespace hook_test // Use the error_code type as the ADL bridge for the hooks by creating a type here struct error_code : public std::error_code { - using std::error_code::error_code; error_code() = default; error_code(std::error_code ec) // NOLINT : std::error_code(ec)