eden-emu/eden
14
3
Fork 4
Code Issues 3 Pull requests 2 Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #6869 from yzct12345/shiny-logs-in-the-fireplace

Browse source 
logging: Simplify and make thread-safe
This commit is contained in:
bunnei 2021-08-22 20:40:18 -07:00 • committed by GitHub
commit f3931fe2b5
8 changed files with 248 additions and 297 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/core/core.h
View file

@ -121,9 +121,14 @@ public:
* @returns Reference to the instance of the System singleton class.
*/
[[deprecated("Use of the global system instance is deprecated")]] static System& GetInstance() {
return s_instance;
if (!s_instance) {
abort();
}
return *s_instance;
}
static void InitializeGlobalInstance();
/// Enumeration representing the return values of the System Initialize and Load process.
enum class ResultStatus : u32 {
Success, ///< Succeeded
@ -393,7 +398,7 @@ private:
struct Impl;
std::unique_ptr<Impl> impl;
static System s_instance;
inline static std::unique_ptr<System> s_instance{};
};
} // namespace Core