aboutsummaryrefslogtreecommitdiff
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorRodrigo Locatti <reinuseslisp@airmail.cc>2020-11-24 04:26:59 -0300
committerGitHub <noreply@github.com>2020-11-24 04:26:59 -0300
commit4f1f4ecef70a18d14e0e36b0c46bc1d12e9ff630 (patch)
treef72de817aa84142c7bbb5420be86b859e97d039d /src/core/core.cpp
parent2717355678ca37aff552d22b336b3d80a44424e1 (diff)
parent82ef99b10746079a17f7ffe46fab8da85558fb8a (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.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 9253e05b7c..5accdc783d 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;
}