From 6414d9e2e5f621710169f68f300cc6641c5e74a9 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 17 Oct 2019 16:21:45 -0400 Subject: [PATCH 1/2] core/memory/cheat_engine: Resolve -Wreorder warnings Amends the initializer lists to be ordered in the same manner that they're declared within the class. --- src/core/memory/cheat_engine.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/core/memory/cheat_engine.cpp b/src/core/memory/cheat_engine.cpp index b56cb06277..10821d4527 100644 --- a/src/core/memory/cheat_engine.cpp +++ b/src/core/memory/cheat_engine.cpp @@ -22,7 +22,7 @@ constexpr u32 KEYPAD_BITMASK = 0x3FFFFFF; StandardVmCallbacks::StandardVmCallbacks(const Core::System& system, const CheatProcessMetadata& metadata) - : system(system), metadata(metadata) {} + : metadata(metadata), system(system) {} StandardVmCallbacks::~StandardVmCallbacks() = default; @@ -176,9 +176,8 @@ std::vector TextCheatParser::Parse(const Core::System& system, CheatEngine::CheatEngine(Core::System& system, std::vector cheats, const std::array& build_id) - : system{system}, core_timing{system.CoreTiming()}, vm{std::make_unique( - system, metadata)}, - cheats(std::move(cheats)) { + : vm{std::make_unique(system, metadata)}, + cheats(std::move(cheats)), core_timing{system.CoreTiming()}, system{system} { metadata.main_nso_build_id = build_id; } From 98c6a9507982de0f6577bb18429f07facb0e465f Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 17 Oct 2019 16:24:19 -0400 Subject: [PATCH 2/2] core/core: Resolve -Wreorder warnings Amends the initializer lists to be ordered in the same manner that they're declared within the class. --- src/core/core.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/core.cpp b/src/core/core.cpp index ddc767e301..a30253c50c 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -112,8 +112,8 @@ FileSys::VirtualFile GetGameFileFromPath(const FileSys::VirtualFilesystem& vfs, } struct System::Impl { explicit Impl(System& system) - : kernel{system}, fs_controller{system}, cpu_core_manager{system}, - applet_manager{system}, reporter{system} {} + : kernel{system}, fs_controller{system}, cpu_core_manager{system}, reporter{system}, + applet_manager{system} {} Cpu& CurrentCpuCore() { return cpu_core_manager.GetCurrentCore();