diff options
| author |  bunnei | 2019-02-13 21:41:25 -0500 |
|---|---|---|
| committer |  GitHub | 2019-02-13 21:41:25 -0500 |
| commit | f0c4ac9abd75af3d3f1aebb6d60f8a27663a6a5c (patch) | |
| tree | 81f2416a1735d9f01022b4d905eb4d1db7baa304 /src/core/core_timing.cpp | |
| parent | Merge pull request #2099 from greggameplayer/BGRA8-Framebuffer-Real (diff) | |
| parent | threadsafe_queue: Use std::size_t for representing size (diff) | |
| download | yuzu-f0c4ac9abd75af3d3f1aebb6d60f8a27663a6a5c.tar.gz yuzu-f0c4ac9abd75af3d3f1aebb6d60f8a27663a6a5c.tar.xz yuzu-f0c4ac9abd75af3d3f1aebb6d60f8a27663a6a5c.zip | |
Merge pull request #2116 from lioncash/size
threadsafe_queue: Remove NeedSize template parameter
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 2b7ca9766..0308030c5 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp | |||
| @@ -54,10 +54,10 @@ static std::vector<Event> event_queue; | |||
| 54 | static u64 event_fifo_id; | 54 | static u64 event_fifo_id; |
| 55 | // the queue for storing the events from other threads threadsafe until they will be added | 55 | // the queue for storing the events from other threads threadsafe until they will be added |
| 56 | // to the event_queue by the emu thread | 56 | // to the event_queue by the emu thread |
| 57 | static Common::MPSCQueue<Event, false> ts_queue; | 57 | static Common::MPSCQueue<Event> ts_queue; |
| 58 | 58 | ||
| 59 | // the queue for unscheduling the events from other threads threadsafe | 59 | // the queue for unscheduling the events from other threads threadsafe |
| 60 | static Common::MPSCQueue<std::pair<const EventType*, u64>, false> unschedule_queue; | 60 | static Common::MPSCQueue<std::pair<const EventType*, u64>> unschedule_queue; |
| 61 | 61 | ||
| 62 | constexpr int MAX_SLICE_LENGTH = 20000; | 62 | constexpr int MAX_SLICE_LENGTH = 20000; |
| 63 | 63 | ||