Browse Source
Merge pull request #2990 from lioncash/warn
core: Resolve -Wreorder warnings
pull/15/merge
Rodrigo Locatti
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
5 additions and
6 deletions
-
src/core/core.cpp
-
src/core/memory/cheat_engine.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(); |
|
|
|
|
|
|
|
@ -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<CheatEntry> TextCheatParser::Parse(const Core::System& system, |
|
|
|
|
|
|
|
CheatEngine::CheatEngine(Core::System& system, std::vector<CheatEntry> cheats, |
|
|
|
const std::array<u8, 0x20>& build_id) |
|
|
|
: system{system}, core_timing{system.CoreTiming()}, vm{std::make_unique<StandardVmCallbacks>( |
|
|
|
system, metadata)}, |
|
|
|
cheats(std::move(cheats)) { |
|
|
|
: vm{std::make_unique<StandardVmCallbacks>(system, metadata)}, |
|
|
|
cheats(std::move(cheats)), core_timing{system.CoreTiming()}, system{system} { |
|
|
|
metadata.main_nso_build_id = build_id; |
|
|
|
} |
|
|
|
|
|
|
|
|
