Allow unordered_map's of uint160/uint256 to work without including SHAMap.h

This commit is contained in:
JoelKatz
2012-07-25 02:45:24 -07:00
parent f6a7d86f2b
commit e97c4a7d8e
2 changed files with 3 additions and 2 deletions

View File

@@ -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

View File

@@ -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<std::string> vArg)
{