diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-10-14 14:21:15 -0400 |
|---|---|---|
| committer | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-10-15 17:34:48 -0400 |
| commit | b6719094e69bba468ecbc275fd892c4d412b92a3 (patch) | |
| tree | 633d5621300ec64c6ed2a2e7cfdff587d5462c0a /src/core/core.h | |
| parent | 2a5014b1936887ae1826a74efaefafca1bca0cae (diff) | |
core: Remove static system instance
Diffstat (limited to 'src/core/core.h')
| -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 a796472b22..cae578c69c 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 |