summaryrefslogtreecommitdiff
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2019-02-12 19:26:37 -0500
committerGravatar GitHub2019-02-12 19:26:37 -0500
commit8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4 (patch)
tree83c843cf14d53a45ed5aad3d60b00cecb9e6d20e /src/core/core.cpp
parentMerge pull request #2104 from ReinUsesLisp/compute-assert (diff)
parentcore_timing: Rename CoreTiming namespace to Core::Timing (diff)
downloadyuzu-8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4.tar.gz
yuzu-8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4.tar.xz
yuzu-8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4.zip
Merge pull request #2110 from lioncash/namespace
core_timing: Rename CoreTiming namespace to Core::Timing
Diffstat (limited to 'src/core/core.cpp')
-rw-r--r--src/core/core.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 1dd576c26..4d9d21ee4 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -94,7 +94,7 @@ struct System::Impl {
94 ResultStatus Init(System& system, Frontend::EmuWindow& emu_window) { 94 ResultStatus Init(System& system, Frontend::EmuWindow& emu_window) {
95 LOG_DEBUG(HW_Memory, "initialized OK"); 95 LOG_DEBUG(HW_Memory, "initialized OK");
96 96
97 CoreTiming::Init(); 97 Timing::Init();
98 kernel.Initialize(); 98 kernel.Initialize();
99 99
100 const auto current_time = std::chrono::duration_cast<std::chrono::seconds>( 100 const auto current_time = std::chrono::duration_cast<std::chrono::seconds>(
@@ -205,7 +205,7 @@ struct System::Impl {
205 205
206 // Shutdown kernel and core timing 206 // Shutdown kernel and core timing
207 kernel.Shutdown(); 207 kernel.Shutdown();
208 CoreTiming::Shutdown(); 208 Timing::Shutdown();
209 209
210 // Close app loader 210 // Close app loader
211 app_loader.reset(); 211 app_loader.reset();
@@ -232,7 +232,7 @@ struct System::Impl {
232 } 232 }
233 233
234 PerfStatsResults GetAndResetPerfStats() { 234 PerfStatsResults GetAndResetPerfStats() {
235 return perf_stats.GetAndResetStats(CoreTiming::GetGlobalTimeUs()); 235 return perf_stats.GetAndResetStats(Timing::GetGlobalTimeUs());
236 } 236 }
237 237
238 Kernel::KernelCore kernel; 238 Kernel::KernelCore kernel;