From fac7bdb75e69f731b89e848c11931b4087440283 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Wed, 1 Jul 2020 17:25:35 -0400 Subject: [PATCH 1/2] script: Fix boost/C++17 compile failure script/standard.cpp:297:48: error: temporary of type 'boost::static_visitor' has protected destructor return boost::apply_visitor(CScriptVisitor{}, dest); ^ /usr/include/boost/variant/static_visitor.hpp:53:5: note: declared protected here ~static_visitor() = default; ^ 1 error generated. --- src/script/standard.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/script/standard.cpp b/src/script/standard.cpp index 251be8d27..1c4990791 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) From fa575f34614f189d5b083d7efa6925d968f4df11 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Mon, 29 Jun 2020 18:29:26 -0400 Subject: [PATCH 2/2] wallet: Replace boost::none with nullopt --- src/wallet/rpcwallet.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 00927a2e5..1db04b721 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()); }