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/net_processing.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/net_processing.cpp')
| -rw-r--r-- | src/net_processing.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp index cc07ef30b..74da788ca 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -1952,7 +1952,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, bool fNewBlock = false; // Since we requested this block (it was in mapBlocksInFlight), force it to be processed, // even if it would not be a candidate for new tip (missing previous block, chain not long enough, etc) - ProcessNewBlock(chainparams, pblock, true, NULL, &fNewBlock); + ProcessNewBlock(chainparams, pblock, true, &fNewBlock); if (fNewBlock) pfrom->nLastBlockTime = GetTime(); } @@ -2134,7 +2134,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, mapBlockSource.emplace(hash, std::make_pair(pfrom->GetId(), true)); } bool fNewBlock = false; - ProcessNewBlock(chainparams, pblock, forceProcessing, NULL, &fNewBlock); + ProcessNewBlock(chainparams, pblock, forceProcessing, &fNewBlock); if (fNewBlock) pfrom->nLastBlockTime = GetTime(); } |