mirror/qBittorrent
2
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-01-06 15:04:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Sync nonstd/expected with upstream

Browse Source 
* Used commit: `95b9cb015fa17baa749c2b396b335906e1596a9e` (Release v0.6.2)
* Source: https://github.com/martinmoene/expected-lite/releases
PR #17508.
This commit is contained in:
xavier2k6 2022-08-09 04:22:45 +01:00 committed by GitHub
parent 5c96f16e3d
commit 3f94a68e62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/base/3rdparty/expected.hpp vendored
View File

@ -13,8 +13,8 @@
#define NONSTD_EXPECTED_LITE_HPP
#define expected_lite_MAJOR 0
#define expected_lite_MINOR 5
#define expected_lite_PATCH 0
#define expected_lite_MINOR 6
#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;