diff options
author | Lioncash <mathew1800@gmail.com> | 2018-08-06 03:15:13 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-08-06 03:19:24 +0200 |
commit | d9815b523b4c53d7453e2fda2568d257a76ba56e (patch) | |
tree | ca5856a1658d7a7360c29b5e2ce5a8756d0ec5df /src/core | |
parent | Merge pull request #927 from bunnei/fix-texs (diff) | |
download | yuzu-d9815b523b4c53d7453e2fda2568d257a76ba56e.tar yuzu-d9815b523b4c53d7453e2fda2568d257a76ba56e.tar.gz yuzu-d9815b523b4c53d7453e2fda2568d257a76ba56e.tar.bz2 yuzu-d9815b523b4c53d7453e2fda2568d257a76ba56e.tar.lz yuzu-d9815b523b4c53d7453e2fda2568d257a76ba56e.tar.xz yuzu-d9815b523b4c53d7453e2fda2568d257a76ba56e.tar.zst yuzu-d9815b523b4c53d7453e2fda2568d257a76ba56e.zip |
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/core_timing.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index a1b6f96f1..b2e3a495a 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp @@ -141,7 +141,7 @@ void ScheduleEvent(s64 cycles_into_future, const EventType* event_type, u64 user ForceExceptionCheck(cycles_into_future); event_queue.emplace_back(Event{timeout, event_fifo_id++, userdata, event_type}); - std::push_heap(event_queue.begin(), event_queue.end(), std::greater<Event>()); + std::push_heap(event_queue.begin(), event_queue.end(), std::greater<>()); } void ScheduleEventThreadsafe(s64 cycles_into_future, const EventType* event_type, u64 userdata) { @@ -156,7 +156,7 @@ void UnscheduleEvent(const EventType* event_type, u64 userdata) { // Removing random items breaks the invariant so we have to re-establish it. if (itr != event_queue.end()) { event_queue.erase(itr, event_queue.end()); - std::make_heap(event_queue.begin(), event_queue.end(), std::greater<Event>()); + std::make_heap(event_queue.begin(), event_queue.end(), std::greater<>()); } } @@ -167,7 +167,7 @@ void RemoveEvent(const EventType* event_type) { // Removing random items breaks the invariant so we have to re-establish it. if (itr != event_queue.end()) { event_queue.erase(itr, event_queue.end()); - std::make_heap(event_queue.begin(), event_queue.end(), std::greater<Event>()); + std::make_heap(event_queue.begin(), event_queue.end(), std::greater<>()); } } @@ -190,7 +190,7 @@ void MoveEvents() { for (Event ev; ts_queue.Pop(ev);) { ev.fifo_order = event_fifo_id++; event_queue.emplace_back(std::move(ev)); - std::push_heap(event_queue.begin(), event_queue.end(), std::greater<Event>()); + std::push_heap(event_queue.begin(), event_queue.end(), std::greater<>()); } } @@ -205,7 +205,7 @@ void Advance() { while (!event_queue.empty() && event_queue.front().time <= global_timer) { Event evt = std::move(event_queue.front()); - std::pop_heap(event_queue.begin(), event_queue.end(), std::greater<Event>()); + 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)); } |