diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2022-02-05 00:40:28 -0500 |
|---|---|---|
| committer | Morph <39850852+Morph1984@users.noreply.github.com> | 2022-02-05 13:18:41 -0500 |
| commit | cb30fe50cd074fe05dd1d6e4b0d58116d3d98489 (patch) | |
| tree | 58450d743d317369266bbbea44734725d8b83ea6 /src/input_common/input_engine.h | |
| parent | 3271099fea41d5adc0003c02c8481b334772296a (diff) | |
input/hid: Migrate to the new UUID implementation
Diffstat (limited to 'src/input_common/input_engine.h')
| -rw-r--r-- | src/input_common/input_engine.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/input_common/input_engine.h b/src/input_common/input_engine.h index fe2faee5a5..05e45b8771 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<PadIdentifier> { 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<u64>(pad_id.port) << 32); hash_value ^= static_cast<u64>(pad_id.pad); return static_cast<size_t>(hash_value); |