diff options
author | Morph <39850852+Morph1984@users.noreply.github.com> | 2022-02-05 06:40:48 +0100 |
---|---|---|
committer | Morph <39850852+Morph1984@users.noreply.github.com> | 2022-02-05 19:18:46 +0100 |
commit | ee0547e4c4d38d681d9cd3b9f7071c4dade9110d (patch) | |
tree | 9833fb69b1bd34105ea7d43dc74977c0c88e9fb3 /src/core/hle/service/mii/mii_manager.h | |
parent | input/hid: Migrate to the new UUID implementation (diff) | |
download | yuzu-ee0547e4c4d38d681d9cd3b9f7071c4dade9110d.tar yuzu-ee0547e4c4d38d681d9cd3b9f7071c4dade9110d.tar.gz yuzu-ee0547e4c4d38d681d9cd3b9f7071c4dade9110d.tar.bz2 yuzu-ee0547e4c4d38d681d9cd3b9f7071c4dade9110d.tar.lz yuzu-ee0547e4c4d38d681d9cd3b9f7071c4dade9110d.tar.xz yuzu-ee0547e4c4d38d681d9cd3b9f7071c4dade9110d.tar.zst yuzu-ee0547e4c4d38d681d9cd3b9f7071c4dade9110d.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/mii/mii_manager.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/service/mii/mii_manager.h b/src/core/hle/service/mii/mii_manager.h index 8e048fc56..580a64fc9 100644 --- a/src/core/hle/service/mii/mii_manager.h +++ b/src/core/hle/service/mii/mii_manager.h @@ -8,7 +8,7 @@ #include <vector> #include "common/bit_field.h" #include "common/common_funcs.h" -#include "common/uuid.h" +#include "common/new_uuid.h" #include "core/hle/result.h" #include "core/hle/service/mii/types.h" @@ -29,7 +29,7 @@ enum class SourceFlag : u32 { DECLARE_ENUM_FLAG_OPERATORS(SourceFlag); struct MiiInfo { - Common::UUID uuid; + Common::NewUUID uuid; std::array<char16_t, 11> name; u8 font_region; u8 favorite_color; @@ -192,7 +192,7 @@ struct MiiStoreData { MiiStoreData(); MiiStoreData(const Name& name, const MiiStoreBitFields& bit_fields, - const Common::UUID& user_id); + const Common::NewUUID& user_id); // This corresponds to the above structure MiiStoreBitFields. I did it like this because the // BitField<> type makes this (and any thing that contains it) not trivially copyable, which is @@ -202,7 +202,7 @@ struct MiiStoreData { static_assert(sizeof(MiiStoreBitFields) == sizeof(data), "data field has incorrect size."); Name name{}; - Common::UUID uuid{Common::INVALID_UUID}; + Common::NewUUID uuid{}; } data; u16 data_crc{}; @@ -326,7 +326,7 @@ public: ResultCode GetIndex(const MiiInfo& info, u32& index); private: - const Common::UUID user_id{Common::INVALID_UUID}; + const Common::NewUUID user_id{}; u64 update_counter{}; }; |