diff options
| author | Ben Woosley <ben.woosley@gmail.com> | 2019-01-31 10:46:23 -0800 |
|---|---|---|
| committer | Ben Woosley <ben.woosley@gmail.com> | 2019-01-31 22:10:55 -0800 |
| commit | 267eac00f968850c859474434570ac8e1fce29f5 (patch) | |
| tree | f475976fb2608b46a372e6e5b71e0cf9edc17c9c /src/interfaces | |
| parent | 1971f5ba04de9ac1e1a95d9f727e7bd4bc35dc88 (diff) | |
| download | bitcoin-267eac00f968850c859474434570ac8e1fce29f5.tar.xz | |
Prefer boost::optional#get_value_or over #value_or
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
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/wallet.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp index 62ede0a95a..a2cae2a7a7 100644 --- a/src/interfaces/wallet.cpp +++ b/src/interfaces/wallet.cpp @@ -353,7 +353,7 @@ public: LOCK(m_wallet.cs_wallet); auto mi = m_wallet.mapWallet.find(txid); 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(); order_form = mi->second.vOrderForm; tx_status = MakeWalletTxStatus(*locked_chain, mi->second); @@ -384,7 +384,7 @@ public: return false; } balances = getBalances(); - num_blocks = locked_chain->getHeight().value_or(-1); + num_blocks = locked_chain->getHeight().get_value_or(-1); return true; } CAmount getBalance() override { return m_wallet.GetBalance(); } |