diff options
| author | 2018-07-18 18:55:58 -0700 | |
|---|---|---|
| committer | 2018-07-18 18:55:58 -0700 | |
| commit | 49b0966003caeaafe2f5455d06b16175f02686fb (patch) | |
| tree | 141c8d3c09f9eca021dddedb17cdc3cc6607a19a /src/core/core.cpp | |
| parent | Merge pull request #680 from bunnei/fix-swizz (diff) | |
| parent | core: Make System's default constructor private (diff) | |
| download | yuzu-49b0966003caeaafe2f5455d06b16175f02686fb.tar.gz yuzu-49b0966003caeaafe2f5455d06b16175f02686fb.tar.xz yuzu-49b0966003caeaafe2f5455d06b16175f02686fb.zip | |
Merge pull request #687 from lioncash/instance
core: Don't construct instance of Core::System, just to access its live instance
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 82db5cccf..9bd9f4bd9 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -26,11 +26,13 @@ namespace Core { | |||
| 26 | 26 | ||
| 27 | /*static*/ System System::s_instance; | 27 | /*static*/ System System::s_instance; |
| 28 | 28 | ||
| 29 | System::System() = default; | ||
| 30 | |||
| 29 | System::~System() = default; | 31 | System::~System() = default; |
| 30 | 32 | ||
| 31 | /// Runs a CPU core while the system is powered on | 33 | /// Runs a CPU core while the system is powered on |
| 32 | static void RunCpuCore(std::shared_ptr<Cpu> cpu_state) { | 34 | static void RunCpuCore(std::shared_ptr<Cpu> cpu_state) { |
| 33 | while (Core::System().GetInstance().IsPoweredOn()) { | 35 | while (Core::System::GetInstance().IsPoweredOn()) { |
| 34 | cpu_state->RunLoop(true); | 36 | cpu_state->RunLoop(true); |
| 35 | } | 37 | } |
| 36 | } | 38 | } |