Skip to content

Commit

Permalink
Merge #19428: Fix boost/C++17 compile failures
Browse files Browse the repository at this point in the history
fa575f3 wallet: Replace boost::none with nullopt (MarcoFalke)
fac7bdb 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 fa575f3

Tree-SHA512: 028e0f0a96c68f6e3394263dd720f0288fff6584592fdf9a7d9551b8358ee64f64b7c5cb802cc866eaa435e0247b66a5a5e54bfdc61a7c9769f287cfd3509966
  • Loading branch information
MarcoFalke committed Jul 1, 2020
2 parents 85a6895 + fa575f3 commit 01f857a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/script/standard.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,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)
Expand Down
2 changes: 1 addition & 1 deletion src/wallet/rpcwallet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand Down

0 comments on commit 01f857a

Please sign in to comment.