LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge #7712: Improve COutPoint less operator

Browse source 
0f17692 Improve COutPoint less operator (João Barbosa)
This commit is contained in:
Wladimir J. van der Laan 2016-03-21 12:50:09 +01:00
commit 3c27067dd2
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/primitives/transaction.h
View file

@ -34,7 +34,8 @@ public:
friend bool operator<(const COutPoint& a, const COutPoint& b) 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) friend bool operator==(const COutPoint& a, const COutPoint& b)

8
src/uint256.h
View file

@ -42,9 +42,11 @@ public:
memset(data, 0, sizeof(data)); 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; } 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 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 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; std::string GetHex() const;
void SetHex(const char* psz); void SetHex(const char* psz);