LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Prefer boost::optional#get_value_or over #value_or

Browse source 
The latter is not defined in the earliest supported version of boost,
1.47.
https://www.boost.org/doc/libs/1_47_0/libs/optional/doc/html/boost_optional/detailed_semantics.html
https://travis-ci.org/bitcoin/bitcoin/jobs/486674823
This commit is contained in:
Ben Woosley 2019-01-31 10:46:23 -08:00
parent 1971f5ba04
commit 267eac00f9
No known key found for this signature in database
GPG key ID: 6EE5F3785F78B345
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/interfaces/wallet.cpp
View file

@ -353,7 +353,7 @@ public:
LOCK(m_wallet.cs_wallet); LOCK(m_wallet.cs_wallet);
auto mi = m_wallet.mapWallet.find(txid); auto mi = m_wallet.mapWallet.find(txid);
if (mi != m_wallet.mapWallet.end()) { if (mi != m_wallet.mapWallet.end()) {
num_blocks = locked_chain->getHeight().value_or(-1); num_blocks = locked_chain->getHeight().get_value_or(-1);
in_mempool = mi->second.InMempool(); in_mempool = mi->second.InMempool();
order_form = mi->second.vOrderForm; order_form = mi->second.vOrderForm;
tx_status = MakeWalletTxStatus(*locked_chain, mi->second); tx_status = MakeWalletTxStatus(*locked_chain, mi->second);
@ -384,7 +384,7 @@ public:
return false; return false;
} }
balances = getBalances(); balances = getBalances();
num_blocks = locked_chain->getHeight().value_or(-1); num_blocks = locked_chain->getHeight().get_value_or(-1);
return true; return true;
} }
CAmount getBalance() override { return m_wallet.GetBalance(); } CAmount getBalance() override { return m_wallet.GetBalance(); }

2
src/wallet/rpcdump.cpp
View file

@ -785,7 +785,7 @@ UniValue dumpwallet(const JSONRPCRequest& request)
file << strprintf("# Wallet dump created by Bitcoin %s\n", CLIENT_BUILD); file << strprintf("# Wallet dump created by Bitcoin %s\n", CLIENT_BUILD);
file << strprintf("# * Created on %s\n", FormatISO8601DateTime(GetTime())); file << strprintf("# * Created on %s\n", FormatISO8601DateTime(GetTime()));
const Optional<int> tip_height = locked_chain->getHeight(); const Optional<int> tip_height = locked_chain->getHeight();
file << strprintf("# * Best block at time of backup was %i (%s),\n", tip_height.value_or(-1), tip_height ? locked_chain->getBlockHash(*tip_height).ToString() : "(missing block hash)"); file << strprintf("# * Best block at time of backup was %i (%s),\n", tip_height.get_value_or(-1), tip_height ? locked_chain->getBlockHash(*tip_height).ToString() : "(missing block hash)");
file << strprintf("# mined on %s\n", tip_height ? FormatISO8601DateTime(locked_chain->getBlockTime(*tip_height)) : "(missing block time)"); file << strprintf("# mined on %s\n", tip_height ? FormatISO8601DateTime(locked_chain->getBlockTime(*tip_height)) : "(missing block time)");
file << "\n"; file << "\n";

6
src/wallet/wallet.cpp
View file

@ -1717,10 +1717,10 @@ CWallet::ScanResult CWallet::ScanForWalletTransactions(const uint256& start_bloc
} }
ShowProgress(strprintf("%s " + _("Rescanning..."), GetDisplayName()), 100); // hide progress dialog in GUI ShowProgress(strprintf("%s " + _("Rescanning..."), GetDisplayName()), 100); // hide progress dialog in GUI
if (block_height && fAbortRescan) { if (block_height && fAbortRescan) {
WalletLogPrintf("Rescan aborted at block %d. Progress=%f\n", block_height.value_or(0), progress_current); WalletLogPrintf("Rescan aborted at block %d. Progress=%f\n", block_height.get_value_or(0), progress_current);
result.status = ScanResult::USER_ABORT; result.status = ScanResult::USER_ABORT;
} else if (block_height && ShutdownRequested()) { } else if (block_height && ShutdownRequested()) {
WalletLogPrintf("Rescan interrupted by shutdown request at block %d. Progress=%f\n", block_height.value_or(0), progress_current); WalletLogPrintf("Rescan interrupted by shutdown request at block %d. Progress=%f\n", block_height.get_value_or(0), progress_current);
result.status = ScanResult::USER_ABORT; result.status = ScanResult::USER_ABORT;
} }
} }
@ -2581,7 +2581,7 @@ static bool IsCurrentForAntiFeeSniping(interfaces::Chain::Lock& locked_chain)
*/ */
static uint32_t GetLocktimeForNewTransaction(interfaces::Chain::Lock& locked_chain) static uint32_t GetLocktimeForNewTransaction(interfaces::Chain::Lock& locked_chain)
{ {
uint32_t const height = locked_chain.getHeight().value_or(-1); uint32_t const height = locked_chain.getHeight().get_value_or(-1);
uint32_t locktime; uint32_t locktime;
// Discourage fee sniping. // Discourage fee sniping.
// //