Try to work around stupid clang-cl parse bug.

ned14 · Apr 26, 2023 · a74e523 · a74e523
1 parent 41e98a3
commit a74e523
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/include/outcome/basic_outcome.hpp b/include/outcome/basic_outcome.hpp
@@ -989,14 +989,14 @@ SIGNATURE NOT RECOGNISED
       bool all_good{false};
       ~_()
       {
-        if(!all_good)
+        if(!this->all_good)
         {
           // We lost one of the values
           a._state._status.set_have_lost_consistency(true);
           b._state._status.set_have_lost_consistency(true);
           return;
         }
-        if(exceptioned)
+        if(this->exceptioned)
         {
           // The value + error swap threw an exception. Try to swap back _ptr
           try

diff --git a/test/tests/issue0059.cpp b/test/tests/issue0059.cpp
@@ -27,7 +27,7 @@ Distributed under the Boost Software License, Version 1.0.
 
 BOOST_OUTCOME_AUTO_TEST_CASE(issues / 0059 / test, "result<NonMovable> supported?")
 {
-#if defined(_MSC_VER) || __cplusplus >= 201700
+#if (defined(_MSC_VER) && !defined(__clang__)) || __cplusplus >= 201700
   using namespace OUTCOME_V2_NAMESPACE;
   struct udt
   {