Merge 41720a1f54 into merged_master (Bitcoin PR bitcoin/bitcoin#24786)

This commit is contained in:
James Dorfman 2024-07-29 19:42:59 +00:00
commit 38cf680443
8 changed files with 19 additions and 19 deletions

View file

@ -5273,7 +5273,7 @@ bool ChainstateManager::ActivateSnapshot(
auto snapshot_chainstate = WITH_LOCK(::cs_main,
return std::make_unique<CChainState>(
/* mempool */ nullptr, m_blockman, *this, base_blockhash));
/*mempool=*/nullptr, m_blockman, *this, base_blockhash));
{
LOCK(::cs_main);