From 9ef79dd2f510a2884f735521baf98dc3bc3d597c Mon Sep 17 00:00:00 2001 From: Dentomologist Date: Sat, 12 Aug 2023 14:35:24 -0700 Subject: [PATCH] IOS: Remove unused member variable from SharedContentMap and UIDSys Resolve unused-private-field warnings on Android. --- Source/Core/Core/IOS/ES/Formats.cpp | 4 ++-- Source/Core/Core/IOS/ES/Formats.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/IOS/ES/Formats.cpp b/Source/Core/Core/IOS/ES/Formats.cpp index 6c263e98b4..4fafcf860d 100644 --- a/Source/Core/Core/IOS/ES/Formats.cpp +++ b/Source/Core/Core/IOS/ES/Formats.cpp @@ -554,7 +554,7 @@ struct SharedContentMap::Entry }; constexpr char CONTENT_MAP_PATH[] = "/shared1/content.map"; -SharedContentMap::SharedContentMap(HLE::FSCore& fs_core) : m_fs_core{fs_core}, m_fs{fs_core.GetFS()} +SharedContentMap::SharedContentMap(HLE::FSCore& fs_core) : m_fs{fs_core.GetFS()} { static_assert(sizeof(Entry) == 28, "SharedContentMap::Entry has the wrong size"); @@ -650,7 +650,7 @@ static std::pair ReadUidSysEntry(HLE::FSCore& fs, u64 fd, u64* ticks) } constexpr char UID_MAP_PATH[] = "/sys/uid.sys"; -UIDSys::UIDSys(HLE::FSCore& fs_core) : m_fs_core{fs_core}, m_fs{fs_core.GetFS()} +UIDSys::UIDSys(HLE::FSCore& fs_core) : m_fs{fs_core.GetFS()} { if (const auto fd = fs_core.Open(PID_KERNEL, PID_KERNEL, UID_MAP_PATH, HLE::FS::Mode::Read, {}, &m_ticks); diff --git a/Source/Core/Core/IOS/ES/Formats.h b/Source/Core/Core/IOS/ES/Formats.h index 56704e9caa..a3d920e759 100644 --- a/Source/Core/Core/IOS/ES/Formats.h +++ b/Source/Core/Core/IOS/ES/Formats.h @@ -296,7 +296,6 @@ private: struct Entry; u32 m_last_id = 0; std::vector m_entries; - HLE::FSCore& m_fs_core; std::shared_ptr m_fs; u64 m_ticks = 0; }; @@ -313,7 +312,6 @@ public: u64 GetTicks() const { return m_ticks; } private: - HLE::FSCore& m_fs_core; std::shared_ptr m_fs; std::map m_entries; u64 m_ticks = 0;