Fix Boost.Outcome breakage on MSVC in C++ 14.

ned14 · Apr 26, 2023 · 8108b6c · 8108b6c
1 parent 6ea1e79
commit 8108b6c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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 <utility>
 

diff --git 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)