Merged from develop branch as CDash reports all green

ned14 · Jul 23, 2020 · 8fa1563 · 8fa1563
2 parents 0b18835 + 76e0be4
commit 8fa1563
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 18 deletions.
diff --git a/doc/html b/doc/html
diff --git a/include/outcome/detail/revision.hpp b/include/outcome/detail/revision.hpp
@@ -22,6 +22,6 @@ Distributed under the Boost Software License, Version 1.0.
 */
 
 // Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time
-#define OUTCOME_PREVIOUS_COMMIT_REF e2c3cc65ebc514ca1dba3fa32954e9c6566e4079
-#define OUTCOME_PREVIOUS_COMMIT_DATE "2020-07-08 16:40:08 +00:00"
-#define OUTCOME_PREVIOUS_COMMIT_UNIQUE e2c3cc65
+#define OUTCOME_PREVIOUS_COMMIT_REF 1e90094ca283be2fc456f1cae4ab3eeaa65c67ec
+#define OUTCOME_PREVIOUS_COMMIT_DATE "2020-07-22 16:53:49 +00:00"
+#define OUTCOME_PREVIOUS_COMMIT_UNIQUE 1e90094c
diff --git a/include/outcome/experimental/status-code b/include/outcome/experimental/status-code
diff --git a/include/outcome/outcome.natvis b/include/outcome/outcome.natvis
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?> 
 <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010"> 
-  <Type Name="outcome_v2_e2c3cc65::basic_outcome&lt;*&gt;">
+  <Type Name="outcome_v2_1e90094c::basic_outcome&lt;*&gt;">
     <DisplayString Condition="(_state._status.status_value &amp; 0xff) == 0">empty</DisplayString>
     <DisplayString Condition="(_state._status.status_value &amp; 1) == 1">value {{{_state._value}}}</DisplayString>
     <DisplayString Condition="(_state._status.status_value &amp; 2) == 2">error {{{_error}}}</DisplayString>
@@ -15,7 +15,7 @@
       <Item Condition="(_state._status.status_value &amp; 4) == 4" Name="[exception]">_ptr</Item>
     </Expand>
   </Type>
-  <Type Name="outcome_v2_e2c3cc65::basic_result&lt;*&gt;">
+  <Type Name="outcome_v2_1e90094c::basic_result&lt;*&gt;">
     <DisplayString Condition="(_state._status.status_value &amp; 0xff) == 0">empty</DisplayString>
     <DisplayString Condition="(_state._status.status_value &amp; 1) == 1">value {{{_state._value}}}</DisplayString>
     <DisplayString Condition="(_state._status.status_value &amp; 2) == 2">error {{{_error}}}</DisplayString>

diff --git a/single-header/outcome-basic.hpp b/single-header/outcome-basic.hpp
@@ -961,9 +961,9 @@ Distributed under the Boost Software License, Version 1.0.
           http://www.boost.org/LICENSE_1_0.txt)
 */
 // Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time
-#define OUTCOME_PREVIOUS_COMMIT_REF e2c3cc65ebc514ca1dba3fa32954e9c6566e4079
-#define OUTCOME_PREVIOUS_COMMIT_DATE "2020-07-08 16:40:08 +00:00"
-#define OUTCOME_PREVIOUS_COMMIT_UNIQUE e2c3cc65
+#define OUTCOME_PREVIOUS_COMMIT_REF 1e90094ca283be2fc456f1cae4ab3eeaa65c67ec
+#define OUTCOME_PREVIOUS_COMMIT_DATE "2020-07-22 16:53:49 +00:00"
+#define OUTCOME_PREVIOUS_COMMIT_UNIQUE 1e90094c
 #define OUTCOME_V2 (QUICKCPPLIB_BIND_NAMESPACE_VERSION(outcome_v2, OUTCOME_PREVIOUS_COMMIT_UNIQUE))
 #else
 #define OUTCOME_V2 (QUICKCPPLIB_BIND_NAMESPACE_VERSION(outcome_v2))
@@ -5232,6 +5232,9 @@ SIGNATURE NOT RECOGNISED
   failure_type<error_type, exception_type> _xcode_workaround_as_failure() &&;
 #endif
 };
+// C++ 20 operator== rewriting should take care of this for us, indeed
+// if we don't disable it, we cause Concept recursion to infinity!
+#if __cplusplus < 202000
 /*! AWAITING HUGO JSON CONVERSION TOOL
 SIGNATURE NOT RECOGNISED
 */
