highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-20 23:29:12 +01:00
Code Issues Packages 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
3 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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