summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2022-02-10 21:03:49 +0100
committerMorph <39850852+Morph1984@users.noreply.github.com>2022-02-10 21:03:49 +0100
commit3799c820ca7c5b978d47be9c5ac1318333e5d9cb (patch)
tree757ae4c22d01cc08dc5b04400215b957ac0fb8cb
parentcommon: uuid: Return an invalid UUID if conversion from string fails (diff)
downloadyuzu-3799c820ca7c5b978d47be9c5ac1318333e5d9cb.tar
yuzu-3799c820ca7c5b978d47be9c5ac1318333e5d9cb.tar.gz
yuzu-3799c820ca7c5b978d47be9c5ac1318333e5d9cb.tar.bz2
yuzu-3799c820ca7c5b978d47be9c5ac1318333e5d9cb.tar.lz
yuzu-3799c820ca7c5b978d47be9c5ac1318333e5d9cb.tar.xz
yuzu-3799c820ca7c5b978d47be9c5ac1318333e5d9cb.tar.zst
yuzu-3799c820ca7c5b978d47be9c5ac1318333e5d9cb.zip
-rw-r--r--src/common/uuid.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/common/uuid.cpp b/src/common/uuid.cpp
index 4aab10e08..2b6a530e3 100644
--- a/src/common/uuid.cpp
+++ b/src/common/uuid.cpp
@@ -160,13 +160,13 @@ std::string UUID::FormattedString() const {
}
size_t UUID::Hash() const noexcept {
- u64 hash;
- u64 temp;
+ u64 upper_hash;
+ u64 lower_hash;
- std::memcpy(&hash, uuid.data(), sizeof(u64));
- std::memcpy(&temp, uuid.data() + 8, sizeof(u64));
+ std::memcpy(&upper_hash, uuid.data(), sizeof(u64));
+ std::memcpy(&lower_hash, uuid.data() + sizeof(u64), sizeof(u64));
- return hash ^ std::rotl(temp, 1);
+ return upper_hash ^ std::rotl(lower_hash, 1);
}
u128 UUID::AsU128() const {