@@ -5243,6 +5246,7 @@ noexcept(std::declval<basic_outcome<R, S, P, N>>() == std::declval<basic_result<
 {
   return b == a;
 }
+#endif
 /*! AWAITING HUGO JSON CONVERSION TOOL
 SIGNATURE NOT RECOGNISED
 */

diff --git a/single-header/outcome-experimental.hpp b/single-header/outcome-experimental.hpp
@@ -986,9 +986,9 @@ Distributed under the Boost Software License, Version 1.0.
           http://www.boost.org/LICENSE_1_0.txt)
 */
 // Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time
-#define OUTCOME_PREVIOUS_COMMIT_REF e2c3cc65ebc514ca1dba3fa32954e9c6566e4079
-#define OUTCOME_PREVIOUS_COMMIT_DATE "2020-07-08 16:40:08 +00:00"
-#define OUTCOME_PREVIOUS_COMMIT_UNIQUE e2c3cc65
+#define OUTCOME_PREVIOUS_COMMIT_REF 1e90094ca283be2fc456f1cae4ab3eeaa65c67ec
+#define OUTCOME_PREVIOUS_COMMIT_DATE "2020-07-22 16:53:49 +00:00"
+#define OUTCOME_PREVIOUS_COMMIT_UNIQUE 1e90094c
 #define OUTCOME_V2 (QUICKCPPLIB_BIND_NAMESPACE_VERSION(outcome_v2, OUTCOME_PREVIOUS_COMMIT_UNIQUE))
 #else
 #define OUTCOME_V2 (QUICKCPPLIB_BIND_NAMESPACE_VERSION(outcome_v2))
@@ -5257,6 +5257,9 @@ SIGNATURE NOT RECOGNISED
   failure_type<error_type, exception_type> _xcode_workaround_as_failure() &&;
 #endif
 };
+// C++ 20 operator== rewriting should take care of this for us, indeed
+// if we don't disable it, we cause Concept recursion to infinity!
+#if __cplusplus < 202000
 /*! AWAITING HUGO JSON CONVERSION TOOL
 SIGNATURE NOT RECOGNISED
 */
@@ -5268,6 +5271,7 @@ noexcept(std::declval<basic_outcome<R, S, P, N>>() == std::declval<basic_result<
 {
   return b == a;
 }
+#endif
 /*! AWAITING HUGO JSON CONVERSION TOOL
 SIGNATURE NOT RECOGNISED
 */
@@ -6654,12 +6658,12 @@ namespace detail
     //! Return a reference to the `value_type`.
     constexpr value_type &value() & noexcept { return this->_value; }
     //! Return a reference to the `value_type`.
-    constexpr value_type &&value() && noexcept { return this->_value; }
+    constexpr value_type &&value() && noexcept { return static_cast<value_type &&>(this->_value); }
 #endif
     //! Return a reference to the `value_type`.
     constexpr const value_type &value() const &noexcept { return this->_value; }
     //! Return a reference to the `value_type`.
-    constexpr const value_type &&value() const &&noexcept { return this->_value; }
+    constexpr const value_type &&value() const &&noexcept { return static_cast<const value_type &&>(this->_value); }
   protected:
     status_code_storage() = default;
     status_code_storage(const status_code_storage &) = default;

diff --git a/single-header/outcome.hpp b/single-header/outcome.hpp
@@ -987,9 +987,9 @@ Distributed under the Boost Software License, Version 1.0.
           http://www.boost.org/LICENSE_1_0.txt)
 */
 // Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time
-#define OUTCOME_PREVIOUS_COMMIT_REF e2c3cc65ebc514ca1dba3fa32954e9c6566e4079
-#define OUTCOME_PREVIOUS_COMMIT_DATE "2020-07-08 16:40:08 +00:00"
-#define OUTCOME_PREVIOUS_COMMIT_UNIQUE e2c3cc65
+#define OUTCOME_PREVIOUS_COMMIT_REF 1e90094ca283be2fc456f1cae4ab3eeaa65c67ec
+#define OUTCOME_PREVIOUS_COMMIT_DATE "2020-07-22 16:53:49 +00:00"
+#define OUTCOME_PREVIOUS_COMMIT_UNIQUE 1e90094c
 #define OUTCOME_V2 (QUICKCPPLIB_BIND_NAMESPACE_VERSION(outcome_v2, OUTCOME_PREVIOUS_COMMIT_UNIQUE))
 #else
 #define OUTCOME_V2 (QUICKCPPLIB_BIND_NAMESPACE_VERSION(outcome_v2))
@@ -6411,6 +6411,9 @@ SIGNATURE NOT RECOGNISED
   failure_type<error_type, exception_type> _xcode_workaround_as_failure() &&;
 #endif
 };
+// C++ 20 operator== rewriting should take care of this for us, indeed
+// if we don't disable it, we cause Concept recursion to infinity!
+#if __cplusplus < 202000
 /*! AWAITING HUGO JSON CONVERSION TOOL
 SIGNATURE NOT RECOGNISED
 */
@@ -6422,6 +6425,7 @@ noexcept(std::declval<basic_outcome<R, S, P, N>>() == std::declval<basic_result<
 {
   return b == a;
 }
+#endif
 /*! AWAITING HUGO JSON CONVERSION TOOL
 SIGNATURE NOT RECOGNISED
 */