GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-15 12:51:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0b68fca700 into merged_master (Bitcoin PR #16092)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-06 15:20:15 +00:00
commit f60ef72524
4 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/validation.cpp
View file

@ -80,7 +80,7 @@ bool CBlockIndexWorkComparator::operator()(const CBlockIndex *pa, const CBlockIn
return false;
}
CChainState g_chainstate;
static CChainState g_chainstate;
CChainState& ChainstateActive() { return g_chainstate; }
@ -1105,7 +1105,7 @@ bool CChainState::IsInitialBlockDownload() const
return false;
}
CBlockIndex *pindexBestForkTip = nullptr, *pindexBestForkBase = nullptr;
static CBlockIndex *pindexBestForkTip = nullptr, *pindexBestForkBase = nullptr;
static void AlertNotify(const std::string& strMessage)
{
@ -5045,7 +5045,8 @@ public:
delete (*it1).second;
mapBlockIndex.clear();
}
} instance_of_cmaincleanup;
};
static CMainCleanup instance_of_cmaincleanup;
// ELEMENTS:
/* This function has two major purposes: