summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2020-11-18 08:09:05 +0100
committerLioncash <mathew1800@gmail.com>2020-11-18 08:09:08 +0100
commitaaf262bfed6eaeaf34d487059eed95e540636108 (patch)
treee85b167d6627ce4e88b8ab4992b86c2a413e16b5
parentcore: Make use of [[nodiscard]] with the System class (diff)
downloadyuzu-aaf262bfed6eaeaf34d487059eed95e540636108.tar
yuzu-aaf262bfed6eaeaf34d487059eed95e540636108.tar.gz
yuzu-aaf262bfed6eaeaf34d487059eed95e540636108.tar.bz2
yuzu-aaf262bfed6eaeaf34d487059eed95e540636108.tar.lz
yuzu-aaf262bfed6eaeaf34d487059eed95e540636108.tar.xz
yuzu-aaf262bfed6eaeaf34d487059eed95e540636108.tar.zst
yuzu-aaf262bfed6eaeaf34d487059eed95e540636108.zip
-rw-r--r--src/core/core.cpp12
-rw-r--r--src/core/core.h8
2 files changed, 4 insertions, 16 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index e33ed77cd..8d65a5d91 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);
}
@@ -752,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;
}
diff --git a/src/core/core.h b/src/core/core.h
index e1cc2975d..cd155625c 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -388,14 +388,6 @@ public:
private:
System();
- /**
- * Initialize the emulated system.
- * @param emu_window Reference to the host-system window used for video output and keyboard
- * input.
- * @return ResultStatus code, indicating if the operation succeeded.
- */
- [[nodiscard]] ResultStatus Init(Frontend::EmuWindow& emu_window);
-
struct Impl;
std::unique_ptr<Impl> impl;