diff --git a/src/hash.h b/src/hash.h --- a/src/hash.h +++ b/src/hash.h @@ -93,23 +93,6 @@ return result; } -/** Compute the 256-bit hash of the concatenation of three objects. */ -template -inline uint256 Hash(const T1 p1begin, const T1 p1end, const T2 p2begin, - const T2 p2end, const T3 p3begin, const T3 p3end) { - static const uint8_t pblank[1] = {}; - uint256 result; - CHash256() - .Write(p1begin == p1end ? pblank : (const uint8_t *)&p1begin[0], - (p1end - p1begin) * sizeof(p1begin[0])) - .Write(p2begin == p2end ? pblank : (const uint8_t *)&p2begin[0], - (p2end - p2begin) * sizeof(p2begin[0])) - .Write(p3begin == p3end ? pblank : (const uint8_t *)&p3begin[0], - (p3end - p3begin) * sizeof(p3begin[0])) - .Finalize((uint8_t *)&result); - return result; -} - /** Compute the 160-bit hash an object. */ template inline uint160 Hash160(const T1 pbegin, const T1 pend) { static uint8_t pblank[1] = {}; diff --git a/src/key.h b/src/key.h --- a/src/key.h +++ b/src/key.h @@ -56,9 +56,6 @@ keydata.resize(32); } - //! Destructor (again necessary because of memlocking). - ~CKey() {} - friend bool operator==(const CKey &a, const CKey &b) { return a.fCompressed == b.fCompressed && a.size() == b.size() && memcmp(a.keydata.data(), b.keydata.data(), a.size()) == 0; diff --git a/src/uint256.h b/src/uint256.h --- a/src/uint256.h +++ b/src/uint256.h @@ -111,7 +111,6 @@ class uint160 : public base_blob<160> { public: uint160() {} - explicit uint160(const base_blob<160> &b) : base_blob<160>(b) {} explicit uint160(const std::vector &vch) : base_blob<160>(vch) {} }; @@ -124,7 +123,6 @@ class uint256 : public base_blob<256> { public: uint256() {} - explicit uint256(const base_blob<256> &b) : base_blob<256>(b) {} explicit uint256(const std::vector &vch) : base_blob<256>(vch) {} /**