diff options
Diffstat (limited to 'src/core/core_timing.h')
| -rw-r--r-- | src/core/core_timing.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/core_timing.h b/src/core/core_timing.h index c20e906fb..26a8b93a7 100644 --- a/src/core/core_timing.h +++ b/src/core/core_timing.h | |||
| @@ -11,7 +11,8 @@ | |||
| 11 | #include <optional> | 11 | #include <optional> |
| 12 | #include <string> | 12 | #include <string> |
| 13 | #include <thread> | 13 | #include <thread> |
| 14 | #include <vector> | 14 | |
| 15 | #include <boost/heap/fibonacci_heap.hpp> | ||
| 15 | 16 | ||
| 16 | #include "common/common_types.h" | 17 | #include "common/common_types.h" |
| 17 | #include "common/thread.h" | 18 | #include "common/thread.h" |
| @@ -151,11 +152,10 @@ private: | |||
| 151 | s64 timer_resolution_ns; | 152 | s64 timer_resolution_ns; |
| 152 | #endif | 153 | #endif |
| 153 | 154 | ||
| 154 | // The queue is a min-heap using std::make_heap/push_heap/pop_heap. | 155 | using heap_t = |
| 155 | // We don't use std::priority_queue because we need to be able to serialize, unserialize and | 156 | boost::heap::fibonacci_heap<CoreTiming::Event, boost::heap::compare<std::greater<>>>; |
| 156 | // erase arbitrary events (RemoveEvent()) regardless of the queue order. These aren't | 157 | |
| 157 | // accommodated by the standard adaptor class. | 158 | heap_t event_queue; |
| 158 | std::vector<Event> event_queue; | ||
| 159 | u64 event_fifo_id = 0; | 159 | u64 event_fifo_id = 0; |
| 160 | 160 | ||
| 161 | std::shared_ptr<EventType> ev_lost; | 161 | std::shared_ptr<EventType> ev_lost; |