Skip to content

Commit

Permalink
Merge #20386: Silence false positive GCC warning in wallet/rpcwallet.cpp
Browse files Browse the repository at this point in the history
049feab Add missing optional.h include (Kristaps Kaupe)
29c66ac Silence false positive GCC warning (Kristaps Kaupe)

Pull request description:

  Resolves #20381.

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

Tree-SHA512: 05d84f51521c3b843ed6bf284a83a91db015ad0cd4fcf8b602275812575c1f6b4899286a89d360fbd3caef184abdfb9d834e119842d8740919892f05a0f9e1f8
  • Loading branch information
MarcoFalke committed Nov 15, 2020
2 parents fb7726e + 049feab commit 0ede354
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/wallet/rpcwallet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 0ede354

Please sign in to comment.