aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2014-10-06 23:49:05 +0200
committerPieter Wuille <pieter.wuille@gmail.com>2014-10-06 23:51:45 +0200
commita2a5fe3b727bcf5f87b91f5b625c98e132fd3d22 (patch)
tree13bc40e378a91585f3054b8ca518029dd4dc5101
parent5505a1b13f75af9f0f6421b42d97c06e079db345 (diff)
parent4dc5eb057c1d3b3cab8eb6462a0e134b128de1fd (diff)
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)
-rw-r--r--src/main.cpp10
-rw-r--r--src/script/interpreter.h2
-rw-r--r--src/script/sigcache.cpp4
-rw-r--r--src/script/sigcache.h6
4 files changed, 11 insertions, 11 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 44ac232aad..5d46c30a9b 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);
diff --git a/src/script/interpreter.h b/src/script/interpreter.h
index f5363a7535..0ff73964ba 100644
--- a/src/script/interpreter.h
+++ b/src/script/interpreter.h
@@ -10,10 +10,10 @@
#include <stdint.h>
#include <string>
-class uint256;
class CPubKey;
class CScript;
class CTransaction;
+class uint256;
/** Signature hash types/flags */
enum
diff --git a/src/script/sigcache.cpp b/src/script/sigcache.cpp
index 981563b7ae..ab366898d8 100644
--- a/src/script/sigcache.cpp
+++ b/src/script/sigcache.cpp
@@ -1,6 +1,6 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 The Bitcoin developers
-// Distributed under the MIT/X11 software license, see the accompanying
+// Copyright (c) 2009-2014 The Bitcoin developers
+// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "sigcache.h"
diff --git a/src/script/sigcache.h b/src/script/sigcache.h
index 9537efbd11..46b8f4d335 100644
--- a/src/script/sigcache.h
+++ b/src/script/sigcache.h
@@ -1,6 +1,6 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 The Bitcoin developers
-// Distributed under the MIT/X11 software license, see the accompanying
+// Copyright (c) 2009-2014 The Bitcoin developers
+// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef H_BITCOIN_SCRIPT_SIGCACHE
@@ -23,4 +23,4 @@ public:
bool VerifySignature(const std::vector<unsigned char>& vchSig, const CPubKey& vchPubKey, const uint256& sighash) const;
};
-#endif
+#endif // H_BITCOIN_SCRIPT_SIGCACHE