Merge #21498: refactor: return std::nullopt instead of {}

5294f0d5a9 refactor: return std::nullopt instead of {} (fanquake)

Pull request description:

  In #21415 [we decided](https://github.com/bitcoin/bitcoin/pull/21415#issuecomment-800236640) to return `std::optional` rather than `{}` for
  uninitialized values. This PR replaces the two remaining usages of `{}`
  with `std::nullopt`.

  As a side-effect, this also quells the spurious GCC 10.2.x warning that
  we've had reported quite a few times. i.e #21318, #21248, #20797.

  ```bash
  txmempool.cpp: In member function ‘CTxMemPool::setEntries CTxMemPool::GetIterSet(const std::set<uint256>&) const’:
  txmempool.cpp:898:13: warning: ‘<anonymous>’ may be used uninitialized in this function [-Wmaybe-uninitialized]
    898 |     return {};
        |             ^
  ```

ACKs for top commit:
  hebasto:
    ACK 5294f0d5a9, I have reviewed the code and it looks OK, I agree it can be merged.

Tree-SHA512: 5b776be79ab26e5a3a5fc2b463b394ea5ce6797ed5558424873fa4ecee2898170eff76d6da9d69394d28f8f98974117fc63b922a3e19c52f5294c83073e79bb0
pull/826/head
MarcoFalke 4 years ago
commit 786654aa5e
No known key found for this signature in database
GPG Key ID: D2EA4850E7528B25

@ -895,7 +895,7 @@ std::optional<CTxMemPool::txiter> CTxMemPool::GetIter(const uint256& txid) const
{ {
auto it = mapTx.find(txid); auto it = mapTx.find(txid);
if (it != mapTx.end()) return it; if (it != mapTx.end()) return it;
return {}; return std::nullopt;
} }
CTxMemPool::setEntries CTxMemPool::GetIterSet(const std::set<uint256>& hashes) const CTxMemPool::setEntries CTxMemPool::GetIterSet(const std::set<uint256>& hashes) const

@ -5186,7 +5186,7 @@ std::optional<uint256> ChainstateManager::SnapshotBlockhash() const {
// If a snapshot chainstate exists, it will always be our active. // If a snapshot chainstate exists, it will always be our active.
return m_active_chainstate->m_from_snapshot_blockhash; return m_active_chainstate->m_from_snapshot_blockhash;
} }
return {}; return std::nullopt;
} }
std::vector<CChainState*> ChainstateManager::GetAll() std::vector<CChainState*> ChainstateManager::GetAll()

Loading…
Cancel
Save