mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-10 00:08:07 +02:00
Merge pull request #10833 from obsidiansystems/hash-ordering
Modernize `Hash` ordering with C++20 `<=>`
This commit is contained in:
commit
4e62629a2d
2 changed files with 8 additions and 20 deletions
|
@ -50,21 +50,14 @@ bool Hash::operator == (const Hash & h2) const
|
|||
}
|
||||
|
||||
|
||||
bool Hash::operator != (const Hash & h2) const
|
||||
std::strong_ordering Hash::operator <=> (const Hash & h) const
|
||||
{
|
||||
return !(*this == h2);
|
||||
}
|
||||
|
||||
|
||||
bool Hash::operator < (const Hash & h) const
|
||||
{
|
||||
if (hashSize < h.hashSize) return true;
|
||||
if (hashSize > h.hashSize) return false;
|
||||
if (auto cmp = algo <=> h.algo; cmp != 0) return cmp;
|
||||
if (auto cmp = hashSize <=> h.hashSize; cmp != 0) return cmp;
|
||||
for (unsigned int i = 0; i < hashSize; i++) {
|
||||
if (hash[i] < h.hash[i]) return true;
|
||||
if (hash[i] > h.hash[i]) return false;
|
||||
if (auto cmp = hash[i] <=> h.hash[i]; cmp != 0) return cmp;
|
||||
}
|
||||
return false;
|
||||
return std::strong_ordering::equivalent;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -86,19 +86,14 @@ private:
|
|||
|
||||
public:
|
||||
/**
|
||||
* Check whether two hash are equal.
|
||||
* Check whether two hashes are equal.
|
||||
*/
|
||||
bool operator == (const Hash & h2) const;
|
||||
|
||||
/**
|
||||
* Check whether two hash are not equal.
|
||||
* Compare how two hashes are ordered.
|
||||
*/
|
||||
bool operator != (const Hash & h2) const;
|
||||
|
||||
/**
|
||||
* For sorting.
|
||||
*/
|
||||
bool operator < (const Hash & h) const;
|
||||
std::strong_ordering operator <=> (const Hash & h2) const;
|
||||
|
||||
/**
|
||||
* Returns the length of a base-16 representation of this hash.
|
||||
|
|
Loading…
Reference in a new issue