From: Joel Rosdahl <joel@rosdahl.net>
Date: Sun, 7 Aug 2022 12:35:39 +0000 (+0200)
Subject: bump: Upgrade to nonstd::expected 0.6.2
X-Git-Tag: v4.7~117
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0be4d5fd90e64e960dca36b94a7481cf4f55be7;p=thirdparty%2Fccache.git

bump: Upgrade to nonstd::expected 0.6.2
---

diff --git a/LICENSE.adoc b/LICENSE.adoc
index 3f536b119..7c2fd946e 100644
--- a/LICENSE.adoc
+++ b/LICENSE.adoc
@@ -577,7 +577,7 @@ SOFTWARE.
 === src/third_party/nonstd/expected.hpp
 
 This is the single header version of
-https://github.com/martinmoene/expected-lite[expected-lite] 0.6.1 with the
+https://github.com/martinmoene/expected-lite[expected-lite] 0.6.2 with the
 following license:
 
 ----
diff --git a/src/third_party/nonstd/expected.hpp b/src/third_party/nonstd/expected.hpp
index b1bd37c0d..f2b7f9402 100644
--- a/src/third_party/nonstd/expected.hpp
+++ b/src/third_party/nonstd/expected.hpp
@@ -14,7 +14,7 @@
 
 #define expected_lite_MAJOR  0
 #define expected_lite_MINOR  6
-#define expected_lite_PATCH  1
+#define expected_lite_PATCH  2
 
 #define expected_lite_VERSION  expected_STRINGIFY(expected_lite_MAJOR) "." expected_STRINGIFY(expected_lite_MINOR) "." expected_STRINGIFY(expected_lite_PATCH)
 
@@ -85,7 +85,7 @@
 # define nsel_CONFIG_NO_EXCEPTIONS_SEH  ( nsel_CONFIG_NO_EXCEPTIONS && _MSC_VER )
 #endif
 
-// C++ language version detection (C++20 is speculative):
+// C++ language version detection (C++23 is speculative):
 // Note: VC14.0/1900 (VS2015) lacks too much from C++14.
 
 #ifndef   nsel_CPLUSPLUS
@@ -100,7 +100,7 @@
 #define nsel_CPP11_OR_GREATER  ( nsel_CPLUSPLUS >= 201103L )
 #define nsel_CPP14_OR_GREATER  ( nsel_CPLUSPLUS >= 201402L )
 #define nsel_CPP17_OR_GREATER  ( nsel_CPLUSPLUS >= 201703L )
-#define nsel_CPP20_OR_GREATER  ( nsel_CPLUSPLUS >= 202000L )
+#define nsel_CPP20_OR_GREATER  ( nsel_CPLUSPLUS >= 202002L )
 #define nsel_CPP23_OR_GREATER  ( nsel_CPLUSPLUS >= 202300L )
 
 // Use C++23 std::expected if available and requested:
@@ -429,7 +429,7 @@ struct conjunction<B1, Bn...> : std::conditional<bool(B1::value), conjunction<Bn
 
 namespace std20 {
 
-#if nsel_CPP20_OR_GREATER
+#if defined(__cpp_lib_remove_cvref)
 
 using std::remove_cvref;