Merge #20386: Silence false positive GCC warning in wallet/rpcwallet.cpp

049feabf289ace817a3da62fe84942d0200b8f0b Add missing optional.h include (Kristaps Kaupe)
29c66ace5c777b56cd9e19756a1ab0801d15a5ae Silence false positive GCC warning (Kristaps Kaupe)

Pull request description:

  Resolves #20381.

ACKs for top commit:
  jnewbery:
    utACK 049feabf289ace817a3da62fe84942d0200b8f0b
  practicalswift:
    ACK 049feabf289ace817a3da62fe84942d0200b8f0b: diagnostics signal to noise is increased by getting rid of false positives
  hebasto:
    ACK 049feabf289ace817a3da62fe84942d0200b8f0b, I have reviewed the code and it looks OK, I agree it can be merged.

Tree-SHA512: 05d84f51521c3b843ed6bf284a83a91db015ad0cd4fcf8b602275812575c1f6b4899286a89d360fbd3caef184abdfb9d834e119842d8740919892f05a0f9e1f8
This commit is contained in:
MarcoFalke 2020-11-15 18:33:47 +01:00
commit 0ede354367
No known key found for this signature in database
GPG Key ID: D2EA4850E7528B25

View File

@ -8,6 +8,7 @@
#include <interfaces/chain.h>
#include <key_io.h>
#include <node/context.h>
#include <optional.h>
#include <outputtype.h>
#include <policy/feerate.h>
#include <policy/fees.h>
@ -3593,7 +3594,7 @@ static RPCHelpMan rescanblockchain()
}
int start_height = 0;
Optional<int> stop_height;
Optional<int> stop_height = MakeOptional(false, int());
uint256 start_block;
{
LOCK(pwallet->cs_wallet);