wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 10:11:47 +02:00
Code Activity

Merge pull request #10901 from NixOS/backport-10900-to-2.23-maintenance

Browse source 
[Backport 2.23-maintenance] hash: Compare hash algo second for back compat
This commit is contained in:
Robert Hensing 2024-06-13 12:37:38 +02:00 • committed by GitHub
commit 560ca6f54f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libutil/hash.cc
View file

@ -52,11 +52,11 @@ bool Hash::operator == (const Hash & h2) const
std::strong_ordering Hash::operator <=> (const Hash & h) const std::strong_ordering Hash::operator <=> (const Hash & h) const
{ {
if (auto cmp = algo <=> h.algo; cmp != 0) return cmp;
if (auto cmp = hashSize <=> h.hashSize; cmp != 0) return cmp; if (auto cmp = hashSize <=> h.hashSize; cmp != 0) return cmp;
for (unsigned int i = 0; i < hashSize; i++) { for (unsigned int i = 0; i < hashSize; i++) {
if (auto cmp = hash[i] <=> h.hash[i]; cmp != 0) return cmp; if (auto cmp = hash[i] <=> h.hash[i]; cmp != 0) return cmp;
} }
if (auto cmp = algo <=> h.algo; cmp != 0) return cmp;
return std::strong_ordering::equivalent; return std::strong_ordering::equivalent;
} }