mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-11-20 02:25:40 +01:00
Code Issues Projects Releases Wiki Activity

Remove unused MakeOptional

Browse Source 
The only use was to work around a compiler warning in an ancient
compiler, which we no longer support.
This commit is contained in:
MarcoFalke 2020-12-16 12:02:27 +01:00
parent fadd4029dc
commit fa7e803f3e
No known key found for this signature in database
GPG Key ID: CE2B75697E69A548
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/optional.h
View File

@ -13,13 +13,6 @@
template <typename T>
using Optional = boost::optional<T>;
//! Substitute for C++17 std::make_optional
template <typename T>
Optional<T> MakeOptional(bool condition, T&& value)
{
return boost::make_optional(condition, std::forward<T>(value));
}
//! Substitute for C++17 std::nullopt
static auto& nullopt = boost::none;

5
src/wallet/rpcwallet.cpp
View File

@ -1573,8 +1573,7 @@ static RPCHelpMan listsinceblock()
LOCK(wallet.cs_wallet);
// The way the 'height' is initialized is just a workaround for the gcc bug #47679 since version 4.6.0.
Optional<int> height = MakeOptional(false, int()); // Height of the specified block or the common ancestor, if the block provided was in a deactivated chain.
Optional<int> height; // Height of the specified block or the common ancestor, if the block provided was in a deactivated chain.
Optional<int> altheight; // Height of the specified block, even if it's in a deactivated chain.
int target_confirms = 1;
isminefilter filter = ISMINE_SPENDABLE;
@ -3597,7 +3596,7 @@ static RPCHelpMan rescanblockchain()
}
int start_height = 0;
Optional<int> stop_height = MakeOptional(false, int());
Optional<int> stop_height;
uint256 start_block;
{
LOCK(pwallet->cs_wallet);

3
src/wallet/wallet.cpp
View File

@ -4055,8 +4055,7 @@ std::shared_ptr<CWallet> CWallet::Create(interfaces::Chain& chain, const std::st
// No need to read and scan block if block was created before
// our wallet birthday (as adjusted for block time variability)
// The way the 'time_first_key' is initialized is just a workaround for the gcc bug #47679 since version 4.6.0.
Optional<int64_t> time_first_key = MakeOptional(false, int64_t());;
Optional<int64_t> time_first_key;
for (auto spk_man : walletInstance->GetAllScriptPubKeyMans()) {
int64_t time = spk_man->GetTimeFirstKey();
if (!time_first_key || time < *time_first_key) time_first_key = time;