diff options
author | bunnei <bunneidev@gmail.com> | 2019-02-12 19:26:37 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-12 19:26:37 -0500 |
commit | 8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4 (patch) | |
tree | 83c843cf14d53a45ed5aad3d60b00cecb9e6d20e /src/core/core.cpp | |
parent | c440ecfafe5204b22ec00d2ba8e0cd39464c6a1a (diff) | |
parent | 48d9d66dc585477d26b4cfbf1c4f71fd637b42ea (diff) |
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.cpp | 6 |
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 { ResultStatus Init(System& system, Frontend::EmuWindow& emu_window) { LOG_DEBUG(HW_Memory, "initialized OK"); - CoreTiming::Init(); + Timing::Init(); kernel.Initialize(); const auto current_time = std::chrono::duration_cast<std::chrono::seconds>( @@ -205,7 +205,7 @@ struct System::Impl { // Shutdown kernel and core timing kernel.Shutdown(); - CoreTiming::Shutdown(); + Timing::Shutdown(); // Close app loader app_loader.reset(); @@ -232,7 +232,7 @@ struct System::Impl { } PerfStatsResults GetAndResetPerfStats() { - return perf_stats.GetAndResetStats(CoreTiming::GetGlobalTimeUs()); + return perf_stats.GetAndResetStats(Timing::GetGlobalTimeUs()); } Kernel::KernelCore kernel; |