diff options
| author | João Barbosa <joao@uphold.com> | 2016-03-18 04:14:19 +0000 |
|---|---|---|
| committer | João Barbosa <joao@uphold.com> | 2016-03-18 08:03:55 +0000 |
| commit | 0f176927f88084f2f1ce329656878d122fb64623 (patch) | |
| tree | 78bc77232fdc748477b850de8219ecd82cd835f2 /src | |
| parent | f034bced269c4859809d320dcfbdc4b008191b85 (diff) | |
| download | bitcoin-0f176927f88084f2f1ce329656878d122fb64623.tar.xz | |
Improve COutPoint less operator
Diffstat (limited to 'src')
| -rw-r--r-- | src/primitives/transaction.h | 3 | ||||
| -rw-r--r-- | src/uint256.h | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h index 07ae39e0b4..e124dca365 100644 --- a/src/primitives/transaction.h +++ b/src/primitives/transaction.h @@ -34,7 +34,8 @@ public: friend bool operator<(const COutPoint& a, const COutPoint& b) { - return (a.hash < b.hash || (a.hash == b.hash && a.n < b.n)); + int cmp = a.hash.Compare(b.hash); + return cmp < 0 || (cmp == 0 && a.n < b.n); } friend bool operator==(const COutPoint& a, const COutPoint& b) diff --git a/src/uint256.h b/src/uint256.h index 4495000f2f..bcdb6dd7c2 100644 --- a/src/uint256.h +++ b/src/uint256.h @@ -42,9 +42,11 @@ public: memset(data, 0, sizeof(data)); } - friend inline bool operator==(const base_blob& a, const base_blob& b) { return memcmp(a.data, b.data, sizeof(a.data)) == 0; } - friend inline bool operator!=(const base_blob& a, const base_blob& b) { return memcmp(a.data, b.data, sizeof(a.data)) != 0; } - friend inline bool operator<(const base_blob& a, const base_blob& b) { return memcmp(a.data, b.data, sizeof(a.data)) < 0; } + inline int Compare(const base_blob& other) const { return memcmp(data, other.data, sizeof(data)); } + + friend inline bool operator==(const base_blob& a, const base_blob& b) { return a.Compare(b) == 0; } + friend inline bool operator!=(const base_blob& a, const base_blob& b) { return a.Compare(b) != 0; } + friend inline bool operator<(const base_blob& a, const base_blob& b) { return a.Compare(b) < 0; } std::string GetHex() const; void SetHex(const char* psz); |