diff options
author | Rodrigo Locatti <reinuseslisp@airmail.cc> | 2020-11-24 04:26:59 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-24 04:26:59 -0300 |
commit | 410ed829224fb2babfa98f38a4f11f5c9a9ed43e (patch) | |
tree | f72de817aa84142c7bbb5420be86b859e97d039d /src/core/core.cpp | |
parent | 7afb7a9494a333d6baf51c24724dec3072238299 (diff) | |
parent | aaf262bfed6eaeaf34d487059eed95e540636108 (diff) |
Merge pull request #4942 from lioncash/system
core: Make use of [[nodiscard]] with the System class
Diffstat (limited to 'src/core/core.cpp')
-rw-r--r-- | src/core/core.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 9253e05b7..5accdc783 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -444,6 +444,10 @@ void System::InvalidateCpuInstructionCaches() { impl->kernel.InvalidateAllInstructionCaches(); } +void System::Shutdown() { + impl->Shutdown(); +} + System::ResultStatus System::Load(Frontend::EmuWindow& emu_window, const std::string& filepath) { return impl->Load(*this, emu_window, filepath); } @@ -632,7 +636,11 @@ const std::string& System::GetStatusDetails() const { return impl->status_details; } -Loader::AppLoader& System::GetAppLoader() const { +Loader::AppLoader& System::GetAppLoader() { + return *impl->app_loader; +} + +const Loader::AppLoader& System::GetAppLoader() const { return *impl->app_loader; } @@ -748,14 +756,6 @@ const System::CurrentBuildProcessID& System::GetCurrentProcessBuildID() const { return impl->build_id; } -System::ResultStatus System::Init(Frontend::EmuWindow& emu_window) { - return impl->Init(*this, emu_window); -} - -void System::Shutdown() { - impl->Shutdown(); -} - Service::SM::ServiceManager& System::ServiceManager() { return *impl->service_manager; } |