diff options
Diffstat (limited to 'src')
41 files changed, 47 insertions, 45 deletions
diff --git a/src/addrman.h b/src/addrman.h index 052d364655..8f6ab60662 100644 --- a/src/addrman.h +++ b/src/addrman.h @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef _BITCOIN_ADDRMAN -#define _BITCOIN_ADDRMAN 1 +#define _BITCOIN_ADDRMAN #include "netbase.h" #include "protocol.h" @@ -503,4 +503,4 @@ public: } }; -#endif +#endif // _BITCOIN_ADDRMAN diff --git a/src/alert.h b/src/alert.h index b9d850b565..d8254ba2cb 100644 --- a/src/alert.h +++ b/src/alert.h @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef _BITCOINALERT_H_ -#define _BITCOINALERT_H_ 1 +#define _BITCOINALERT_H_ #include "serialize.h" #include "sync.h" @@ -105,4 +105,4 @@ public: static CAlert getAlertByHash(const uint256 &hash); }; -#endif +#endif // _BITCOINALERT_H_ diff --git a/src/allocators.h b/src/allocators.h index be0be7ab96..0b1c9fea68 100644 --- a/src/allocators.h +++ b/src/allocators.h @@ -252,4 +252,4 @@ struct zero_after_free_allocator : public std::allocator<T> // This is exactly like std::string, but with a custom allocator. typedef std::basic_string<char, std::char_traits<char>, secure_allocator<char> > SecureString; -#endif +#endif // BITCOIN_ALLOCATORS_H diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp index 75f0fb69f2..5f547bba83 100644 --- a/src/bitcoin-tx.cpp +++ b/src/bitcoin-tx.cpp @@ -619,4 +619,3 @@ int main(int argc, char* argv[]) } return ret; } - diff --git a/src/bloom.h b/src/bloom.h index 54d16d7126..bedd8fbcd8 100644 --- a/src/bloom.h +++ b/src/bloom.h @@ -91,4 +91,4 @@ public: void UpdateEmptyFull(); }; -#endif /* BITCOIN_BLOOM_H */ +#endif // BITCOIN_BLOOM_H diff --git a/src/chainparams.h b/src/chainparams.h index 446256ba82..95b972bd7f 100644 --- a/src/chainparams.h +++ b/src/chainparams.h @@ -120,4 +120,4 @@ void SelectParams(CBaseChainParams::Network network); */ bool SelectParamsFromCommandLine(); -#endif +#endif // BITCOIN_CHAIN_PARAMS_H diff --git a/src/chainparamsbase.h b/src/chainparamsbase.h index 4398f69548..2d3a07b44a 100644 --- a/src/chainparamsbase.h +++ b/src/chainparamsbase.h @@ -55,4 +55,4 @@ bool SelectBaseParamsFromCommandLine(); */ bool AreBaseParamsConfigured(); -#endif +#endif // BITCOIN_CHAIN_PARAMS_BASE_H diff --git a/src/checkpoints.h b/src/checkpoints.h index 2cf8d41b9d..52cdc35559 100644 --- a/src/checkpoints.h +++ b/src/checkpoints.h @@ -30,4 +30,4 @@ namespace Checkpoints { } //namespace Checkpoints -#endif +#endif // BITCOIN_CHECKPOINT_H diff --git a/src/checkqueue.h b/src/checkqueue.h index ef7b4ca422..c2c7d8ca24 100644 --- a/src/checkqueue.h +++ b/src/checkqueue.h @@ -191,4 +191,4 @@ public: } }; -#endif +#endif // CHECKQUEUE_H diff --git a/src/coins.h b/src/coins.h index 08913531d8..d338e3172e 100644 --- a/src/coins.h +++ b/src/coins.h @@ -2,6 +2,7 @@ // Copyright (c) 2009-2013 The Bitcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. + #ifndef BITCOIN_COINS_H #define BITCOIN_COINS_H @@ -379,4 +380,4 @@ private: CCoinsMap::const_iterator FetchCoins(const uint256 &txid) const; }; -#endif +#endif // BITCOIN_COINS_H diff --git a/src/core.h b/src/core.h index 126e1baa98..a3ec2346e2 100644 --- a/src/core.h +++ b/src/core.h @@ -533,4 +533,4 @@ struct CBlockLocator } }; -#endif +#endif // BITCOIN_CORE_H diff --git a/src/core_read.cpp b/src/core_read.cpp index 593eb2d035..57f1397f18 100644 --- a/src/core_read.cpp +++ b/src/core_read.cpp @@ -126,4 +126,3 @@ vector<unsigned char> ParseHexUV(const UniValue& v, const string& strName) throw runtime_error(strName+" must be hexadecimal string (not '"+strHex+"')"); return ParseHex(strHex); } - diff --git a/src/core_write.cpp b/src/core_write.cpp index b395b5c090..e63b64d692 100644 --- a/src/core_write.cpp +++ b/src/core_write.cpp @@ -89,4 +89,3 @@ void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry) if (hashBlock != 0) entry.pushKV("blockhash", hashBlock.GetHex()); } - diff --git a/src/crypter.h b/src/crypter.h index f16fcef9c7..9b592dbcdc 100644 --- a/src/crypter.h +++ b/src/crypter.h @@ -192,4 +192,4 @@ public: boost::signals2::signal<void (CCryptoKeyStore* wallet)> NotifyStatusChanged; }; -#endif +#endif // __CRYPTER_H__ diff --git a/src/hash.h b/src/hash.h index f2a0ebfe1f..98a2d1fb11 100644 --- a/src/hash.h +++ b/src/hash.h @@ -159,4 +159,4 @@ uint256 SerializeHash(const T& obj, int nType=SER_GETHASH, int nVersion=PROTOCOL unsigned int MurmurHash3(unsigned int nHashSeed, const std::vector<unsigned char>& vDataToHash); -#endif +#endif // BITCOIN_HASH_H diff --git a/src/init.h b/src/init.h index 626525c9ad..cf1d1e7e39 100644 --- a/src/init.h +++ b/src/init.h @@ -33,4 +33,4 @@ std::string HelpMessage(HelpMessageMode mode); /** Returns licensing information (for -version) */ std::string LicenseInfo(); -#endif +#endif // BITCOIN_INIT_H @@ -309,4 +309,4 @@ struct CExtKey { /** Check that required EC support is available at runtime */ bool ECC_InitSanityCheck(void); -#endif +#endif // BITCOIN_KEY_H diff --git a/src/keystore.h b/src/keystore.h index 7aaf197cd7..3b49e282d9 100644 --- a/src/keystore.h +++ b/src/keystore.h @@ -105,4 +105,4 @@ public: typedef std::vector<unsigned char, secure_allocator<unsigned char> > CKeyingMaterial; typedef std::map<CKeyID, std::pair<CPubKey, std::vector<unsigned char> > > CryptedKeyMap; -#endif +#endif // BITCOIN_KEYSTORE_H diff --git a/src/limitedmap.h b/src/limitedmap.h index 1623a372b3..58593688af 100644 --- a/src/limitedmap.h +++ b/src/limitedmap.h @@ -98,4 +98,4 @@ public: } }; -#endif +#endif // BITCOIN_LIMITEDMAP_H diff --git a/src/main.h b/src/main.h index 6b78356642..e0836960b3 100644 --- a/src/main.h +++ b/src/main.h @@ -996,4 +996,4 @@ protected: friend void ::UnregisterAllWallets(); }; -#endif +#endif // BITCOIN_MAIN_H diff --git a/src/mruset.h b/src/mruset.h index c1c08b0288..b9f325d874 100644 --- a/src/mruset.h +++ b/src/mruset.h @@ -64,4 +64,4 @@ public: } }; -#endif +#endif // BITCOIN_MRUSET_H @@ -615,4 +615,4 @@ public: bool Read(CAddrMan& addr); }; -#endif +#endif // BITCOIN_NET_H diff --git a/src/netbase.h b/src/netbase.h index 2df3c4474d..d4d266e0a8 100644 --- a/src/netbase.h +++ b/src/netbase.h @@ -182,4 +182,4 @@ bool CloseSocket(SOCKET& hSocket); /** Disable or enable blocking-mode for a socket */ bool SetSocketNonBlocking(SOCKET& hSocket, bool fNonBlocking); -#endif +#endif // BITCOIN_NETBASE_H diff --git a/src/noui.h b/src/noui.h index 755d987fdd..dbd4320fa7 100644 --- a/src/noui.h +++ b/src/noui.h @@ -7,4 +7,4 @@ extern void noui_connect(); -#endif +#endif // BITCOIN_NOUI_H @@ -1,4 +1,3 @@ - // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Distributed under the MIT/X11 software license, see the accompanying @@ -24,4 +23,4 @@ void UpdateTime(CBlockHeader* block, const CBlockIndex* pindexPrev); uint256 GetProofIncrement(unsigned int nBits); -#endif +#endif // BITCOIN_POW_H diff --git a/src/rpcclient.h b/src/rpcclient.h index 840890e34b..1233ea3875 100644 --- a/src/rpcclient.h +++ b/src/rpcclient.h @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef _BITCOINRPC_CLIENT_H_ -#define _BITCOINRPC_CLIENT_H_ 1 +#define _BITCOINRPC_CLIENT_H_ #include "json/json_spirit_reader_template.h" #include "json/json_spirit_utils.h" @@ -12,4 +12,4 @@ json_spirit::Array RPCConvertValues(const std::string &strMethod, const std::vector<std::string> &strParams); -#endif +#endif // _BITCOINRPC_CLIENT_H_ diff --git a/src/rpcprotocol.h b/src/rpcprotocol.h index 8f05c08482..a9adb58803 100644 --- a/src/rpcprotocol.h +++ b/src/rpcprotocol.h @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef _BITCOINRPC_PROTOCOL_H_ -#define _BITCOINRPC_PROTOCOL_H_ 1 +#define _BITCOINRPC_PROTOCOL_H_ #include <list> #include <map> @@ -159,4 +159,4 @@ json_spirit::Object JSONRPCReplyObj(const json_spirit::Value& result, const json std::string JSONRPCReply(const json_spirit::Value& result, const json_spirit::Value& error, const json_spirit::Value& id); json_spirit::Object JSONRPCError(int code, const std::string& message); -#endif +#endif // _BITCOINRPC_PROTOCOL_H_ diff --git a/src/rpcserver.h b/src/rpcserver.h index b850d15d4e..820c1bc081 100644 --- a/src/rpcserver.h +++ b/src/rpcserver.h @@ -4,7 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef _BITCOINRPC_SERVER_H_ -#define _BITCOINRPC_SERVER_H_ 1 +#define _BITCOINRPC_SERVER_H_ #include "uint256.h" #include "rpcprotocol.h" @@ -209,4 +209,4 @@ extern json_spirit::Value gettxout(const json_spirit::Array& params, bool fHelp) extern json_spirit::Value verifychain(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value getchaintips(const json_spirit::Array& params, bool fHelp); -#endif +#endif // _BITCOINRPC_SERVER_H_ diff --git a/src/script.h b/src/script.h index 462e3f2302..8e6aedcc63 100644 --- a/src/script.h +++ b/src/script.h @@ -833,4 +833,4 @@ bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const C // combine them intelligently and return the result. CScript CombineSignatures(CScript scriptPubKey, const CTransaction& txTo, unsigned int nIn, const CScript& scriptSig1, const CScript& scriptSig2); -#endif +#endif // H_BITCOIN_SCRIPT diff --git a/src/serialize.h b/src/serialize.h index 17cb724bee..d486181d78 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -1405,4 +1405,4 @@ public: } }; -#endif +#endif // BITCOIN_SERIALIZE_H diff --git a/src/sync.h b/src/sync.h index cd319e0171..4b81b4bd32 100644 --- a/src/sync.h +++ b/src/sync.h @@ -260,5 +260,5 @@ public: return fHaveGrant; } }; -#endif +#endif // BITCOIN_SYNC_H diff --git a/src/threadsafety.h b/src/threadsafety.h index 176060ac65..9ee39372e1 100644 --- a/src/threadsafety.h +++ b/src/threadsafety.h @@ -51,4 +51,5 @@ #define SHARED_LOCKS_REQUIRED(...) #define NO_THREAD_SAFETY_ANALYSIS #endif // __GNUC__ + #endif // BITCOIN_THREADSAFETY_H diff --git a/src/timedata.h b/src/timedata.h index d0c84b3183..9cc47bec13 100644 --- a/src/timedata.h +++ b/src/timedata.h @@ -73,4 +73,4 @@ int64_t GetTimeOffset(); int64_t GetAdjustedTime(); void AddTimeData(const CNetAddr& ip, int64_t nTime); -#endif +#endif // BITCOIN_TIMEDATA_H diff --git a/src/txmempool.h b/src/txmempool.h index d95c4d970b..360364d8b0 100644 --- a/src/txmempool.h +++ b/src/txmempool.h @@ -2,6 +2,7 @@ // Copyright (c) 2009-2013 The Bitcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. + #ifndef BITCOIN_TXMEMPOOL_H #define BITCOIN_TXMEMPOOL_H @@ -147,4 +148,4 @@ public: bool HaveCoins(const uint256 &txid) const; }; -#endif /* BITCOIN_TXMEMPOOL_H */ +#endif // BITCOIN_TXMEMPOOL_H diff --git a/src/ui_interface.h b/src/ui_interface.h index bbc8a203c9..f5224ba57d 100644 --- a/src/ui_interface.h +++ b/src/ui_interface.h @@ -109,4 +109,4 @@ inline std::string _(const char* psz) return rv ? (*rv) : psz; } -#endif +#endif // BITCOIN_UI_INTERFACE_H diff --git a/src/uint256.h b/src/uint256.h index ad0a56f447..d1a822af0d 100644 --- a/src/uint256.h +++ b/src/uint256.h @@ -326,4 +326,4 @@ public: uint64_t GetHash(const uint256& salt) const; }; -#endif +#endif // BITCOIN_UINT256_H diff --git a/src/util.h b/src/util.h index 30f7c15c89..6e1f439ff7 100644 --- a/src/util.h +++ b/src/util.h @@ -222,4 +222,4 @@ template <typename Callable> void TraceThread(const char* name, Callable func) } } -#endif +#endif // BITCOIN_UTIL_H diff --git a/src/utiltime.h b/src/utiltime.h index 500ae4dab9..6f82e5a836 100644 --- a/src/utiltime.h +++ b/src/utiltime.h @@ -17,4 +17,4 @@ void MilliSleep(int64_t n); std::string DateTimeStrFormat(const char* pszFormat, int64_t nTime); -#endif +#endif // BITCOIN_UTILTIME_H diff --git a/src/version.h b/src/version.h index b87aa8258c..75cbec39b7 100644 --- a/src/version.h +++ b/src/version.h @@ -1,6 +1,7 @@ // Copyright (c) 2012 The Bitcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. + #ifndef BITCOIN_VERSION_H #define BITCOIN_VERSION_H @@ -52,4 +53,4 @@ static const int MEMPOOL_GD_VERSION = 60002; std::string FormatFullVersion(); std::string FormatSubVersion(const std::string& name, int nClientVersion, const std::vector<std::string>& comments); -#endif +#endif // BITCOIN_VERSION_H diff --git a/src/wallet.h b/src/wallet.h index 544b4f5bfb..41b4b1917c 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -2,6 +2,7 @@ // Copyright (c) 2009-2013 The Bitcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. + #ifndef BITCOIN_WALLET_H #define BITCOIN_WALLET_H @@ -1013,4 +1014,4 @@ private: std::vector<char> _ssExtra; }; -#endif +#endif // BITCOIN_WALLET_H diff --git a/src/walletdb.h b/src/walletdb.h index 58b4571b16..24096e13ea 100644 --- a/src/walletdb.h +++ b/src/walletdb.h @@ -2,6 +2,7 @@ // Copyright (c) 2009-2013 The Bitcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. + #ifndef BITCOIN_WALLETDB_H #define BITCOIN_WALLETDB_H |