diff --git a/src/core_memusage.h b/src/core_memusage.h index 3a5089f11c..cb18e74bc1 100644 --- a/src/core_memusage.h +++ b/src/core_memusage.h @@ -1,74 +1,74 @@ // Copyright (c) 2015-2016 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef BITCOIN_CORE_MEMUSAGE_H #define BITCOIN_CORE_MEMUSAGE_H -#include "memusage.h" -#include "primitives/block.h" -#include "primitives/transaction.h" +#include +#include +#include static inline size_t RecursiveDynamicUsage(const CScript &script) { return memusage::DynamicUsage(*static_cast(&script)); } static inline size_t RecursiveDynamicUsage(const COutPoint &out) { return 0; } static inline size_t RecursiveDynamicUsage(const CTxIn &in) { return RecursiveDynamicUsage(in.scriptSig) + RecursiveDynamicUsage(in.prevout); } static inline size_t RecursiveDynamicUsage(const CTxOut &out) { return RecursiveDynamicUsage(out.scriptPubKey); } static inline size_t RecursiveDynamicUsage(const CTransaction &tx) { size_t mem = memusage::DynamicUsage(tx.vin) + memusage::DynamicUsage(tx.vout); for (std::vector::const_iterator it = tx.vin.begin(); it != tx.vin.end(); it++) { mem += RecursiveDynamicUsage(*it); } for (std::vector::const_iterator it = tx.vout.begin(); it != tx.vout.end(); it++) { mem += RecursiveDynamicUsage(*it); } return mem; } static inline size_t RecursiveDynamicUsage(const CMutableTransaction &tx) { size_t mem = memusage::DynamicUsage(tx.vin) + memusage::DynamicUsage(tx.vout); for (std::vector::const_iterator it = tx.vin.begin(); it != tx.vin.end(); it++) { mem += RecursiveDynamicUsage(*it); } for (std::vector::const_iterator it = tx.vout.begin(); it != tx.vout.end(); it++) { mem += RecursiveDynamicUsage(*it); } return mem; } static inline size_t RecursiveDynamicUsage(const CBlock &block) { size_t mem = memusage::DynamicUsage(block.vtx); for (const auto &tx : block.vtx) { mem += memusage::DynamicUsage(tx) + RecursiveDynamicUsage(*tx); } return mem; } static inline size_t RecursiveDynamicUsage(const CBlockLocator &locator) { return memusage::DynamicUsage(locator.vHave); } template static inline size_t RecursiveDynamicUsage(const std::shared_ptr &p) { return p ? memusage::DynamicUsage(p) + RecursiveDynamicUsage(*p) : 0; } #endif // BITCOIN_CORE_MEMUSAGE_H diff --git a/src/core_read.cpp b/src/core_read.cpp index c1092b5087..7becc526ad 100644 --- a/src/core_read.cpp +++ b/src/core_read.cpp @@ -1,252 +1,252 @@ // Copyright (c) 2009-2016 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "core_io.h" +#include -#include "primitives/block.h" -#include "primitives/transaction.h" -#include "script/script.h" -#include "serialize.h" -#include "streams.h" -#include "util.h" -#include "utilstrencodings.h" -#include "version.h" - -#include +#include +#include +#include