diff options
author | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-10-14 20:21:15 +0200 |
---|---|---|
committer | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-10-15 23:34:48 +0200 |
commit | b6719094e69bba468ecbc275fd892c4d412b92a3 (patch) | |
tree | 633d5621300ec64c6ed2a2e7cfdff587d5462c0a /src/core/core.h | |
parent | Merge pull request #7183 from FearlessTobi/translation-ci (diff) | |
download | yuzu-b6719094e69bba468ecbc275fd892c4d412b92a3.tar yuzu-b6719094e69bba468ecbc275fd892c4d412b92a3.tar.gz yuzu-b6719094e69bba468ecbc275fd892c4d412b92a3.tar.bz2 yuzu-b6719094e69bba468ecbc275fd892c4d412b92a3.tar.lz yuzu-b6719094e69bba468ecbc275fd892c4d412b92a3.tar.xz yuzu-b6719094e69bba468ecbc275fd892c4d412b92a3.tar.zst yuzu-b6719094e69bba468ecbc275fd892c4d412b92a3.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/core.h | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/core/core.h b/src/core/core.h index a796472b2..cae578c69 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -108,22 +108,16 @@ class System { public: using CurrentBuildProcessID = std::array<u8, 0x20>; + explicit System(); + + ~System(); + System(const System&) = delete; System& operator=(const System&) = delete; System(System&&) = delete; System& operator=(System&&) = delete; - ~System(); - - /** - * Gets the instance of the System singleton class. - * @returns Reference to the instance of the System singleton class. - */ - [[deprecated("Use of the global system instance is deprecated")]] static System& GetInstance(); - - static void InitializeGlobalInstance(); - /// Enumeration representing the return values of the System Initialize and Load process. enum class ResultStatus : u32 { Success, ///< Succeeded @@ -403,12 +397,8 @@ public: void ApplySettings(); private: - System(); - struct Impl; std::unique_ptr<Impl> impl; - - inline static std::unique_ptr<System> s_instance{}; }; } // namespace Core |