highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-07 11:39:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge #19428: Fix boost/C++17 compile failures

Browse Source 
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
This commit is contained in:
MarcoFalke 2020-07-01 19:25:02 -04:00
commit 01f857a1c9
No known key found for this signature in database
GPG Key ID: CE2B75697E69A548
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/script/standard.cpp
View File

@ -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)

2
src/wallet/rpcwallet.cpp
View File

@ -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());
}