diff --git a/src/memusage.h b/src/memusage.h index b69acafff..710120d28 100644 --- a/src/memusage.h +++ b/src/memusage.h @@ -16,8 +16,6 @@ #include #include -#include -#include namespace memusage { @@ -148,8 +146,6 @@ static inline size_t DynamicUsage(const std::shared_ptr& p) return p ? MallocUsage(sizeof(X)) + MallocUsage(sizeof(stl_shared_counter)) : 0; } -// Boost data structures - template struct unordered_node : private X { @@ -157,18 +153,6 @@ private: void* ptr; }; -template -static inline size_t DynamicUsage(const boost::unordered_set& s) -{ - return MallocUsage(sizeof(unordered_node)) * s.size() + MallocUsage(sizeof(void*) * s.bucket_count()); -} - -template -static inline size_t DynamicUsage(const boost::unordered_map& m) -{ - return MallocUsage(sizeof(unordered_node >)) * m.size() + MallocUsage(sizeof(void*) * m.bucket_count()); -} - template static inline size_t DynamicUsage(const std::unordered_set& s) { diff --git a/src/validation.h b/src/validation.h index 3a7f7cf1b..0f410530f 100644 --- a/src/validation.h +++ b/src/validation.h @@ -30,8 +30,6 @@ #include -#include - class CBlockIndex; class CBlockTreeDB; class CBloomFilter; @@ -161,7 +159,7 @@ extern CScript COINBASE_FLAGS; extern CCriticalSection cs_main; extern CBlockPolicyEstimator feeEstimator; extern CTxMemPool mempool; -typedef boost::unordered_map BlockMap; +typedef std::unordered_map BlockMap; extern BlockMap mapBlockIndex; extern uint64_t nLastBlockTx; extern uint64_t nLastBlockSize;