diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-07-01 19:25:02 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-07-01 19:25:07 -0400 |
| commit | 01f857a1c9b5a6a684c7e0fb8da16a4402a7ec04 (patch) | |
| tree | 59f571b00642128784487aa33a50d652628a3532 | |
| parent | 85a68952f86dea04c797a7c060f25cc7e626a47e (diff) | |
| parent | fa575f34614f189d5b083d7efa6925d968f4df11 (diff) | |
Merge #19428: Fix boost/C++17 compile failures
fa575f34614f189d5b083d7efa6925d968f4df11 wallet: Replace boost::none with nullopt (MarcoFalke)
fac7bdb75e69f731b89e848c11931b4087440283 script: Fix boost/C++17 compile failure (MarcoFalke)
Pull request description:
Compiling with C++17 enabled, but not the latest version of boost (e.g. 1.69) will result in a compile failure. I know that C++17 is not "officially" supported yet, especially not with all boost versions, since C++17 is meant to replace boost, but some of my systems can no longer compile Bitcoin Core and upstreaming the patches avoids others running into the same issue.
ACKs for top commit:
sipa:
utACK fa575f34614f189d5b083d7efa6925d968f4df11
Tree-SHA512: 028e0f0a96c68f6e3394263dd720f0288fff6584592fdf9a7d9551b8358ee64f64b7c5cb802cc866eaa435e0247b66a5a5e54bfdc61a7c9769f287cfd3509966
| -rw-r--r-- | src/script/standard.cpp | 2 | ||||
| -rw-r--r-- | src/wallet/rpcwallet.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/script/standard.cpp b/src/script/standard.cpp index 251be8d271..1c4990791c 100644 --- a/src/script/standard.cpp +++ b/src/script/standard.cpp @@ -294,7 +294,7 @@ public: CScript GetScriptForDestination(const CTxDestination& dest) { - return boost::apply_visitor(CScriptVisitor{}, dest); + return boost::apply_visitor(CScriptVisitor(), dest); } CScript GetScriptForRawPubKey(const CPubKey& pubKey) diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 00927a2e55..1db04b721a 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -223,7 +223,7 @@ static void SetFeeEstimateMode(const CWallet* pwallet, CCoinControl& cc, const U cc.m_feerate = CFeeRate(fee_rate); // default RBF to true for explicit fee rate modes - if (cc.m_signal_bip125_rbf == boost::none) cc.m_signal_bip125_rbf = true; + if (cc.m_signal_bip125_rbf == nullopt) cc.m_signal_bip125_rbf = true; } else if (!estimate_param.isNull()) { cc.m_confirm_target = ParseConfirmTarget(estimate_param, pwallet->chain().estimateMaxBlocks()); } |