diff options
author | Zach Hilman <DarkLordZach@users.noreply.github.com> | 2019-06-05 15:52:37 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-05 15:52:37 -0400 |
commit | 81e09bb1213720c31b7881c9396385375dac5749 (patch) | |
tree | 06ea501a4f516ac82f1ac91f953d4325475940bc /src/core/hle/kernel | |
parent | 6aff1005efc98cd7d1ddab705f041bd60d40f51a (diff) | |
parent | 2548661c08e006c6a56f976a4ef1c05653b3c6db (diff) |
Merge pull request #2545 from lioncash/timing
core/core_timing_util: Use std::chrono types for specifying time units
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r-- | src/core/hle/kernel/thread.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index 2abf9efca..c73a40977 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -75,9 +75,9 @@ void Thread::WakeAfterDelay(s64 nanoseconds) { // This function might be called from any thread so we have to be cautious and use the // thread-safe version of ScheduleEvent. + const s64 cycles = Core::Timing::nsToCycles(std::chrono::nanoseconds{nanoseconds}); Core::System::GetInstance().CoreTiming().ScheduleEventThreadsafe( - Core::Timing::nsToCycles(nanoseconds), kernel.ThreadWakeupCallbackEventType(), - callback_handle); + cycles, kernel.ThreadWakeupCallbackEventType(), callback_handle); } void Thread::CancelWakeupTimer() { |