diff options
| author | Pieter Wuille <[email protected]> | 2014-10-06 23:49:05 +0200 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2014-10-06 23:51:45 +0200 |
| commit | a2a5fe3b727bcf5f87b91f5b625c98e132fd3d22 (patch) | |
| tree | 13bc40e378a91585f3054b8ca518029dd4dc5101 /src/main.cpp | |
| parent | Merge pull request #5036 (diff) | |
| parent | fix a lock indentation in main.cpp (diff) | |
| download | discoin-a2a5fe3b727bcf5f87b91f5b625c98e132fd3d22.tar.xz discoin-a2a5fe3b727bcf5f87b91f5b625c98e132fd3d22.zip | |
Merge pull request #5049
4dc5eb0 fix a lock indentation in main.cpp (Philip Kaufmann)
5eed8c2 minor license, header end comment etc. cleanup in /script (Philip Kaufmann)
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main.cpp b/src/main.cpp index 44ac232aa..5d46c30a9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -26,8 +26,8 @@ #include <boost/filesystem/fstream.hpp> #include <boost/thread.hpp> -using namespace std; using namespace boost; +using namespace std; #if defined(NDEBUG) # error "Bitcoin cannot be compiled without assertions." @@ -2026,10 +2026,10 @@ bool ActivateBestChain(CValidationState &state, CBlock *pblock) { // Relay inventory, but don't relay old inventory during initial block download. int nBlockEstimate = Checkpoints::GetTotalBlocksEstimate(); { - LOCK(cs_vNodes); - BOOST_FOREACH(CNode* pnode, vNodes) - if (chainActive.Height() > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : nBlockEstimate)) - pnode->PushInventory(CInv(MSG_BLOCK, hashNewTip)); + LOCK(cs_vNodes); + BOOST_FOREACH(CNode* pnode, vNodes) + if (chainActive.Height() > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : nBlockEstimate)) + pnode->PushInventory(CInv(MSG_BLOCK, hashNewTip)); } uiInterface.NotifyBlockTip(hashNewTip); |