diff --git a/include/queue.h b/include/queue.h index 8da4fc4..49a530d 100644 --- a/include/queue.h +++ b/include/queue.h @@ -19,19 +19,19 @@ template > class queue { public: - using array_t = circ::elem_array; - using policy_t = typename array_t::policy_t; + using elems_t = circ::elem_array; + using policy_t = typename elems_t::policy_t; private: - array_t* elems_ = nullptr; - decltype(std::declval().cursor()) cursor_ = 0; + elems_t* elems_ = nullptr; + decltype(std::declval().cursor()) cursor_ = 0; std::atomic_bool connected_ { false }; public: queue() = default; - explicit queue(array_t* arr) : queue() { - attach(arr); + explicit queue(elems_t* els) : queue() { + attach(els); } queue(const queue&) = delete; @@ -39,7 +39,7 @@ public: queue(queue&&) = delete; queue& operator=(queue&&) = delete; - constexpr array_t * elems() const noexcept { + constexpr elems_t * elems() const noexcept { return elems_; } @@ -73,15 +73,15 @@ public: return connected_.load(std::memory_order_acquire); } - array_t* attach(array_t* arr) noexcept { - if (arr == nullptr) return nullptr; + elems_t* attach(elems_t* els) noexcept { + if (els == nullptr) return nullptr; auto old = elems_; - elems_ = arr; + elems_ = els; cursor_ = elems_->cursor(); return old; } - array_t* detach() noexcept { + elems_t* detach() noexcept { if (elems_ == nullptr) return nullptr; auto old = elems_; elems_ = nullptr; diff --git a/src/ipc.cpp b/src/ipc.cpp index cdd95fe..45b0deb 100644 --- a/src/ipc.cpp +++ b/src/ipc.cpp @@ -41,7 +41,7 @@ struct msg_t { using queue_t = ipc::queue; struct shm_info_t { - typename queue_t::array_t elems_; // the circ_elem_array in shm + typename queue_t::elems_t elems_; // the circ_elem_array in shm }; constexpr static void* head_of(queue_t* que) { diff --git a/test/test_circ.cpp b/test/test_circ.cpp index fcc3c6d..54fa1eb 100644 --- a/test/test_circ.cpp +++ b/test/test_circ.cpp @@ -166,7 +166,7 @@ struct test_cq> { template struct test_cq> { using cn_t = ipc::queue; - using ca_t = typename cn_t::array_t; + using ca_t = typename cn_t::elems_t; ca_t* ca_; @@ -386,9 +386,9 @@ void Unit::test_queue() { ipc::queue queue; queue.push(msg_t { 1, 2 }); QCOMPARE(queue.pop(), msg_t{}); - QVERIFY(sizeof(decltype(queue)::array_t) <= sizeof(*cq__)); + QVERIFY(sizeof(decltype(queue)::elems_t) <= sizeof(*cq__)); - auto cq = ::new (cq__) decltype(queue)::array_t; + auto cq = ::new (cq__) decltype(queue)::elems_t; queue.attach(cq); QVERIFY(queue.detach() != nullptr);