Skip to content

Commit 01f857a

Browse files
author
MarcoFalke
committed
Merge #19428: Fix boost/C++17 compile failures
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
2 parents 85a6895 + fa575f3 commit 01f857a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/script/standard.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ class CScriptVisitor : public boost::static_visitor<CScript>
294294

295295
CScript GetScriptForDestination(const CTxDestination& dest)
296296
{
297-
return boost::apply_visitor(CScriptVisitor{}, dest);
297+
return boost::apply_visitor(CScriptVisitor(), dest);
298298
}
299299

300300
CScript GetScriptForRawPubKey(const CPubKey& pubKey)

src/wallet/rpcwallet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ static void SetFeeEstimateMode(const CWallet* pwallet, CCoinControl& cc, const U
223223
cc.m_feerate = CFeeRate(fee_rate);
224224

225225
// default RBF to true for explicit fee rate modes
226-
if (cc.m_signal_bip125_rbf == boost::none) cc.m_signal_bip125_rbf = true;
226+
if (cc.m_signal_bip125_rbf == nullopt) cc.m_signal_bip125_rbf = true;
227227
} else if (!estimate_param.isNull()) {
228228
cc.m_confirm_target = ParseConfirmTarget(estimate_param, pwallet->chain().estimateMaxBlocks());
229229
}

0 commit comments

Comments
 (0)