From d61cf96a263cb299e602304aaaeeed6aa50560e8 Mon Sep 17 00:00:00 2001 From: Hendrik Noeller Date: Tue, 11 Feb 2025 12:49:19 +0100 Subject: [PATCH] fix build errors in fifo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit “slots” is used as a keyword for Qt-specific C++ extensions --- include/farbot/detail/fifo.tcc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/farbot/detail/fifo.tcc b/include/farbot/detail/fifo.tcc index 9d938bf..ec5dfc3 100644 --- a/include/farbot/detail/fifo.tcc +++ b/include/farbot/detail/fifo.tcc @@ -31,7 +31,7 @@ struct multi_position_info return it->pos; auto pos = num_threads.fetch_add (1, std::memory_order_relaxed); - + if (pos >= MAX_THREADS) { assert (false); @@ -174,24 +174,24 @@ template (capacity)) + fifo_impl (int capacity) : _slots (static_cast(capacity)) { assert ((capacity & (capacity - 1)) == 0); } bool push(T&& result) { - return writer.push_or_pop (slots, std::move (result), reader.getpos() + static_cast (slots.size())); + return writer.push_or_pop (_slots, std::move (result), reader.getpos() + static_cast (_slots.size())); } bool pop(T& result) { - return reader.push_or_pop (slots, std::move (result), writer.getpos()); + return reader.push_or_pop (_slots, std::move (result), writer.getpos()); } private: //============================================================================== - std::vector slots = {}; + std::vector _slots = {}; read_or_writer reader; read_or_writer writer; @@ -203,7 +203,7 @@ template + std::size_t MAX_THREADS> fifo::fifo (int capacity) : impl (capacity) {} template