v29.4-roots.3 · Commit 7: [PATCH 07/30] release: establish Roots maintenance and assurance
src/node/miner.h
Before: src/node/miner.h · After: src/node/miner.h
File metadata
index 4b4327ea2a80701f254587871599202e7faea7f3..fb8a4249ab4a7213907ee4148d6916ae3dcd017a 100644
Download original patch · Release notes
Diff rows 1–8 of 8. Line numbers refer to the original before/after files.
+ Added− RemovedUnmarked lines are context.
Scroll the code area horizontally to read long lines. The two line-number columns refer to before and after.
src/node/miner.h
CHANGED
|
@@ -201,7 +201,7 @@ private:
|
|
|
201
201
|
*
|
|
202
202
|
* @pre BlockAssembler::m_mempool must not be nullptr
|
|
203
203
|
*/
|
|
204
|
-
void addPackageTxs(int& nPackagesSelected, int& nDescendantsUpdated) EXCLUSIVE_LOCKS_REQUIRED(!m_mempool->cs);
|
|
204
|
+
void addPackageTxs(const CTxMemPool& mempool, int& nPackagesSelected, int& nDescendantsUpdated) EXCLUSIVE_LOCKS_REQUIRED(mempool.cs);
|
|
205
205
|
|
|
206
206
|
void addPriorityTxs(const CTxMemPool& mempool, int& nPackagesSelected) EXCLUSIVE_LOCKS_REQUIRED(mempool.cs);
|
|
207
207
|
bool TestForBlock(CTxMemPool::txiter iter);
|