summaryrefslogtreecommitdiff
path: root/src/core/core_timing.cpp
diff options
context:
space:
mode:
authorGravatar Lioncash2019-03-24 18:11:32 -0400
committerGravatar Lioncash2019-03-24 18:12:17 -0400
commitc5d41fd812d7eb1a04f36b76c08fe971cee0868c (patch)
tree420a9ba00464d14b55e4346ae3951c61f7999cdc /src/core/core_timing.cpp
parentMerge pull request #2232 from lioncash/transfer-memory (diff)
downloadyuzu-c5d41fd812d7eb1a04f36b76c08fe971cee0868c.tar.gz
yuzu-c5d41fd812d7eb1a04f36b76c08fe971cee0868c.tar.xz
yuzu-c5d41fd812d7eb1a04f36b76c08fe971cee0868c.zip
core/core_timing: Make callback parameters consistent
In some cases, our callbacks were using s64 as a parameter, and in other cases, they were using an int, which is inconsistent. To make all callbacks consistent, we can just use an s64 as the type for late cycles, given it gets rid of the need to cast internally. While we're at it, also resolve some signed/unsigned conversions that were occurring related to the callback registration.
Diffstat (limited to 'src/core/core_timing.cpp')
-rw-r--r--src/core/core_timing.cpp2
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() {
186 Event evt = std::move(event_queue.front()); 186 Event evt = std::move(event_queue.front());
187 std::pop_heap(event_queue.begin(), event_queue.end(), std::greater<>()); 187 std::pop_heap(event_queue.begin(), event_queue.end(), std::greater<>());
188 event_queue.pop_back(); 188 event_queue.pop_back();
189 evt.type->callback(evt.userdata, static_cast<int>(global_timer - evt.time)); 189 evt.type->callback(evt.userdata, global_timer - evt.time);
190 } 190 }
191 191
192 is_global_timer_sane = false; 192 is_global_timer_sane = false;