summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/scheduler.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/hle/kernel/scheduler.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/hle/kernel/scheduler.cpp')
-rw-r--r--src/core/hle/kernel/scheduler.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/kernel/scheduler.cpp b/src/core/hle/kernel/scheduler.cpp
index df4d6cf0a..9e2517e1b 100644
--- a/src/core/hle/kernel/scheduler.cpp
+++ b/src/core/hle/kernel/scheduler.cpp
@@ -111,7 +111,7 @@ void Scheduler::SwitchContext(Thread* new_thread) {
111 111
112void Scheduler::UpdateLastContextSwitchTime(Thread* thread, Process* process) { 112void Scheduler::UpdateLastContextSwitchTime(Thread* thread, Process* process) {
113 const u64 prev_switch_ticks = last_context_switch_time; 113 const u64 prev_switch_ticks = last_context_switch_time;
114 const u64 most_recent_switch_ticks = CoreTiming::GetTicks(); 114 const u64 most_recent_switch_ticks = Core::Timing::GetTicks();
115 const u64 update_ticks = most_recent_switch_ticks - prev_switch_ticks; 115 const u64 update_ticks = most_recent_switch_ticks - prev_switch_ticks;
116 116
117 if (thread != nullptr) { 117 if (thread != nullptr) {