From: Joel Rosdahl <joel@rosdahl.net>
Date: Fri, 27 May 2022 17:54:10 +0000 (+0200)
Subject: bump: Upgrade to nonstd::expected 0.6.0
X-Git-Tag: v4.7~217
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=98a370b85ce7af6c870d5ad22b6ee09fb09d43ac;p=thirdparty%2Fccache.git

bump: Upgrade to nonstd::expected 0.6.0
---

diff --git a/LICENSE.adoc b/LICENSE.adoc
index 3f33b7207..2413c98e9 100644
--- a/LICENSE.adoc
+++ b/LICENSE.adoc
@@ -577,8 +577,8 @@ SOFTWARE.
 === src/third_party/nonstd/expected.hpp
 
 This is the single header version of
-https://github.com/martinmoene/expected-lite[expected-lite] revision
-3abf06821d489d56aa9c60eccf8aab70d67d158b with the following license:
+https://github.com/martinmoene/expected-lite[expected-lite] 0.6.0 with the
+following license:
 
 ----
 Copyright (c) 2016-2020 Martin Moene
diff --git a/src/third_party/nonstd/expected.hpp b/src/third_party/nonstd/expected.hpp
index 2bd18344a..45b6f5e00 100644
--- a/src/third_party/nonstd/expected.hpp
+++ b/src/third_party/nonstd/expected.hpp
@@ -101,10 +101,11 @@
 #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_CPP23_OR_GREATER  ( nsel_CPLUSPLUS >= 202300L )
 
-// Use C++20 std::expected if available and requested:
+// Use C++23 std::expected if available and requested:
 
-#if nsel_CPP20_OR_GREATER && defined(__has_include )
+#if nsel_CPP23_OR_GREATER && defined(__has_include )
 # if __has_include( <expected> )
 #  define nsel_HAVE_STD_EXPECTED  1
 # else