diff options
| author |  bunnei | 2018-04-30 10:15:27 -0400 |
|---|---|---|
| committer |  GitHub | 2018-04-30 10:15:27 -0400 |
| commit | f362cf46eed346db79c15ca195d652dff8c48c21 (patch) | |
| tree | ed7367dd74a937809d9501b2d848e8e981b538ba /src/core/hle/kernel/thread.cpp | |
| parent | Merge pull request #424 from lioncash/string (diff) | |
| parent | core_timing: Namespace all functions and constants in core_timing's header (diff) | |
| download | yuzu-f362cf46eed346db79c15ca195d652dff8c48c21.tar.gz yuzu-f362cf46eed346db79c15ca195d652dff8c48c21.tar.xz yuzu-f362cf46eed346db79c15ca195d652dff8c48c21.zip | |
Merge pull request #425 from lioncash/namespace
core_timing: Namespace all functions and constants in core_timing's header
Diffstat (limited to 'src/core/hle/kernel/thread.cpp')
| -rw-r--r-- | src/core/hle/kernel/thread.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index 63790ea00..1bd5d9ebf 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp | |||
| @@ -146,7 +146,8 @@ void Thread::WakeAfterDelay(s64 nanoseconds) { | |||
| 146 | if (nanoseconds == -1) | 146 | if (nanoseconds == -1) |
| 147 | return; | 147 | return; |
| 148 | 148 | ||
| 149 | CoreTiming::ScheduleEvent(nsToCycles(nanoseconds), ThreadWakeupEventType, callback_handle); | 149 | CoreTiming::ScheduleEvent(CoreTiming::nsToCycles(nanoseconds), ThreadWakeupEventType, |
| 150 | callback_handle); | ||
| 150 | } | 151 | } |
| 151 | 152 | ||
| 152 | void Thread::CancelWakeupTimer() { | 153 | void Thread::CancelWakeupTimer() { |