From cb30fe50cd074fe05dd1d6e4b0d58116d3d98489 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Sat, 5 Feb 2022 00:40:28 -0500 Subject: input/hid: Migrate to the new UUID implementation --- src/input_common/input_engine.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/input_common/input_engine.h') diff --git a/src/input_common/input_engine.h b/src/input_common/input_engine.h index fe2faee5a..05e45b877 100644 --- a/src/input_common/input_engine.h +++ b/src/input_common/input_engine.h @@ -10,13 +10,13 @@ #include "common/common_types.h" #include "common/input.h" +#include "common/new_uuid.h" #include "common/param_package.h" -#include "common/uuid.h" #include "input_common/main.h" // Pad Identifier of data source struct PadIdentifier { - Common::UUID guid{Common::INVALID_UUID}; + Common::NewUUID guid{}; std::size_t port{}; std::size_t pad{}; @@ -59,7 +59,7 @@ namespace std { template <> struct hash { size_t operator()(const PadIdentifier& pad_id) const noexcept { - u64 hash_value = pad_id.guid.uuid[1] ^ pad_id.guid.uuid[0]; + u64 hash_value = pad_id.guid.Hash(); hash_value ^= (static_cast(pad_id.port) << 32); hash_value ^= static_cast(pad_id.pad); return static_cast(hash_value); -- cgit v1.2.3