diff options
| author | 2020-07-27 19:29:22 -0700 | |
|---|---|---|
| committer | 2020-07-27 19:29:22 -0700 | |
| commit | 05781ce8c4dd4d4150185effac56ef9a71ae2705 (patch) | |
| tree | 12d41a29b43577b95b158bc033aadc3957bde3d7 /src/core/hle/kernel/kernel.cpp | |
| parent | Merge pull request #4420 from lat9nq/fix-themed-label-bg (diff) | |
| parent | core_timing: Make use of uintptr_t to represent user_data (diff) | |
| download | yuzu-05781ce8c4dd4d4150185effac56ef9a71ae2705.tar.gz yuzu-05781ce8c4dd4d4150185effac56ef9a71ae2705.tar.xz yuzu-05781ce8c4dd4d4150185effac56ef9a71ae2705.zip | |
Merge pull request #4437 from lioncash/ptr
core_timing: Make use of uintptr_t to represent user_data
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 8dd4a2637..cabe8d418 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -145,7 +145,7 @@ struct KernelCore::Impl { | |||
| 145 | 145 | ||
| 146 | void InitializePreemption(KernelCore& kernel) { | 146 | void InitializePreemption(KernelCore& kernel) { |
| 147 | preemption_event = Core::Timing::CreateEvent( | 147 | preemption_event = Core::Timing::CreateEvent( |
| 148 | "PreemptionCallback", [this, &kernel](u64, std::chrono::nanoseconds) { | 148 | "PreemptionCallback", [this, &kernel](std::uintptr_t, std::chrono::nanoseconds) { |
| 149 | { | 149 | { |
| 150 | SchedulerLock lock(kernel); | 150 | SchedulerLock lock(kernel); |
| 151 | global_scheduler.PreemptThreads(); | 151 | global_scheduler.PreemptThreads(); |