From e97c4a7d8e7f7b83f95e87064b0ca1963a2947a0 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Wed, 25 Jul 2012 02:45:24 -0700 Subject: [PATCH] Allow unordered_map's of uint160/uint256 to work without including SHAMap.h --- src/SHAMap.h | 2 -- src/uint256.h | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/SHAMap.h b/src/SHAMap.h index cbd1017180..0130a624d7 100644 --- a/src/SHAMap.h +++ b/src/SHAMap.h @@ -77,8 +77,6 @@ public: }; extern std::size_t hash_value(const SHAMapNode& mn); -extern std::size_t hash_value(const uint256& u); -extern std::size_t hash_value(const uint160& u); class SHAMapItem { // an item stored in a SHAMap diff --git a/src/uint256.h b/src/uint256.h index a40c22c6fa..a5cb8c456a 100644 --- a/src/uint256.h +++ b/src/uint256.h @@ -469,6 +469,8 @@ inline const uint160 operator^(const uint160& a, const uint160& b) { return (b inline const uint160 operator&(const uint160& a, const uint160& b) { return (base_uint160)a & (base_uint160)b; } inline const uint160 operator|(const uint160& a, const uint160& b) { return (base_uint160)a | (base_uint160)b; } +extern std::size_t hash_value(const uint160&); + inline const std::string strHex(const uint160& ui) { return strHex(ui.begin(), ui.size()); @@ -555,6 +557,7 @@ inline bool operator!=(const uint256& a, const uint256& b) { return (base_ui inline const uint256 operator^(const uint256& a, const uint256& b) { return (base_uint256)a ^ (base_uint256)b; } inline const uint256 operator&(const uint256& a, const uint256& b) { return (base_uint256)a & (base_uint256)b; } inline const uint256 operator|(const uint256& a, const uint256& b) { return (base_uint256)a | (base_uint256)b; } +extern std::size_t hash_value(const uint256&); inline int Testuint256AdHoc(std::vector vArg) {