Skip to content

Commit 3f94a68

Browse files
authored
Sync nonstd/expected with upstream
* Used commit: `95b9cb015fa17baa749c2b396b335906e1596a9e` (Release v0.6.2) * Source: https://github.com/martinmoene/expected-lite/releases PR qbittorrent#17508.
1 parent 5c96f16 commit 3f94a68

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

src/base/3rdparty/expected.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
#define NONSTD_EXPECTED_LITE_HPP
1414

1515
#define expected_lite_MAJOR 0
16-
#define expected_lite_MINOR 5
17-
#define expected_lite_PATCH 0
16+
#define expected_lite_MINOR 6
17+
#define expected_lite_PATCH 2
1818

1919
#define expected_lite_VERSION expected_STRINGIFY(expected_lite_MAJOR) "." expected_STRINGIFY(expected_lite_MINOR) "." expected_STRINGIFY(expected_lite_PATCH)
2020

@@ -85,7 +85,7 @@
8585
# define nsel_CONFIG_NO_EXCEPTIONS_SEH ( nsel_CONFIG_NO_EXCEPTIONS && _MSC_VER )
8686
#endif
8787

88-
// C++ language version detection (C++20 is speculative):
88+
// C++ language version detection (C++23 is speculative):
8989
// Note: VC14.0/1900 (VS2015) lacks too much from C++14.
9090

9191
#ifndef nsel_CPLUSPLUS
@@ -100,7 +100,7 @@
100100
#define nsel_CPP11_OR_GREATER ( nsel_CPLUSPLUS >= 201103L )
101101
#define nsel_CPP14_OR_GREATER ( nsel_CPLUSPLUS >= 201402L )
102102
#define nsel_CPP17_OR_GREATER ( nsel_CPLUSPLUS >= 201703L )
103-
#define nsel_CPP20_OR_GREATER ( nsel_CPLUSPLUS >= 202000L )
103+
#define nsel_CPP20_OR_GREATER ( nsel_CPLUSPLUS >= 202002L )
104104
#define nsel_CPP23_OR_GREATER ( nsel_CPLUSPLUS >= 202300L )
105105

106106
// Use C++23 std::expected if available and requested:
@@ -429,7 +429,7 @@ struct conjunction<B1, Bn...> : std::conditional<bool(B1::value), conjunction<Bn
429429

430430
namespace std20 {
431431

432-
#if nsel_CPP20_OR_GREATER
432+
#if defined(__cpp_lib_remove_cvref)
433433

434434
using std::remove_cvref;
435435

0 commit comments

Comments
 (0)