From 69f16ba50e3c52a17405670b976ac4ba63f58021 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 6 Oct 2019 13:02:23 -0400 Subject: hle/service: Replace global system instance calls with instance-based ones Migrates the HLE service code off the use of directly accessing the global system instance where trivially able to do so. This removes all usages of Core::CurrentProcess from the service code, only 8 occurrences of this function exist elsewhere. There's still quite a bit of "System::GetInstance()" being used, however this was able to replace a few instances. --- src/core/core.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/core/core.h') diff --git a/src/core/core.h b/src/core/core.h index f49b7fbf9..fecfdb959 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -98,6 +98,8 @@ FileSys::VirtualFile GetGameFileFromPath(const FileSys::VirtualFilesystem& vfs, class System { public: + using CurrentBuildProcessID = std::array; + System(const System&) = delete; System& operator=(const System&) = delete; @@ -330,9 +332,9 @@ public: bool GetExitLock() const; - void SetCurrentProcessBuildID(std::array id); + void SetCurrentProcessBuildID(const CurrentBuildProcessID& id); - const std::array& GetCurrentProcessBuildID() const; + const CurrentBuildProcessID& GetCurrentProcessBuildID() const; private: System(); -- cgit v1.2.3