- remove some missplaced ; - ensure end of a namespace is clearly visible - use same formatting when using namespacetags/v0.15.1
@@ -186,6 +186,7 @@ int CBase58Data::CompareTo(const CBase58Data& b58) const { | |||
} | |||
namespace { | |||
class CBitcoinAddressVisitor : public boost::static_visitor<bool> { | |||
private: | |||
CBitcoinAddress *addr; | |||
@@ -196,7 +197,8 @@ namespace { | |||
bool operator()(const CScriptID &id) const { return addr->Set(id); } | |||
bool operator()(const CNoDestination &no) const { return false; } | |||
}; | |||
}; | |||
} // anon namespace | |||
bool CBitcoinAddress::Set(const CKeyID &id) { | |||
SetData(Params().Base58Prefix(CChainParams::PUBKEY_ADDRESS), &id, 20); |
@@ -12,8 +12,8 @@ | |||
#include <boost/assign/list_of.hpp> // for 'map_list_of()' | |||
#include <boost/foreach.hpp> | |||
namespace Checkpoints | |||
{ | |||
namespace Checkpoints { | |||
typedef std::map<int, uint256> MapCheckpoints; | |||
// How many times we expect transactions after the last checkpoint to | |||
@@ -161,4 +161,5 @@ namespace Checkpoints | |||
} | |||
return NULL; | |||
} | |||
} | |||
} // namespace Checkpoints |
@@ -13,8 +13,8 @@ class uint256; | |||
/** Block-chain checkpoints are compiled-in sanity checks. | |||
* They are updated every release or three. | |||
*/ | |||
namespace Checkpoints | |||
{ | |||
namespace Checkpoints { | |||
// Returns true if block passes checkpoint checks | |||
bool CheckBlock(int nHeight, const uint256& hash); | |||
@@ -27,6 +27,7 @@ namespace Checkpoints | |||
double GuessVerificationProgress(CBlockIndex *pindex, bool fSigchecks = true); | |||
extern bool fEnabled; | |||
} | |||
} //namespace Checkpoints | |||
#endif |
@@ -12,7 +12,7 @@ class CWallet; | |||
namespace boost { | |||
class thread_group; | |||
}; | |||
} // namespace boost | |||
extern CWallet* pwalletMain; | |||
@@ -377,8 +377,7 @@ const unsigned char vchMaxModHalfOrder[32] = { | |||
const unsigned char vchZero[0] = {}; | |||
}; // end of anonymous namespace | |||
} // anon namespace | |||
bool CKey::Check(const unsigned char *vch) { | |||
return CompareBigEndian(vch, 32, vchZero, 0) > 0 && |
@@ -72,6 +72,7 @@ const string strMessageMagic = "Bitcoin Signed Message:\n"; | |||
// Internal stuff | |||
namespace { | |||
struct CBlockIndexWorkComparator | |||
{ | |||
bool operator()(CBlockIndex *pa, CBlockIndex *pb) { | |||
@@ -120,7 +121,8 @@ namespace { | |||
}; | |||
map<uint256, pair<NodeId, list<QueuedBlock>::iterator> > mapBlocksInFlight; | |||
map<uint256, pair<NodeId, list<uint256>::iterator> > mapBlocksToDownload; | |||
} | |||
} // anon namespace | |||
////////////////////////////////////////////////////////////////////////////// | |||
// | |||
@@ -130,6 +132,7 @@ namespace { | |||
// These functions dispatch to one or all registered wallets | |||
namespace { | |||
struct CMainSignals { | |||
// Notifies listeners of updated transaction data (transaction, and optionally the block it is found in. | |||
boost::signals2::signal<void (const CTransaction &, const CBlock *)> SyncTransaction; | |||
@@ -144,7 +147,8 @@ struct CMainSignals { | |||
// Tells listeners to broadcast their data. | |||
boost::signals2::signal<void ()> Broadcast; | |||
} g_signals; | |||
} | |||
} // anon namespace | |||
void RegisterWallet(CWalletInterface* pwalletIn) { | |||
g_signals.SyncTransaction.connect(boost::bind(&CWalletInterface::SyncTransaction, pwalletIn, _1, _2)); | |||
@@ -274,7 +278,6 @@ void MarkBlockAsReceived(const uint256 &hash, NodeId nodeFrom = -1) { | |||
state->nLastBlockReceive = GetTimeMicros(); | |||
mapBlocksInFlight.erase(itInFlight); | |||
} | |||
} | |||
// Requires cs_main. | |||
@@ -310,7 +313,7 @@ void MarkBlockAsInFlight(NodeId nodeid, const uint256 &hash) { | |||
mapBlocksInFlight[hash] = std::make_pair(nodeid, it); | |||
} | |||
} | |||
} // anon namespace | |||
bool GetNodeStateStats(NodeId nodeid, CNodeStateStats &stats) { | |||
LOCK(cs_main); |
@@ -28,14 +28,13 @@ | |||
#include <boost/signals2/signal.hpp> | |||
#include <openssl/rand.h> | |||
class CAddrMan; | |||
class CBlockIndex; | |||
class CNode; | |||
namespace boost { | |||
class thread_group; | |||
} | |||
} // namespace boost | |||
/** Time between pings automatically sent out for latency probing and keepalive (in seconds). */ | |||
static const int PING_INTERVAL = 2 * 60; |
@@ -974,6 +974,7 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, co | |||
namespace { | |||
/** Wrapper that serializes like CTransaction, but with the modifications | |||
* required for the signature hash done in-place | |||
*/ | |||
@@ -1066,7 +1067,8 @@ public: | |||
::Serialize(s, txTo.nLockTime, nType, nVersion); | |||
} | |||
}; | |||
} | |||
} // anon namespace | |||
uint256 SignatureHash(const CScript &scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType) | |||
{ | |||
@@ -1092,7 +1094,6 @@ uint256 SignatureHash(const CScript &scriptCode, const CTransaction& txTo, unsig | |||
return ss.GetHash(); | |||
} | |||
// Valid signature cache, to avoid doing expensive ECDSA signature checking | |||
// twice for every transaction (once when accepted into memory pool, and | |||
// again when accepted into the block chain) |
@@ -77,11 +77,12 @@ | |||
// See also: http://stackoverflow.com/questions/10020179/compilation-fail-in-boost-librairies-program-options | |||
// http://clang.debian.net/status.php?version=3.0&key=CANNOT_FIND_FUNCTION | |||
namespace boost { | |||
namespace program_options { | |||
std::string to_internal(const std::string&); | |||
} | |||
} | |||
} // namespace boost | |||
using namespace std; | |||