diff options
| author | fanquake <fanquake@gmail.com> | 2022-07-13 16:03:35 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-07-13 16:18:44 +0100 |
| commit | c30b3e90f00b65d16e9abb8d4430e46ca1d2e4d4 (patch) | |
| tree | 0b7d05eb94ef42f93848c5c096da2f437643486f /src/init.cpp | |
| parent | 081965ccc3f516ffbccf912149b901aab67daa9d (diff) | |
| parent | 630c1711b47ce50805f4dd2883777a100f7e5339 (diff) | |
| download | bitcoin-c30b3e90f00b65d16e9abb8d4430e46ca1d2e4d4.tar.xz | |
Merge bitcoin/bitcoin#25472: build: Increase MS Visual Studio minimum version
630c1711b47ce50805f4dd2883777a100f7e5339 refactor: Drop no longer needed `util/designator.h` (Hennadii Stepanov)
88ec5d40dcf5d9f95217b123b48203b2f334c0a1 build: Increase MS Visual Studio minimum version (Hennadii Stepanov)
555f9dd5d39b316bf404017401b5aedc23ec6226 rpc, refactor: Add `decodepsbt_outputs` (Hennadii Stepanov)
0c432cbbfa9e83a68e061b388745326e278369fb rpc, refactor: Add `decodepsbt_inputs` (Hennadii Stepanov)
01d95a3964267d243df00d9bcc93b28adcfe16d7 rpc, refactor: Add `getblock_prevout` (Hennadii Stepanov)
Pull request description:
Visual Studio 2022 with `/std:c++20` supports [designated initializers](https://github.com/bitcoin/bitcoin/pull/24531).
ACKs for top commit:
sipsorcery:
reACK 630c1711b47ce50805f4dd2883777a100f7e5339.
Tree-SHA512: 5b8933940dd69061c6b077512168bebb6fea05d429b63ffbab191950798b4c825e8484b1a651db0ae13f97eae481097d3c16395659c0f3b9f847af2aaf44b65d
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/init.cpp b/src/init.cpp index eff37e1a83..816404a84f 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -64,7 +64,6 @@ #include <txorphanage.h> #include <util/asmap.h> #include <util/check.h> -#include <util/designator.h> #include <util/moneystr.h> #include <util/strencodings.h> #include <util/string.h> @@ -1425,8 +1424,8 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info) assert(!node.chainman); CTxMemPool::Options mempool_opts{ - Desig(estimator) node.fee_estimator.get(), - Desig(check_ratio) chainparams.DefaultConsistencyChecks() ? 1 : 0, + .estimator = node.fee_estimator.get(), + .check_ratio = chainparams.DefaultConsistencyChecks() ? 1 : 0, }; ApplyArgsManOptions(args, mempool_opts); mempool_opts.check_ratio = std::clamp<int>(mempool_opts.check_ratio, 0, 1'000'000); |