diff options
| author | Wladimir J. van der Laan <[email protected]> | 2016-12-14 10:55:20 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2016-12-14 10:56:28 +0100 |
| commit | b68685a16a81729f4d10975171c23c407cd332e3 (patch) | |
| tree | 99c34663d1d6bdb55660979a6bbf5c2b4c404f98 /src/validation.cpp | |
| parent | Merge #9290: Make RelayWalletTransaction attempt to AcceptToMemoryPool. (diff) | |
| parent | Remove unused CDiskBlockPos* argument from ProcessNewBlock (diff) | |
| download | discoin-b68685a16a81729f4d10975171c23c407cd332e3.tar.xz discoin-b68685a16a81729f4d10975171c23c407cd332e3.zip | |
Merge #9273: Remove unused CDiskBlockPos* argument from ProcessNewBlock
a13fa4c Remove unused CDiskBlockPos* argument from ProcessNewBlock (Matt Corallo)
Diffstat (limited to 'src/validation.cpp')
| -rw-r--r-- | src/validation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/validation.cpp b/src/validation.cpp index 457455af4..02c047f1d 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -3116,7 +3116,7 @@ static bool AcceptBlock(const CBlock& block, CValidationState& state, const CCha return true; } -bool ProcessNewBlock(const CChainParams& chainparams, const std::shared_ptr<const CBlock> pblock, bool fForceProcessing, const CDiskBlockPos* dbp, bool *fNewBlock) +bool ProcessNewBlock(const CChainParams& chainparams, const std::shared_ptr<const CBlock> pblock, bool fForceProcessing, bool *fNewBlock) { { LOCK(cs_main); @@ -3125,7 +3125,7 @@ bool ProcessNewBlock(const CChainParams& chainparams, const std::shared_ptr<cons CBlockIndex *pindex = NULL; if (fNewBlock) *fNewBlock = false; CValidationState state; - bool ret = AcceptBlock(*pblock, state, chainparams, &pindex, fForceProcessing, dbp, fNewBlock); + bool ret = AcceptBlock(*pblock, state, chainparams, &pindex, fForceProcessing, NULL, fNewBlock); CheckBlockIndex(chainparams.GetConsensus()); if (!ret) { GetMainSignals().BlockChecked(*pblock, state); |