diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-05-10 12:43:19 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-05-10 12:43:22 +0200 |
| commit | f7a21dae5dbf71d5bc00485215e84e6f2b309d0a (patch) | |
| tree | 680a7f6957c4e38ac154cebda6e41c7f0fc4dd55 /src/main.h | |
| parent | 5767e80dda7a699597b4798d1546e618edb50928 (diff) | |
| parent | 657e07efa34ffe9d8614a618e00452c9ee7c0e0d (diff) | |
| download | bitcoin-f7a21dae5dbf71d5bc00485215e84e6f2b309d0a.tar.xz | |
Merge #8019: Remove state arg from ReconsiderBlock, rename to ResetBlockFailureFlags
657e07e Rename ReconsiderBlock func to reflect real behavior (instagibbs)
addb9d2 Remove state arg from ReconsiderBlock (instagibbs)
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.h b/src/main.h index 3cc16fd8f4..548218a1b5 100644 --- a/src/main.h +++ b/src/main.h @@ -464,7 +464,7 @@ CBlockIndex* FindForkInGlobalIndex(const CChain& chain, const CBlockLocator& loc bool InvalidateBlock(CValidationState& state, const CChainParams& chainparams, CBlockIndex *pindex); /** Remove invalidity status from a block and its descendants. */ -bool ReconsiderBlock(CValidationState& state, CBlockIndex *pindex); +bool ResetBlockFailureFlags(CBlockIndex *pindex); /** The currently-connected chain of blocks (protected by cs_main). */ extern CChain chainActive; |