diff options
| author | River City Ransomware <richyateswebdesign@gmail.com> | 2018-01-19 18:01:41 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2018-01-19 18:01:41 -0500 |
| commit | dd62f125c359b37d71be6ccf873177c1a108d015 (patch) | |
| tree | 0d543402a25f4ba701dc547808b289daa0fc325b /src/core/core_timing.cpp | |
| parent | 7b219539a9a60d3ba6f13ba7802ca70a778869e7 (diff) | |
Fixes some cast warnings, partial port of citra #3064 (#106)
* Fixes some cast warnings, partially fixes citra #3064
* Converted casts to uint32_t to u32
* Ran clang-format
Diffstat (limited to 'src/core/core_timing.cpp')
| -rw-r--r-- | src/core/core_timing.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index a0656f0a82..9e1bf2d0e5 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; |