summaryrefslogtreecommitdiffstats
path: root/src/core/core_timing.cpp
diff options
context:
space:
mode:
authorRiver City Ransomware <richyateswebdesign@gmail.com>2018-01-20 00:01:41 +0100
committerbunnei <bunneidev@gmail.com>2018-01-20 00:01:41 +0100
commitdd62f125c359b37d71be6ccf873177c1a108d015 (patch)
tree0d543402a25f4ba701dc547808b289daa0fc325b /src/core/core_timing.cpp
parentMerge pull request #112 from Rozelette/master (diff)
downloadyuzu-dd62f125c359b37d71be6ccf873177c1a108d015.tar
yuzu-dd62f125c359b37d71be6ccf873177c1a108d015.tar.gz
yuzu-dd62f125c359b37d71be6ccf873177c1a108d015.tar.bz2
yuzu-dd62f125c359b37d71be6ccf873177c1a108d015.tar.lz
yuzu-dd62f125c359b37d71be6ccf873177c1a108d015.tar.xz
yuzu-dd62f125c359b37d71be6ccf873177c1a108d015.tar.zst
yuzu-dd62f125c359b37d71be6ccf873177c1a108d015.zip
Diffstat (limited to '')
-rw-r--r--src/core/core_timing.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp
index a0656f0a8..9e1bf2d0e 100644
--- a/src/core/core_timing.cpp
+++ b/src/core/core_timing.cpp
@@ -122,7 +122,7 @@ u64 GetTicks() {
}
void AddTicks(u64 ticks) {
- downcount -= ticks;
+ downcount -= static_cast<int>(ticks);
}
u64 GetIdleTicks() {
@@ -208,7 +208,7 @@ void Advance() {
Event evt = std::move(event_queue.front());
std::pop_heap(event_queue.begin(), event_queue.end(), std::greater<Event>());
event_queue.pop_back();
- evt.type->callback(evt.userdata, global_timer - evt.time);
+ evt.type->callback(evt.userdata, static_cast<int>(global_timer - evt.time));
}
is_global_timer_sane = false;