iox-eclipse-iceoryx#1391 Move 'VariantQueue' to iceoryx_posh

EgorWeders · Jan 2, 2024 · e88f23b · e88f23b
1 parent 8c32765
commit e88f23b
Show file tree

Hide file tree

Showing 59 changed files with 83 additions and 115 deletions.
diff --git a/iceoryx_binding_c/source/c_client.cpp b/iceoryx_binding_c/source/c_client.cpp
@@ -24,7 +24,6 @@ using namespace iox;
 using namespace iox::popo;
 using namespace iox::runtime;
 using namespace iox::capro;
-using namespace iox::cxx;
 
 extern "C" {
 #include "iceoryx_binding_c/client.h"

diff --git a/iceoryx_binding_c/source/c_publisher.cpp b/iceoryx_binding_c/source/c_publisher.cpp
@@ -26,7 +26,6 @@
 
 
 using namespace iox;
-using namespace iox::cxx;
 using namespace iox::popo;
 using namespace iox::capro;
 using namespace iox::mepoo;

diff --git a/iceoryx_binding_c/source/c_request_header.cpp b/iceoryx_binding_c/source/c_request_header.cpp
@@ -20,7 +20,6 @@ using namespace iox;
 using namespace iox::popo;
 using namespace iox::runtime;
 using namespace iox::capro;
-using namespace iox::cxx;
 
 extern "C" {
 #include "iceoryx_binding_c/request_header.h"

diff --git a/iceoryx_binding_c/source/c_response_header.cpp b/iceoryx_binding_c/source/c_response_header.cpp
@@ -20,7 +20,6 @@ using namespace iox;
 using namespace iox::popo;
 using namespace iox::runtime;
 using namespace iox::capro;
-using namespace iox::cxx;
 
 extern "C" {
 #include "iceoryx_binding_c/response_header.h"

diff --git a/iceoryx_binding_c/source/c_server.cpp b/iceoryx_binding_c/source/c_server.cpp
@@ -24,7 +24,6 @@ using namespace iox;
 using namespace iox::popo;
 using namespace iox::runtime;
 using namespace iox::capro;
-using namespace iox::cxx;
 
 extern "C" {
 #include "iceoryx_binding_c/server.h"

diff --git a/iceoryx_binding_c/source/c_subscriber.cpp b/iceoryx_binding_c/source/c_subscriber.cpp
@@ -28,7 +28,6 @@
 
 
 using namespace iox;
-using namespace iox::cxx;
 using namespace iox::popo;
 using namespace iox::capro;
 using namespace iox::mepoo;

diff --git a/iceoryx_binding_c/test/moduletests/test_client.cpp b/iceoryx_binding_c/test/moduletests/test_client.cpp
@@ -28,7 +28,6 @@
 using namespace iox::popo;
 using namespace iox::capro;
 using namespace iox;
-using namespace iox::cxx;
 using namespace iox::testing;
 
 extern "C" {
@@ -117,7 +116,7 @@ class iox_client_test : public Test
     iox_client_storage_t sutStorage;
 
     ServerChunkQueueData_t serverChunkQueueData{iox::popo::QueueFullPolicy::DISCARD_OLDEST_DATA,
-                                                iox::cxx::VariantQueueTypes::SoFi_MultiProducerSingleConsumer};
+                                                iox::popo::VariantQueueTypes::SoFi_MultiProducerSingleConsumer};
     ChunkQueuePopper<ServerChunkQueueData_t> serverRequestQueue{&serverChunkQueueData};
 
     static constexpr const char SERVICE[] = "allGlory";

diff --git a/iceoryx_binding_c/test/moduletests/test_listener.cpp b/iceoryx_binding_c/test/moduletests/test_listener.cpp
@@ -141,7 +141,7 @@ class iox_listener_test : public Test
         m_subscriberPortData.resize(MAX_NUMBER_OF_EVENTS_PER_LISTENER + 1U,
                                     TEST_SERVICE_DESCRIPTION,
                                     "myApp",
-                                    iox::cxx::VariantQueueTypes::SoFi_SingleProducerSingleConsumer,
+                                    iox::popo::VariantQueueTypes::SoFi_SingleProducerSingleConsumer,
                                     subscriberOptions);
         m_subscriber.resize(MAX_NUMBER_OF_EVENTS_PER_LISTENER + 1U);
         for (uint64_t i = 0U; i < MAX_NUMBER_OF_EVENTS_PER_LISTENER + 1U; ++i)

diff --git a/iceoryx_binding_c/test/moduletests/test_notification_info.cpp b/iceoryx_binding_c/test/moduletests/test_notification_info.cpp
@@ -49,7 +49,6 @@ namespace
 {
 using namespace ::testing;
 using namespace iox::capro;
-using namespace iox::cxx;
 using namespace iox::mepoo;
 
 class iox_notification_info_test : public Test
@@ -115,7 +114,7 @@ class iox_notification_info_test : public Test
     SubscriberOptions m_subscriberOptions{MAX_CHUNKS_HELD_PER_SUBSCRIBER_SIMULTANEOUSLY, 0U};
     iox::popo::SubscriberPortData m_portPtr{TEST_TheHoff_DESCRIPTION,
                                             "myApp",
-                                            iox::cxx::VariantQueueTypes::SoFi_SingleProducerSingleConsumer,
+                                            iox::popo::VariantQueueTypes::SoFi_SingleProducerSingleConsumer,
                                             m_subscriberOptions};
     ChunkQueuePusher<SubscriberPortData::ChunkQueueData_t> m_chunkPusher{&m_portPtr.m_chunkReceiverData};
     cpp2c_Subscriber m_subscriber;

diff --git a/iceoryx_binding_c/test/moduletests/test_publisher.cpp b/iceoryx_binding_c/test/moduletests/test_publisher.cpp
@@ -44,7 +44,6 @@ using namespace ::testing;
 using namespace iox::testing;
 using namespace iox::roudi_env;
 using namespace iox::capro;
-using namespace iox::cxx;
 using namespace iox::mepoo;
 
 class iox_pub_test : public Test
@@ -103,7 +102,7 @@ class iox_pub_test : public Test
 
     using ChunkQueueData_t = popo::ChunkQueueData<DefaultChunkQueueConfig, popo::ThreadSafePolicy>;
     ChunkQueueData_t m_chunkQueueData{iox::popo::QueueFullPolicy::DISCARD_OLDEST_DATA,
-                                      iox::cxx::VariantQueueTypes::SoFi_SingleProducerSingleConsumer};
+                                      iox::popo::VariantQueueTypes::SoFi_SingleProducerSingleConsumer};
 
     BumpAllocator m_memoryAllocator{m_memory, MEMORY_SIZE};
     MePooConfig m_mempoolconf;

diff --git a/iceoryx_binding_c/test/moduletests/test_server.cpp b/iceoryx_binding_c/test/moduletests/test_server.cpp
@@ -28,7 +28,6 @@
 using namespace iox::popo;
 using namespace iox::capro;
 using namespace iox;
-using namespace iox::cxx;
 using namespace iox::testing;
 
 extern "C" {
@@ -111,7 +110,7 @@ class iox_server_test : public Test
     iox_server_storage_t sutStorage;
 
     ClientChunkQueueData_t clientResponseQueueData{iox::popo::QueueFullPolicy::DISCARD_OLDEST_DATA,
-                                                   iox::cxx::VariantQueueTypes::SoFi_MultiProducerSingleConsumer};
+                                                   iox::popo::VariantQueueTypes::SoFi_MultiProducerSingleConsumer};
     ChunkQueuePopper<ClientChunkQueueData_t> clientResponseQueue{&clientResponseQueueData};
 
     static constexpr const char SERVICE[] = "TheHoff";

diff --git a/iceoryx_binding_c/test/moduletests/test_subscriber.cpp b/iceoryx_binding_c/test/moduletests/test_subscriber.cpp
@@ -49,7 +49,6 @@ namespace
 {
 using namespace ::testing;
 using namespace iox::capro;
-using namespace iox::cxx;
 using namespace iox::mepoo;
 
 class iox_sub_test : public Test
@@ -114,7 +113,7 @@ class iox_sub_test : public Test
     iox::popo::SubscriberOptions subscriberOptions{MAX_CHUNKS_HELD_PER_SUBSCRIBER_SIMULTANEOUSLY, 0U};
     iox::popo::SubscriberPortData m_portPtr{TEST_SERVICE_DESCRIPTION,
                                             "myApp",
-                                            iox::cxx::VariantQueueTypes::SoFi_SingleProducerSingleConsumer,
+                                            iox::popo::VariantQueueTypes::SoFi_SingleProducerSingleConsumer,
                                             subscriberOptions};
     ChunkQueuePusher<SubscriberPortData::ChunkQueueData_t> m_chunkPusher{&m_portPtr.m_chunkReceiverData};
     std::unique_ptr<cpp2c_Subscriber> m_subscriber{new cpp2c_Subscriber};

diff --git a/iceoryx_binding_c/test/moduletests/test_wait_set.cpp b/iceoryx_binding_c/test/moduletests/test_wait_set.cpp
@@ -65,7 +65,7 @@ class iox_ws_test : public Test
         {
             m_portDataVector.emplace_back(TEST_SERVICE_DESCRIPTION,
                                           "someAppName",
-                                          iox::cxx::VariantQueueTypes::SoFi_SingleProducerSingleConsumer,
+                                          iox::popo::VariantQueueTypes::SoFi_SingleProducerSingleConsumer,
                                           m_subscriberOptions);
             m_subscriberVector.emplace_back();
             m_subscriberVector[i].m_portData = &m_portDataVector[i];

diff --git a/iceoryx_hoofs/README.md b/iceoryx_hoofs/README.md
@@ -105,7 +105,6 @@ The module structure is a logical grouping. It is replicated for `concurrent` an
 |`SpscSofi`                          | i        | Single producer, single consumer lock-free safely overflowing FiFo (SpscSofi).                                                                                                                                                         |
 |`MpmcResizeableLockFreeQueue`       |          | Resizeable variant of the `MpmcLockfreeQueue`                                                                                                                                                                                          |
 |`stack`                             |          | Stack implementation with simple push/pop interface.                                                                                                                                                                               |
-|`VariantQueue`                      |          | A queue which wraps multiple variants of Queues (SpscFifo, SpscSofi, MpmcResizeableLockFreeQueue) - will be moved to `iceoryx_posh` -                                                                                                           |
 
 #### Attribute overview of the available buffers
 

diff --git a/iceoryx_hoofs/test/moduletests/test_cli_cli_definition.cpp b/iceoryx_hoofs/test/moduletests/test_cli_cli_definition.cpp
@@ -29,7 +29,6 @@
 namespace
 {
 using namespace ::testing;
-using namespace iox::cxx;
 using namespace iox;
 
 /// This test is only some kind of compilation test to verify that the

diff --git a/iceoryx_hoofs/test/moduletests/test_cli_command_line_parser.cpp b/iceoryx_hoofs/test/moduletests/test_cli_command_line_parser.cpp
@@ -34,7 +34,6 @@ namespace
 using namespace ::testing;
 using namespace iox::cli;
 using namespace iox;
-using namespace iox::cxx;
 
 class CommandLineParser_test : public Test
 {

diff --git a/iceoryx_hoofs/test/moduletests/test_posix_file.cpp b/iceoryx_hoofs/test/moduletests/test_posix_file.cpp
@@ -30,7 +30,6 @@
 namespace
 {
 using namespace ::testing;
-using namespace iox::cxx;
 using namespace iox;
 using namespace iox::units;
 using namespace iox::units::duration_literals;

diff --git a/iceoryx_hoofs/test/moduletests/test_posix_file_lock.cpp b/iceoryx_hoofs/test/moduletests/test_posix_file_lock.cpp
@@ -22,7 +22,6 @@
 namespace
 {
 using namespace ::testing;
-using namespace iox::cxx;
 using namespace iox;
 
 /// NOLINTJUSTIFICATION compile time string literal used only in tests

diff --git a/iceoryx_hoofs/test/moduletests/test_posix_named_semaphore.cpp b/iceoryx_hoofs/test/moduletests/test_posix_named_semaphore.cpp
@@ -21,7 +21,6 @@
 namespace
 {
 using namespace ::testing;
-using namespace iox::cxx;
 using namespace iox;
 
 class NamedSemaphoreTest : public Test

diff --git a/iceoryx_hoofs/test/moduletests/test_posix_thread.cpp b/iceoryx_hoofs/test/moduletests/test_posix_thread.cpp
@@ -24,7 +24,6 @@
 namespace
 {
 using namespace ::testing;
-using namespace iox::cxx;
 using namespace iox;
 using namespace iox::units;
 using namespace iox::units::duration_literals;

diff --git a/iceoryx_hoofs/test/moduletests/test_posix_unnamed_semaphore.cpp b/iceoryx_hoofs/test/moduletests/test_posix_unnamed_semaphore.cpp
@@ -21,7 +21,6 @@
 namespace
 {
 using namespace ::testing;
-using namespace iox::cxx;
 using namespace iox;
 
 class UnnamedSemaphoreTest : public Test

diff --git a/iceoryx_hoofs/test/moduletests/test_vocabulary_expected.cpp b/iceoryx_hoofs/test/moduletests/test_vocabulary_expected.cpp
@@ -22,7 +22,6 @@
 #include "test.hpp"
 
 using namespace ::testing;
-using namespace ::iox::cxx;
 using namespace ::iox;
 using namespace ::iox::testing;
 

diff --git a/iceoryx_posh/include/iceoryx_posh/iceoryx_posh_types.hpp b/iceoryx_posh/include/iceoryx_posh/iceoryx_posh_types.hpp
@@ -18,7 +18,6 @@
 #ifndef IOX_POSH_ICEORYX_POSH_TYPES_HPP
 #define IOX_POSH_ICEORYX_POSH_TYPES_HPP
 
-#include "iceoryx_hoofs/cxx/variant_queue.hpp"
 #include "iceoryx_platform/platform_settings.hpp"
 #include "iceoryx_posh/iceoryx_posh_deployment.hpp"
 #include "iox/duration.hpp"

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_queue_data.hpp b/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_queue_data.hpp
@@ -17,10 +17,10 @@
 #ifndef IOX_POSH_POPO_BUILDING_BLOCKS_CHUNK_QUEUE_DATA_HPP
 #define IOX_POSH_POPO_BUILDING_BLOCKS_CHUNK_QUEUE_DATA_HPP
 
-#include "iceoryx_hoofs/cxx/variant_queue.hpp"
 #include "iceoryx_posh/internal/mepoo/shm_safe_unmanaged_chunk.hpp"
 #include "iceoryx_posh/internal/popo/building_blocks/condition_notifier.hpp"
 #include "iceoryx_posh/internal/popo/building_blocks/condition_variable_data.hpp"
+#include "iceoryx_posh/internal/popo/building_blocks/variant_queue.hpp"
 #include "iceoryx_posh/popo/port_queue_policies.hpp"
 #include "iox/detail/unique_id.hpp"
 #include "iox/relative_pointer.hpp"
@@ -38,12 +38,12 @@ struct ChunkQueueData : public LockingPolicy
     using LockGuard_t = std::lock_guard<const ThisType_t>;
     using ChunkQueueDataProperties_t = ChunkQueueDataProperties;
 
-    ChunkQueueData(const QueueFullPolicy policy, const cxx::VariantQueueTypes queueType) noexcept;
+    ChunkQueueData(const QueueFullPolicy policy, const VariantQueueTypes queueType) noexcept;
 
     UniqueId m_uniqueId{};
 
     static constexpr uint64_t MAX_CAPACITY = ChunkQueueDataProperties_t::MAX_QUEUE_CAPACITY;
-    cxx::VariantQueue<mepoo::ShmSafeUnmanagedChunk, MAX_CAPACITY> m_queue;
+    VariantQueue<mepoo::ShmSafeUnmanagedChunk, MAX_CAPACITY> m_queue;
     std::atomic_bool m_queueHasLostChunks{false};
 
     RelativePointer<ConditionVariableData> m_conditionVariableDataPtr;

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_queue_data.inl b/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_queue_data.inl
@@ -22,8 +22,8 @@ namespace iox
 namespace popo
 {
 template <typename ChunkQueueProperties, typename LockingPolicy>
-inline ChunkQueueData<ChunkQueueProperties, LockingPolicy>::ChunkQueueData(
-    const QueueFullPolicy policy, const cxx::VariantQueueTypes queueType) noexcept
+inline ChunkQueueData<ChunkQueueProperties, LockingPolicy>::ChunkQueueData(const QueueFullPolicy policy,
+                                                                           const VariantQueueTypes queueType) noexcept
     : m_queue(queueType)
     , m_queueFullPolicy(policy)
 {

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_receiver_data.hpp b/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_receiver_data.hpp
@@ -17,9 +17,9 @@
 #ifndef IOX_POSH_POPO_BUILDING_BLOCKS_CHUNK_RECEIVER_DATA_HPP
 #define IOX_POSH_POPO_BUILDING_BLOCKS_CHUNK_RECEIVER_DATA_HPP
 
-#include "iceoryx_hoofs/cxx/variant_queue.hpp"
 #include "iceoryx_posh/internal/mepoo/shared_chunk.hpp"
 #include "iceoryx_posh/internal/popo/building_blocks/chunk_queue_data.hpp"
+#include "iceoryx_posh/internal/popo/building_blocks/variant_queue.hpp"
 #include "iceoryx_posh/internal/popo/used_chunk_list.hpp"
 #include "iceoryx_posh/mepoo/memory_info.hpp"
 
@@ -30,7 +30,7 @@ namespace popo
 template <uint32_t MaxChunksHeldSimultaneously, typename ChunkQueueDataType>
 struct ChunkReceiverData : public ChunkQueueDataType
 {
-    explicit ChunkReceiverData(const cxx::VariantQueueTypes queueType,
+    explicit ChunkReceiverData(const VariantQueueTypes queueType,
                                const QueueFullPolicy queueFullPolicy,
                                const mepoo::MemoryInfo& memoryInfo = mepoo::MemoryInfo()) noexcept;
 

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_receiver_data.inl b/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_receiver_data.inl
@@ -23,7 +23,7 @@ namespace popo
 {
 template <uint32_t MaxChunksHeldSimultaneously, typename ChunkQueueDataType>
 inline ChunkReceiverData<MaxChunksHeldSimultaneously, ChunkQueueDataType>::ChunkReceiverData(
-    const cxx::VariantQueueTypes queueType,
+    const VariantQueueTypes queueType,
     const QueueFullPolicy queueFullPolicy,
     const mepoo::MemoryInfo& memoryInfo) noexcept
     : ChunkQueueDataType(queueFullPolicy, queueType)

diff --git a/...clude/iceoryx_hoofs/cxx/variant_queue.hpp → ...al/popo/building_blocks/variant_queue.hpp b/...clude/iceoryx_hoofs/cxx/variant_queue.hpp → ...al/popo/building_blocks/variant_queue.hpp
@@ -14,8 +14,9 @@
 // limitations under the License.
 //
 // SPDX-License-Identifier: Apache-2.0
-#ifndef IOX_HOOFS_CXX_VARIANT_QUEUE_HPP
-#define IOX_HOOFS_CXX_VARIANT_QUEUE_HPP
+
+#ifndef IOX_POSH_POPO_BUILDING_BLOCKS_VARIANT_QUEUE_HPP
+#define IOX_POSH_POPO_BUILDING_BLOCKS_VARIANT_QUEUE_HPP
 
 #include "iox/detail/mpmc_resizeable_lockfree_queue.hpp"
 #include "iox/detail/spsc_fifo.hpp"
@@ -27,14 +28,14 @@
 
 namespace iox
 {
-namespace cxx
+namespace popo
 {
 /// @brief list of the supported underlying queue types
 /// @note  if a new queue type is added the following steps have to be
 ///         performed:
 ///         1. add queue type here
 ///         2. add queue type in m_fifo data member variant type
-///         3. increase numberOfQueueTypes in test_cxx_variant_queue test
+///         3. increase numberOfQueueTypes in test_popo_variant_queue test
 enum class VariantQueueTypes : uint64_t
 {
     FiFo_SingleProducerSingleConsumer = 0,
@@ -51,8 +52,8 @@ enum class VariantQueueTypes : uint64_t
 /// @param[in] ValueType type which should be stored
 /// @param[in] Capacity capacity of the underlying fifo
 /// @code
-///     cxx::VariantQueue<int, 5> nonOverflowingQueue(cxx::VariantQueueTypes::FiFo_SingleProducerSingleConsumer);
-///     cxx::VariantQueue<int, 5> overflowingQueue(cxx::VariantQueueTypes::SoFi_SingleProducerSingleConsumer);
+///     popo::VariantQueue<int, 5> nonOverflowingQueue(popo::VariantQueueTypes::FiFo_SingleProducerSingleConsumer);
+///     popo::VariantQueue<int, 5> overflowingQueue(popo::VariantQueueTypes::SoFi_SingleProducerSingleConsumer);
 ///
 ///     // overflow case
 ///     auto status = nonOverflowingQueue.push(123);
@@ -116,9 +117,9 @@ class VariantQueue
     const VariantQueueTypes m_type;
     fifo_t m_fifo;
 };
-} // namespace cxx
+} // namespace popo
 } // namespace iox
 
-#include "iceoryx_hoofs/internal/cxx/variant_queue.inl"
+#include "iceoryx_posh/internal/popo/building_blocks/variant_queue.inl"
 
-#endif // IOX_HOOFS_CXX_VARIANT_QUEUE_HPP
+#endif // IOX_POSH_POPO_BUILDING_BLOCKS_VARIANT_QUEUE_HPP
diff --git a/...oryx_hoofs/internal/cxx/variant_queue.inl → ...al/popo/building_blocks/variant_queue.inl b/...oryx_hoofs/internal/cxx/variant_queue.inl → ...al/popo/building_blocks/variant_queue.inl
@@ -15,14 +15,15 @@
 // limitations under the License.
 //
 // SPDX-License-Identifier: Apache-2.0
-#ifndef IOX_HOOFS_CXX_VARIANT_QUEUE_INL
-#define IOX_HOOFS_CXX_VARIANT_QUEUE_INL
 
-#include "iceoryx_hoofs/cxx/variant_queue.hpp"
+#ifndef IOX_POSH_POPO_BUILDING_BLOCKS_VARIANT_QUEUE_INL
+#define IOX_POSH_POPO_BUILDING_BLOCKS_VARIANT_QUEUE_INL
+
+#include "iceoryx_posh/internal/popo/building_blocks/variant_queue.hpp"
 
 namespace iox
 {
-namespace cxx
+namespace popo
 {
 template <typename ValueType, uint64_t Capacity>
 inline VariantQueue<ValueType, Capacity>::VariantQueue(const VariantQueueTypes type) noexcept
@@ -259,7 +260,7 @@ inline uint64_t VariantQueue<ValueType, Capacity>::capacity() const noexcept
     return 0U;
 }
 
-} // namespace cxx
+} // namespace popo
 } // namespace iox
 
-#endif // IOX_HOOFS_CXX_VARIANT_QUEUE_INL
+#endif // IOX_POSH_POPO_BUILDING_BLOCKS_VARIANT_QUEUE_INL
diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/ports/subscriber_port_data.hpp b/iceoryx_posh/include/iceoryx_posh/internal/popo/ports/subscriber_port_data.hpp
@@ -18,8 +18,8 @@
 #ifndef IOX_POSH_POPO_PORTS_SUBSCRIBER_PORT_DATA_HPP
 #define IOX_POSH_POPO_PORTS_SUBSCRIBER_PORT_DATA_HPP
 
-#include "iceoryx_hoofs/cxx/variant_queue.hpp"
 #include "iceoryx_posh/capro/service_description.hpp"
+#include "iceoryx_posh/internal/popo/building_blocks/variant_queue.hpp"
 #include "iceoryx_posh/internal/popo/ports/base_port_data.hpp"
 #include "iceoryx_posh/internal/popo/ports/pub_sub_port_types.hpp"
 #include "iceoryx_posh/popo/subscriber_options.hpp"
@@ -36,7 +36,7 @@ struct SubscriberPortData : public BasePortData
 {
     SubscriberPortData(const capro::ServiceDescription& serviceDescription,
                        const RuntimeName_t& runtimeName,
-                       cxx::VariantQueueTypes queueType,
+                       const VariantQueueTypes queueType,
                        const SubscriberOptions& subscriberOptions,
                        const mepoo::MemoryInfo& memoryInfo = mepoo::MemoryInfo()) noexcept;