From fa7e803f3e4df33117927aef6fef9bfaee4f410d Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Wed, 16 Dec 2020 12:02:27 +0100 Subject: Remove unused MakeOptional The only use was to work around a compiler warning in an ancient compiler, which we no longer support. --- src/wallet/rpcwallet.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/wallet/rpcwallet.cpp') diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 94a73b67df..614ebd22f6 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -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 height = MakeOptional(false, int()); // Height of the specified block or the common ancestor, if the block provided was in a deactivated chain. + Optional height; // Height of the specified block or the common ancestor, if the block provided was in a deactivated chain. Optional 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 stop_height = MakeOptional(false, int()); + Optional stop_height; uint256 start_block; { LOCK(pwallet->cs_wallet); -- cgit v1.2.3