mirror of
https://git.suyu.dev/suyu/suyu.git
synced 2024-11-26 13:26:30 -05:00
Merge pull request #2990 from lioncash/warn
core: Resolve -Wreorder warnings
This commit is contained in:
commit
7398466c33
2 changed files with 5 additions and 6 deletions
|
@ -112,8 +112,8 @@ FileSys::VirtualFile GetGameFileFromPath(const FileSys::VirtualFilesystem& vfs,
|
||||||
}
|
}
|
||||||
struct System::Impl {
|
struct System::Impl {
|
||||||
explicit Impl(System& system)
|
explicit Impl(System& system)
|
||||||
: kernel{system}, fs_controller{system}, cpu_core_manager{system},
|
: kernel{system}, fs_controller{system}, cpu_core_manager{system}, reporter{system},
|
||||||
applet_manager{system}, reporter{system} {}
|
applet_manager{system} {}
|
||||||
|
|
||||||
Cpu& CurrentCpuCore() {
|
Cpu& CurrentCpuCore() {
|
||||||
return cpu_core_manager.GetCurrentCore();
|
return cpu_core_manager.GetCurrentCore();
|
||||||
|
|
|
@ -22,7 +22,7 @@ constexpr u32 KEYPAD_BITMASK = 0x3FFFFFF;
|
||||||
|
|
||||||
StandardVmCallbacks::StandardVmCallbacks(const Core::System& system,
|
StandardVmCallbacks::StandardVmCallbacks(const Core::System& system,
|
||||||
const CheatProcessMetadata& metadata)
|
const CheatProcessMetadata& metadata)
|
||||||
: system(system), metadata(metadata) {}
|
: metadata(metadata), system(system) {}
|
||||||
|
|
||||||
StandardVmCallbacks::~StandardVmCallbacks() = default;
|
StandardVmCallbacks::~StandardVmCallbacks() = default;
|
||||||
|
|
||||||
|
@ -176,9 +176,8 @@ std::vector<CheatEntry> TextCheatParser::Parse(const Core::System& system,
|
||||||
|
|
||||||
CheatEngine::CheatEngine(Core::System& system, std::vector<CheatEntry> cheats,
|
CheatEngine::CheatEngine(Core::System& system, std::vector<CheatEntry> cheats,
|
||||||
const std::array<u8, 0x20>& build_id)
|
const std::array<u8, 0x20>& build_id)
|
||||||
: system{system}, core_timing{system.CoreTiming()}, vm{std::make_unique<StandardVmCallbacks>(
|
: vm{std::make_unique<StandardVmCallbacks>(system, metadata)},
|
||||||
system, metadata)},
|
cheats(std::move(cheats)), core_timing{system.CoreTiming()}, system{system} {
|
||||||
cheats(std::move(cheats)) {
|
|
||||||
metadata.main_nso_build_id = build_id;
|
metadata.main_nso_build_id = build_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue