diff options
| author | bunnei <bunneidev@gmail.com> | 2019-03-25 21:06:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-25 21:06:33 -0400 |
| commit | 595511876e9669c09c7b60a2fa4a1164dc5d0e66 (patch) | |
| tree | dc2ab78d68f54f61d06fe0596d104cd16cbd3fbe /src/core/core_timing.cpp | |
| parent | 8a24a804c588867f51f7193581e0b4ddb5d9d7c2 (diff) | |
| parent | c5d41fd812d7eb1a04f36b76c08fe971cee0868c (diff) | |
Merge pull request #2287 from lioncash/coretiming-cb
core/core_timing: Make callback parameters consistent
Diffstat (limited to 'src/core/core_timing.cpp')
| -rw-r--r-- | src/core/core_timing.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index a0dd5db24..41adb2302 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp @@ -186,7 +186,7 @@ void CoreTiming::Advance() { Event evt = std::move(event_queue.front()); std::pop_heap(event_queue.begin(), event_queue.end(), std::greater<>()); event_queue.pop_back(); - evt.type->callback(evt.userdata, static_cast<int>(global_timer - evt.time)); + evt.type->callback(evt.userdata, global_timer - evt.time); } is_global_timer_sane = false; |