diff options
| author | bunnei <bunneidev@gmail.com> | 2020-07-27 19:29:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-27 19:29:22 -0700 |
| commit | 05781ce8c4dd4d4150185effac56ef9a71ae2705 (patch) | |
| tree | 12d41a29b43577b95b158bc033aadc3957bde3d7 /src/core/hle/kernel/kernel.cpp | |
| parent | 312c3788df6274d5bc39d7d0606fd0d90e65d698 (diff) | |
| parent | a7af349daee85237384dba07533c9a407cf15592 (diff) | |
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 { void InitializePreemption(KernelCore& kernel) { preemption_event = Core::Timing::CreateEvent( - "PreemptionCallback", [this, &kernel](u64, std::chrono::nanoseconds) { + "PreemptionCallback", [this, &kernel](std::uintptr_t, std::chrono::nanoseconds) { { SchedulerLock lock(kernel); global_scheduler.PreemptThreads(); |