Merge 01f857a into merged_master (Bitcoin PR #19428)

ElementsProject · Nov 26, 2020 · 473dea4 · 473dea4
2 parents 95afc45 + 01f857a
commit 473dea4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
@@ -331,7 +331,7 @@ class CScriptVisitor : public boost::static_visitor<CScript>
 
 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
@@ -247,7 +247,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());
  }