diff --git a/examples/cpp/configuration/CLIParser.hpp b/examples/cpp/configuration/CLIParser.hpp index 3ea076963fa..7295dcde338 100644 --- a/examples/cpp/configuration/CLIParser.hpp +++ b/examples/cpp/configuration/CLIParser.hpp @@ -45,10 +45,10 @@ class CLIParser int32_t max_samples = 5000; int32_t max_instances = 10; int32_t max_samples_per_instance = 400; - uint32_t deadline = fastrtps::Duration_t::INFINITE_SECONDS; - uint32_t lifespan = fastrtps::Duration_t::INFINITE_SECONDS; - uint32_t liveliness_lease = fastrtps::Duration_t::INFINITE_SECONDS; - uint32_t liveliness_assert = fastrtps::Duration_t::INFINITE_SECONDS - 1; + uint32_t deadline = fastdds::Duration_t::INFINITE_SECONDS; + uint32_t lifespan = fastdds::Duration_t::INFINITE_SECONDS; + uint32_t liveliness_lease = fastdds::Duration_t::INFINITE_SECONDS; + uint32_t liveliness_assert = fastdds::Duration_t::INFINITE_SECONDS - 1; std::string partitions = ""; std::string profile_participant = ""; std::string topic_name = "configuration_topic"; @@ -76,7 +76,7 @@ class CLIParser struct publisher_config : public entity_config { uint16_t wait = 0; - uint32_t ack_keep_duration = fastrtps::Duration_t::INFINITE_SECONDS; + uint32_t ack_keep_duration = fastdds::Duration_t::INFINITE_SECONDS; uint32_t interval = 100; uint32_t msg_size = 10; uint32_t ownership_strength = 0; diff --git a/examples/cpp/configuration/ConfigurationPubSubTypes.cxx b/examples/cpp/configuration/ConfigurationPubSubTypes.cxx index 40080bb7372..a4dfccaf063 100644 --- a/examples/cpp/configuration/ConfigurationPubSubTypes.cxx +++ b/examples/cpp/configuration/ConfigurationPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "ConfigurationCdrAux.hpp" #include "ConfigurationTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; ConfigurationPubSubType::ConfigurationPubSubType() diff --git a/examples/cpp/configuration/ConfigurationPubSubTypes.h b/examples/cpp/configuration/ConfigurationPubSubTypes.h index ea455e624ac..6184a0885de 100644 --- a/examples/cpp/configuration/ConfigurationPubSubTypes.h +++ b/examples/cpp/configuration/ConfigurationPubSubTypes.h @@ -54,18 +54,18 @@ class ConfigurationPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -80,7 +80,7 @@ class ConfigurationPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/examples/cpp/configuration/PublisherApp.cpp b/examples/cpp/configuration/PublisherApp.cpp index 47ea18c1572..a2957ddfeb6 100644 --- a/examples/cpp/configuration/PublisherApp.cpp +++ b/examples/cpp/configuration/PublisherApp.cpp @@ -139,15 +139,15 @@ PublisherApp::PublisherApp( "DataWriter initialization failed: ownership strength is only valid with exclusive ownership"); } writer_qos.ownership_strength().value = config.ownership_strength; - writer_qos.deadline().period = eprosima::fastrtps::Duration_t(config.deadline * 1e-3); + writer_qos.deadline().period = eprosima::fastdds::Duration_t(config.deadline * 1e-3); writer_qos.reliable_writer_qos().disable_positive_acks.enabled = config.disable_positive_ack; - writer_qos.reliable_writer_qos().disable_positive_acks.duration = eprosima::fastrtps::Duration_t( + writer_qos.reliable_writer_qos().disable_positive_acks.duration = eprosima::fastdds::Duration_t( config.ack_keep_duration * 1e-3); - writer_qos.lifespan().duration = eprosima::fastrtps::Duration_t(config.lifespan * 1e-3); + writer_qos.lifespan().duration = eprosima::fastdds::Duration_t(config.lifespan * 1e-3); writer_qos.liveliness().kind = config.liveliness; - writer_qos.liveliness().lease_duration = eprosima::fastrtps::Duration_t( + writer_qos.liveliness().lease_duration = eprosima::fastdds::Duration_t( config.liveliness_lease * 1e-3); - writer_qos.liveliness().announcement_period = eprosima::fastrtps::Duration_t( + writer_qos.liveliness().announcement_period = eprosima::fastdds::Duration_t( config.liveliness_assert * 1e-3); writer_ = publisher_->create_datawriter(topic_, writer_qos, this, StatusMask::all()); } diff --git a/examples/cpp/configuration/SubscriberApp.cpp b/examples/cpp/configuration/SubscriberApp.cpp index 63c2dddbc4a..4c6b38b191f 100644 --- a/examples/cpp/configuration/SubscriberApp.cpp +++ b/examples/cpp/configuration/SubscriberApp.cpp @@ -125,13 +125,13 @@ SubscriberApp::SubscriberApp( reader_qos.resource_limits().max_instances = config.max_instances; reader_qos.resource_limits().max_samples_per_instance = config.max_samples_per_instance; reader_qos.ownership().kind = config.ownership; - reader_qos.deadline().period = eprosima::fastrtps::Duration_t(config.deadline * 1e-3); + reader_qos.deadline().period = eprosima::fastdds::Duration_t(config.deadline * 1e-3); reader_qos.reliable_reader_qos().disable_positive_ACKs.enabled = config.disable_positive_ack; - reader_qos.lifespan().duration = eprosima::fastrtps::Duration_t(config.lifespan * 1e-3); + reader_qos.lifespan().duration = eprosima::fastdds::Duration_t(config.lifespan * 1e-3); reader_qos.liveliness().kind = config.liveliness; - reader_qos.liveliness().lease_duration = eprosima::fastrtps::Duration_t( + reader_qos.liveliness().lease_duration = eprosima::fastdds::Duration_t( config.liveliness_lease * 1e-3); - reader_qos.liveliness().announcement_period = eprosima::fastrtps::Duration_t( + reader_qos.liveliness().announcement_period = eprosima::fastdds::Duration_t( config.liveliness_assert * 1e-3); reader_ = subscriber_->create_datareader(topic_, reader_qos, this, StatusMask::all()); } diff --git a/examples/cpp/content_filter/HelloWorldPubSubTypes.cxx b/examples/cpp/content_filter/HelloWorldPubSubTypes.cxx index aa161b2e163..a73cf0ffa55 100644 --- a/examples/cpp/content_filter/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/content_filter/HelloWorldPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "HelloWorldCdrAux.hpp" #include "HelloWorldTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; HelloWorldPubSubType::HelloWorldPubSubType() diff --git a/examples/cpp/content_filter/HelloWorldPubSubTypes.h b/examples/cpp/content_filter/HelloWorldPubSubTypes.h index 7c83d2b300b..f048c9be28e 100644 --- a/examples/cpp/content_filter/HelloWorldPubSubTypes.h +++ b/examples/cpp/content_filter/HelloWorldPubSubTypes.h @@ -54,18 +54,18 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -80,7 +80,7 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/examples/cpp/custom_payload_pool/CustomPayloadPool.hpp b/examples/cpp/custom_payload_pool/CustomPayloadPool.hpp index 0b762d9eb12..d54c1bc03b1 100644 --- a/examples/cpp/custom_payload_pool/CustomPayloadPool.hpp +++ b/examples/cpp/custom_payload_pool/CustomPayloadPool.hpp @@ -26,7 +26,7 @@ #include #include -class CustomPayloadPool : public eprosima::fastrtps::rtps::IPayloadPool +class CustomPayloadPool : public eprosima::fastdds::rtps::IPayloadPool { public: @@ -34,7 +34,7 @@ class CustomPayloadPool : public eprosima::fastrtps::rtps::IPayloadPool bool get_payload( unsigned int size, - eprosima::fastrtps::rtps::SerializedPayload_t& payload) + eprosima::fastdds::rtps::SerializedPayload_t& payload) { // Reserve new memory for the payload buffer unsigned char* payload_buff = new unsigned char[size]; @@ -51,8 +51,8 @@ class CustomPayloadPool : public eprosima::fastrtps::rtps::IPayloadPool } bool get_payload( - const eprosima::fastrtps::rtps::SerializedPayload_t& data, - eprosima::fastrtps::rtps::SerializedPayload_t& payload) + const eprosima::fastdds::rtps::SerializedPayload_t& data, + eprosima::fastdds::rtps::SerializedPayload_t& payload) { // Reserve new memory for the payload buffer unsigned char* payload_buff = new unsigned char[data.length]; @@ -72,7 +72,7 @@ class CustomPayloadPool : public eprosima::fastrtps::rtps::IPayloadPool } bool release_payload( - eprosima::fastrtps::rtps::SerializedPayload_t& payload) + eprosima::fastdds::rtps::SerializedPayload_t& payload) { // Ensure precondition if (this != payload.payload_owner) diff --git a/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.cxx b/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.cxx index aa161b2e163..a73cf0ffa55 100644 --- a/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "HelloWorldCdrAux.hpp" #include "HelloWorldTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; HelloWorldPubSubType::HelloWorldPubSubType() diff --git a/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.h b/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.h index 7c83d2b300b..f048c9be28e 100644 --- a/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.h +++ b/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.h @@ -54,18 +54,18 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -80,7 +80,7 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerPublisher.cpp b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerPublisher.cpp index d3063562aad..0e9914beb91 100644 --- a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerPublisher.cpp +++ b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerPublisher.cpp @@ -85,7 +85,7 @@ bool HelloWorldPublisher::init( // Create DS SERVER locator eprosima::fastdds::rtps::Locator server_locator; - eprosima::fastrtps::rtps::IPLocator::setPhysicalPort(server_locator, server_port); + eprosima::fastdds::rtps::IPLocator::setPhysicalPort(server_locator, server_port); std::shared_ptr descriptor; @@ -103,7 +103,7 @@ bool HelloWorldPublisher::init( descriptor = descriptor_tmp; server_locator.kind = LOCATOR_KIND_UDPv4; - eprosima::fastrtps::rtps::IPLocator::setIPv4(server_locator, ip_server_address); + eprosima::fastdds::rtps::IPLocator::setIPv4(server_locator, ip_server_address); break; } @@ -114,7 +114,7 @@ bool HelloWorldPublisher::init( descriptor = descriptor_tmp; server_locator.kind = LOCATOR_KIND_UDPv6; - eprosima::fastrtps::rtps::IPLocator::setIPv6(server_locator, ip_server_address); + eprosima::fastdds::rtps::IPLocator::setIPv6(server_locator, ip_server_address); break; } @@ -127,8 +127,8 @@ bool HelloWorldPublisher::init( descriptor = descriptor_tmp; server_locator.kind = LOCATOR_KIND_TCPv4; - eprosima::fastrtps::rtps::IPLocator::setLogicalPort(server_locator, server_port); - eprosima::fastrtps::rtps::IPLocator::setIPv4(server_locator, ip_server_address); + eprosima::fastdds::rtps::IPLocator::setLogicalPort(server_locator, server_port); + eprosima::fastdds::rtps::IPLocator::setIPv4(server_locator, ip_server_address); break; } @@ -141,8 +141,8 @@ bool HelloWorldPublisher::init( descriptor = descriptor_tmp; server_locator.kind = LOCATOR_KIND_TCPv6; - eprosima::fastrtps::rtps::IPLocator::setLogicalPort(server_locator, server_port); - eprosima::fastrtps::rtps::IPLocator::setIPv6(server_locator, ip_server_address); + eprosima::fastdds::rtps::IPLocator::setLogicalPort(server_locator, server_port); + eprosima::fastdds::rtps::IPLocator::setIPv6(server_locator, ip_server_address); break; } @@ -152,7 +152,7 @@ bool HelloWorldPublisher::init( // Set participant as DS CLIENT pqos.wire_protocol().builtin.discovery_config.discoveryProtocol = - eprosima::fastrtps::rtps::DiscoveryProtocol_t::CLIENT; + eprosima::fastdds::rtps::DiscoveryProtocol::CLIENT; // Set SERVER's GUID prefix RemoteServerAttributes remote_server_att; @@ -255,16 +255,16 @@ void HelloWorldPublisher::PubListener::on_publication_matched( void HelloWorldPublisher::PubListener::on_participant_discovery( eprosima::fastdds::dds::DomainParticipant* /*participant*/, - eprosima::fastrtps::rtps::ParticipantDiscoveryInfo&& info, + eprosima::fastdds::rtps::ParticipantDiscoveryInfo&& info, bool& should_be_ignored) { static_cast(should_be_ignored); - if (info.status == eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT) + if (info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT) { std::cout << "Discovered Participant with GUID " << info.info.m_guid << std::endl; } - else if (info.status == eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::DROPPED_PARTICIPANT || - info.status == eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::REMOVED_PARTICIPANT) + else if (info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::DROPPED_PARTICIPANT || + info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::REMOVED_PARTICIPANT) { std::cout << "Dropped Participant with GUID " << info.info.m_guid << std::endl; } diff --git a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerPublisher.h b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerPublisher.h index 2ddb09baba9..1a8699cc029 100644 --- a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerPublisher.h +++ b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerPublisher.h @@ -101,7 +101,7 @@ class HelloWorldPublisher //! Callback executed when a DomainParticipant is discovered, dropped or removed void on_participant_discovery( eprosima::fastdds::dds::DomainParticipant* /*participant*/, - eprosima::fastrtps::rtps::ParticipantDiscoveryInfo&& info, + eprosima::fastdds::rtps::ParticipantDiscoveryInfo&& info, bool& should_be_ignored) override; private: diff --git a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerServer.cpp b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerServer.cpp index 4992b318014..52dbdab1e66 100644 --- a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerServer.cpp +++ b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerServer.cpp @@ -99,8 +99,8 @@ bool DiscoveryServer::init( // Create DS SERVER locator eprosima::fastdds::rtps::Locator listening_locator; eprosima::fastdds::rtps::Locator connection_locator; - eprosima::fastrtps::rtps::IPLocator::setPhysicalPort(listening_locator, server_port); - eprosima::fastrtps::rtps::IPLocator::setPhysicalPort(connection_locator, connection_server_port); + eprosima::fastdds::rtps::IPLocator::setPhysicalPort(listening_locator, server_port); + eprosima::fastdds::rtps::IPLocator::setPhysicalPort(connection_locator, connection_server_port); std::shared_ptr descriptor; @@ -119,9 +119,9 @@ bool DiscoveryServer::init( descriptor = descriptor_tmp; listening_locator.kind = LOCATOR_KIND_UDPv4; - eprosima::fastrtps::rtps::IPLocator::setIPv4(listening_locator, ip_listening_address); + eprosima::fastdds::rtps::IPLocator::setIPv4(listening_locator, ip_listening_address); connection_locator.kind = LOCATOR_KIND_UDPv4; - eprosima::fastrtps::rtps::IPLocator::setIPv4(connection_locator, ip_connection_address); + eprosima::fastdds::rtps::IPLocator::setIPv4(connection_locator, ip_connection_address); break; } @@ -132,9 +132,9 @@ bool DiscoveryServer::init( descriptor = descriptor_tmp; listening_locator.kind = LOCATOR_KIND_UDPv6; - eprosima::fastrtps::rtps::IPLocator::setIPv6(listening_locator, ip_listening_address); + eprosima::fastdds::rtps::IPLocator::setIPv6(listening_locator, ip_listening_address); connection_locator.kind = LOCATOR_KIND_UDPv6; - eprosima::fastrtps::rtps::IPLocator::setIPv6(connection_locator, ip_connection_address); + eprosima::fastdds::rtps::IPLocator::setIPv6(connection_locator, ip_connection_address); break; } @@ -146,11 +146,11 @@ bool DiscoveryServer::init( descriptor = descriptor_tmp; listening_locator.kind = LOCATOR_KIND_TCPv4; - eprosima::fastrtps::rtps::IPLocator::setLogicalPort(listening_locator, server_port); - eprosima::fastrtps::rtps::IPLocator::setIPv4(listening_locator, ip_listening_address); + eprosima::fastdds::rtps::IPLocator::setLogicalPort(listening_locator, server_port); + eprosima::fastdds::rtps::IPLocator::setIPv4(listening_locator, ip_listening_address); connection_locator.kind = LOCATOR_KIND_TCPv4; - eprosima::fastrtps::rtps::IPLocator::setIPv4(connection_locator, ip_connection_address); - eprosima::fastrtps::rtps::IPLocator::setLogicalPort(connection_locator, connection_server_port); + eprosima::fastdds::rtps::IPLocator::setIPv4(connection_locator, ip_connection_address); + eprosima::fastdds::rtps::IPLocator::setLogicalPort(connection_locator, connection_server_port); break; } @@ -162,11 +162,11 @@ bool DiscoveryServer::init( descriptor = descriptor_tmp; listening_locator.kind = LOCATOR_KIND_TCPv6; - eprosima::fastrtps::rtps::IPLocator::setLogicalPort(listening_locator, server_port); - eprosima::fastrtps::rtps::IPLocator::setIPv6(listening_locator, ip_listening_address); + eprosima::fastdds::rtps::IPLocator::setLogicalPort(listening_locator, server_port); + eprosima::fastdds::rtps::IPLocator::setIPv6(listening_locator, ip_listening_address); connection_locator.kind = LOCATOR_KIND_TCPv6; - eprosima::fastrtps::rtps::IPLocator::setIPv6(connection_locator, ip_connection_address); - eprosima::fastrtps::rtps::IPLocator::setLogicalPort(connection_locator, connection_server_port); + eprosima::fastdds::rtps::IPLocator::setIPv6(connection_locator, ip_connection_address); + eprosima::fastdds::rtps::IPLocator::setLogicalPort(connection_locator, connection_server_port); break; } @@ -179,7 +179,7 @@ bool DiscoveryServer::init( // Set participant as SERVER pqos.wire_protocol().builtin.discovery_config.discoveryProtocol = - eprosima::fastrtps::rtps::DiscoveryProtocol_t::SERVER; + eprosima::fastdds::rtps::DiscoveryProtocol::SERVER; // Set SERVER's GUID prefix pqos.wire_protocol().prefix = get_discovery_server_guid_from_id(server_id); @@ -250,16 +250,16 @@ DiscoveryServer::~DiscoveryServer() void DiscoveryServer::ServerListener::on_participant_discovery( eprosima::fastdds::dds::DomainParticipant* /*participant*/, - eprosima::fastrtps::rtps::ParticipantDiscoveryInfo&& info, + eprosima::fastdds::rtps::ParticipantDiscoveryInfo&& info, bool& should_be_ignored) { static_cast(should_be_ignored); - if (info.status == eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT) + if (info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT) { std::cout << "Discovered Participant with GUID " << info.info.m_guid << std::endl; } - else if (info.status == eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::DROPPED_PARTICIPANT || - info.status == eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::REMOVED_PARTICIPANT) + else if (info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::DROPPED_PARTICIPANT || + info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::REMOVED_PARTICIPANT) { std::cout << "Dropped Participant with GUID " << info.info.m_guid << std::endl; } diff --git a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerServer.h b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerServer.h index 8b96f66a26f..4fd8b6d79f7 100644 --- a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerServer.h +++ b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerServer.h @@ -83,7 +83,7 @@ class DiscoveryServer //! Callback executed when a DomainParticipant is discovered, dropped or removed void on_participant_discovery( eprosima::fastdds::dds::DomainParticipant* /*participant*/, - eprosima::fastrtps::rtps::ParticipantDiscoveryInfo&& info, + eprosima::fastdds::rtps::ParticipantDiscoveryInfo&& info, bool& should_be_ignored) override; private: diff --git a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerSubscriber.cpp b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerSubscriber.cpp index b3d65084678..386a6e1c3c8 100644 --- a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerSubscriber.cpp +++ b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerSubscriber.cpp @@ -88,7 +88,7 @@ bool HelloWorldSubscriber::init( // Create DS SERVER locator eprosima::fastdds::rtps::Locator server_locator; - eprosima::fastrtps::rtps::IPLocator::setPhysicalPort(server_locator, server_port); + eprosima::fastdds::rtps::IPLocator::setPhysicalPort(server_locator, server_port); std::shared_ptr descriptor; @@ -106,7 +106,7 @@ bool HelloWorldSubscriber::init( descriptor = descriptor_tmp; server_locator.kind = LOCATOR_KIND_UDPv4; - eprosima::fastrtps::rtps::IPLocator::setIPv4(server_locator, ip_server_address); + eprosima::fastdds::rtps::IPLocator::setIPv4(server_locator, ip_server_address); break; } @@ -117,7 +117,7 @@ bool HelloWorldSubscriber::init( descriptor = descriptor_tmp; server_locator.kind = LOCATOR_KIND_UDPv6; - eprosima::fastrtps::rtps::IPLocator::setIPv6(server_locator, ip_server_address); + eprosima::fastdds::rtps::IPLocator::setIPv6(server_locator, ip_server_address); break; } @@ -130,8 +130,8 @@ bool HelloWorldSubscriber::init( descriptor = descriptor_tmp; server_locator.kind = LOCATOR_KIND_TCPv4; - eprosima::fastrtps::rtps::IPLocator::setLogicalPort(server_locator, server_port); - eprosima::fastrtps::rtps::IPLocator::setIPv4(server_locator, ip_server_address); + eprosima::fastdds::rtps::IPLocator::setLogicalPort(server_locator, server_port); + eprosima::fastdds::rtps::IPLocator::setIPv4(server_locator, ip_server_address); break; } @@ -144,8 +144,8 @@ bool HelloWorldSubscriber::init( descriptor = descriptor_tmp; server_locator.kind = LOCATOR_KIND_TCPv6; - eprosima::fastrtps::rtps::IPLocator::setLogicalPort(server_locator, server_port); - eprosima::fastrtps::rtps::IPLocator::setIPv4(server_locator, ip_server_address); + eprosima::fastdds::rtps::IPLocator::setLogicalPort(server_locator, server_port); + eprosima::fastdds::rtps::IPLocator::setIPv4(server_locator, ip_server_address); break; } @@ -155,7 +155,7 @@ bool HelloWorldSubscriber::init( // Set participant as DS CLIENT pqos.wire_protocol().builtin.discovery_config.discoveryProtocol = - eprosima::fastrtps::rtps::DiscoveryProtocol_t::CLIENT; + eprosima::fastdds::rtps::DiscoveryProtocol::CLIENT; // Set SERVER's GUID prefix RemoteServerAttributes remote_server_att; @@ -292,16 +292,16 @@ void HelloWorldSubscriber::SubListener::on_data_available( void HelloWorldSubscriber::SubListener::on_participant_discovery( eprosima::fastdds::dds::DomainParticipant* /*participant*/, - eprosima::fastrtps::rtps::ParticipantDiscoveryInfo&& info, + eprosima::fastdds::rtps::ParticipantDiscoveryInfo&& info, bool& should_be_ignored) { static_cast(should_be_ignored); - if (info.status == eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT) + if (info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT) { std::cout << "Discovered Participant with GUID " << info.info.m_guid << std::endl; } - else if (info.status == eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::DROPPED_PARTICIPANT || - info.status == eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::REMOVED_PARTICIPANT) + else if (info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::DROPPED_PARTICIPANT || + info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::REMOVED_PARTICIPANT) { std::cout << "Dropped Participant with GUID " << info.info.m_guid << std::endl; } diff --git a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerSubscriber.h b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerSubscriber.h index 44e6066bd53..3869f94eb52 100644 --- a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerSubscriber.h +++ b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerSubscriber.h @@ -108,7 +108,7 @@ class HelloWorldSubscriber //! Callback executed when a DomainParticipant is discovered, dropped or removed void on_participant_discovery( eprosima::fastdds::dds::DomainParticipant* /*participant*/, - eprosima::fastrtps::rtps::ParticipantDiscoveryInfo&& info, + eprosima::fastdds::rtps::ParticipantDiscoveryInfo&& info, bool& should_be_ignored) override; private: diff --git a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServer_main.cpp b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServer_main.cpp index c796692e056..e1badf3b661 100644 --- a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServer_main.cpp +++ b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServer_main.cpp @@ -255,13 +255,13 @@ int main( } // Check that ip matches transport - // if (transport == TransportKind::UDPv4 && !eprosima::fastrtps::rtps::IPLocator::isIPv4(listening_address)) + // if (transport == TransportKind::UDPv4 && !eprosima::fastdds::rtps::IPLocator::isIPv4(listening_address)) // { // std::cerr << "ERROR: IPv4 is needed to use UDPv4. Wrong IP address: " << listening_address << std::endl; // option::printUsage(fwrite, stdout, usage, columns); // return 1; // } - // else if (transport == TransportKind::UDPv6 && !eprosima::fastrtps::rtps::IPLocator::isIPv6(listening_address)) + // else if (transport == TransportKind::UDPv6 && !eprosima::fastdds::rtps::IPLocator::isIPv6(listening_address)) // { // std::cerr << "ERROR: IPv6 is needed to use UDPv6. Wrong IP address: " << listening_address << std::endl; // option::printUsage(fwrite, stdout, usage, columns); diff --git a/examples/cpp/dds/DiscoveryServerExample/arg_configuration.h b/examples/cpp/dds/DiscoveryServerExample/arg_configuration.h index 411ef048a33..04456a187a0 100644 --- a/examples/cpp/dds/DiscoveryServerExample/arg_configuration.h +++ b/examples/cpp/dds/DiscoveryServerExample/arg_configuration.h @@ -116,8 +116,8 @@ struct Arg : public option::Arg // we must check if it is a correct ip address plus port number std::string ip_str(option.arg); if ( - eprosima::fastrtps::rtps::IPLocator::isIPv4(ip_str) || - eprosima::fastrtps::rtps::IPLocator::isIPv6(ip_str)) + eprosima::fastdds::rtps::IPLocator::isIPv4(ip_str) || + eprosima::fastdds::rtps::IPLocator::isIPv6(ip_str)) { return option::ARG_OK; } diff --git a/examples/cpp/dds/DiscoveryServerExample/common.h b/examples/cpp/dds/DiscoveryServerExample/common.h index 24bdf99aa6b..c48cf35978f 100644 --- a/examples/cpp/dds/DiscoveryServerExample/common.h +++ b/examples/cpp/dds/DiscoveryServerExample/common.h @@ -32,15 +32,15 @@ enum class TransportKind SHM, }; -inline eprosima::fastrtps::rtps::GuidPrefix_t get_discovery_server_guid_from_id( +inline eprosima::fastdds::rtps::GuidPrefix_t get_discovery_server_guid_from_id( unsigned short id) { - eprosima::fastrtps::rtps::GuidPrefix_t result; + eprosima::fastdds::rtps::GuidPrefix_t result; // Get default DS guid and modify the one value expected to be changed std::istringstream(eprosima::fastdds::rtps::DEFAULT_ROS2_SERVER_GUIDPREFIX) >> result; result.value[2] = - static_cast(id); // This is done like this in Fast + static_cast(id); // This is done like this in Fast return result; } @@ -48,7 +48,7 @@ inline eprosima::fastrtps::rtps::GuidPrefix_t get_discovery_server_guid_from_id( inline bool is_ip( const std::string ip_str) { - return eprosima::fastrtps::rtps::IPLocator::isIPv4(ip_str) || eprosima::fastrtps::rtps::IPLocator::isIPv6(ip_str); + return eprosima::fastdds::rtps::IPLocator::isIPv4(ip_str) || eprosima::fastdds::rtps::IPLocator::isIPv6(ip_str); } inline std::string get_ip_from_dns( @@ -56,7 +56,7 @@ inline std::string get_ip_from_dns( TransportKind kind) { std::pair, std::set> dns_response = - eprosima::fastrtps::rtps::IPLocator::resolveNameDNS(domain_name); + eprosima::fastdds::rtps::IPLocator::resolveNameDNS(domain_name); if (kind == TransportKind::UDPv4 || kind == TransportKind::TCPv4) { diff --git a/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldPubSubTypes.cxx index aa161b2e163..a73cf0ffa55 100644 --- a/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "HelloWorldCdrAux.hpp" #include "HelloWorldTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; HelloWorldPubSubType::HelloWorldPubSubType() diff --git a/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldPubSubTypes.h b/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldPubSubTypes.h index 7c83d2b300b..f048c9be28e 100644 --- a/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldPubSubTypes.h +++ b/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldPubSubTypes.h @@ -54,18 +54,18 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -80,7 +80,7 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubMain.cxx b/examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubMain.cxx index a696c5d9d0e..f86f9ef6b5f 100644 --- a/examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubMain.cxx +++ b/examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubMain.cxx @@ -23,7 +23,7 @@ #include "FlowControlExampleSubscriber.h" using namespace eprosima; -using namespace eprosima::fastrtps; +using namespace eprosima::fastdds; int main(int argc, char** argv) { diff --git a/examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubTypes.cxx b/examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubTypes.cxx index 37df0bd9384..cf00c56480f 100644 --- a/examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubTypes.cxx +++ b/examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubTypes.cxx @@ -27,8 +27,8 @@ #include "FlowControlExampleCdrAux.hpp" #include "FlowControlExampleTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; FlowControlExamplePubSubType::FlowControlExamplePubSubType() diff --git a/examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubTypes.h b/examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubTypes.h index 3606697eae8..b1feb0ab27c 100644 --- a/examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubTypes.h +++ b/examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubTypes.h @@ -54,18 +54,18 @@ class FlowControlExamplePubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -80,7 +80,7 @@ class FlowControlExamplePubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/examples/cpp/dds/FlowControlExample/FlowControlExamplePublisher.cxx b/examples/cpp/dds/FlowControlExample/FlowControlExamplePublisher.cxx index e7d63b02d4d..4a59468de5f 100644 --- a/examples/cpp/dds/FlowControlExample/FlowControlExamplePublisher.cxx +++ b/examples/cpp/dds/FlowControlExample/FlowControlExamplePublisher.cxx @@ -28,7 +28,7 @@ using namespace eprosima::fastdds::dds; using namespace eprosima::fastdds::rtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; FlowControlExamplePublisher::FlowControlExamplePublisher() : participant_(nullptr) @@ -70,7 +70,7 @@ bool FlowControlExamplePublisher::init() { // Create Participant DomainParticipantQos pqos; - pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastrtps::c_TimeInfinite; + pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::c_TimeInfinite; pqos.name("Participant_publisher"); //You can put here the name you want // This controller allows 300kb per second. diff --git a/examples/cpp/dds/FlowControlExample/FlowControlExampleSubscriber.cxx b/examples/cpp/dds/FlowControlExample/FlowControlExampleSubscriber.cxx index 4edeba1b574..51561bd045e 100644 --- a/examples/cpp/dds/FlowControlExample/FlowControlExampleSubscriber.cxx +++ b/examples/cpp/dds/FlowControlExample/FlowControlExampleSubscriber.cxx @@ -26,7 +26,7 @@ #include "FlowControlExampleSubscriber.h" using namespace eprosima::fastdds::dds; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; FlowControlExampleSubscriber::FlowControlExampleSubscriber() : participant_(nullptr) @@ -58,7 +58,7 @@ bool FlowControlExampleSubscriber::init() { // Create Participant DomainParticipantQos pqos; - pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastrtps::c_TimeInfinite; + pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::c_TimeInfinite; pqos.name("Participant_subscriber"); //You can put the name you want participant_ = DomainParticipantFactory::get_instance()->create_participant(0, pqos); diff --git a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.cxx index aa161b2e163..a73cf0ffa55 100644 --- a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "HelloWorldCdrAux.hpp" #include "HelloWorldTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; HelloWorldPubSubType::HelloWorldPubSubType() diff --git a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.h b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.h index 4b09a679ee5..25f8edc4b7d 100644 --- a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.h +++ b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.h @@ -54,18 +54,18 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -80,7 +80,7 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.cxx index aa161b2e163..a73cf0ffa55 100644 --- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "HelloWorldCdrAux.hpp" #include "HelloWorldTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; HelloWorldPubSubType::HelloWorldPubSubType() diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.h b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.h index 7c83d2b300b..f048c9be28e 100644 --- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.h +++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.h @@ -54,18 +54,18 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -80,7 +80,7 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPublisher.cpp b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPublisher.cpp index 1b8f9d964e4..9640b2fb4f1 100644 --- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPublisher.cpp +++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPublisher.cpp @@ -27,7 +27,7 @@ using namespace eprosima::fastdds::dds; using namespace eprosima::fastdds::rtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; HelloWorldPublisher::HelloWorldPublisher() : participant_(nullptr) @@ -46,11 +46,11 @@ bool HelloWorldPublisher::init() //CREATE THE PARTICIPANT DomainParticipantQos pqos; - pqos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::SIMPLE; + pqos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::SIMPLE; pqos.wire_protocol().builtin.discovery_config.use_SIMPLE_EndpointDiscoveryProtocol = true; pqos.wire_protocol().builtin.discovery_config.m_simpleEDP.use_PublicationReaderANDSubscriptionWriter = true; pqos.wire_protocol().builtin.discovery_config.m_simpleEDP.use_PublicationWriterANDSubscriptionReader = true; - pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastrtps::c_TimeInfinite; + pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::c_TimeInfinite; pqos.name("Participant_pub"); // Explicit configuration of SharedMem transport diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldSubscriber.cpp b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldSubscriber.cpp index 77a438830bf..9cb3cd81b58 100644 --- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldSubscriber.cpp +++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldSubscriber.cpp @@ -29,7 +29,7 @@ using namespace eprosima::fastdds::dds; using namespace eprosima::fastdds::rtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; HelloWorldSubscriber::HelloWorldSubscriber() : participant_(nullptr) @@ -45,11 +45,11 @@ bool HelloWorldSubscriber::init() //CREATE THE PARTICIPANT DomainParticipantQos pqos; - pqos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::SIMPLE; + pqos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::SIMPLE; pqos.wire_protocol().builtin.discovery_config.use_SIMPLE_EndpointDiscoveryProtocol = true; pqos.wire_protocol().builtin.discovery_config.m_simpleEDP.use_PublicationReaderANDSubscriptionWriter = true; pqos.wire_protocol().builtin.discovery_config.m_simpleEDP.use_PublicationWriterANDSubscriptionReader = true; - pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastrtps::c_TimeInfinite; + pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::c_TimeInfinite; pqos.name("Participant_sub"); // Explicit configuration of SharedMem transport diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorld_main.cpp b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorld_main.cpp index 979be73bef1..404167f5f00 100644 --- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorld_main.cpp +++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorld_main.cpp @@ -25,7 +25,7 @@ #include "HelloWorldSubscriber.h" using namespace eprosima; -using namespace fastrtps; +using namespace fastdds; using namespace rtps; using namespace eprosima::fastdds::dds; diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.cxx index aa161b2e163..a73cf0ffa55 100644 --- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "HelloWorldCdrAux.hpp" #include "HelloWorldTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; HelloWorldPubSubType::HelloWorldPubSubType() diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.h b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.h index 7c83d2b300b..f048c9be28e 100644 --- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.h +++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.h @@ -54,18 +54,18 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -80,7 +80,7 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPublisher.cpp b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPublisher.cpp index ceb7fb25de3..b0e75cfb5c8 100644 --- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPublisher.cpp +++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPublisher.cpp @@ -48,9 +48,9 @@ bool HelloWorldPublisher::init( //CREATE THE PARTICIPANT DomainParticipantQos pqos; - pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastrtps::c_TimeInfinite; + pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::c_TimeInfinite; pqos.wire_protocol().builtin.discovery_config.leaseDuration_announcementperiod = - eprosima::fastrtps::Duration_t(5, 0); + eprosima::fastdds::Duration_t(5, 0); pqos.name("Participant_pub"); pqos.transport().use_builtin_transports = false; diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldSubscriber.cpp b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldSubscriber.cpp index df49a3d256d..9462b1b567c 100644 --- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldSubscriber.cpp +++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldSubscriber.cpp @@ -30,7 +30,7 @@ using namespace eprosima::fastdds::dds; using namespace eprosima::fastdds::rtps; -using IPLocator = eprosima::fastrtps::rtps::IPLocator; +using IPLocator = eprosima::fastdds::rtps::IPLocator; HelloWorldSubscriber::HelloWorldSubscriber() : participant_(nullptr) @@ -75,7 +75,7 @@ bool HelloWorldSubscriber::init( initial_peer_locator.port = port; pqos.wire_protocol().builtin.initialPeersList.push_back(initial_peer_locator); // Publisher's meta channel - pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastrtps::c_TimeInfinite; + pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::c_TimeInfinite; pqos.wire_protocol().builtin.discovery_config.leaseDuration_announcementperiod = Duration_t(5, 0); pqos.name("Participant_sub"); diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorld_main.cpp b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorld_main.cpp index f1b1677e472..f78133b9c1d 100644 --- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorld_main.cpp +++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorld_main.cpp @@ -167,7 +167,7 @@ const option::Descriptor usage[] = { }; using namespace eprosima; -using namespace fastrtps; +using namespace fastdds; using namespace rtps; int main( int argc, diff --git a/examples/cpp/dds/Keys/keys.cpp b/examples/cpp/dds/Keys/keys.cpp index 9faba4e251d..079047eb7ce 100644 --- a/examples/cpp/dds/Keys/keys.cpp +++ b/examples/cpp/dds/Keys/keys.cpp @@ -19,7 +19,7 @@ #include "samplePubSubTypes.h" using namespace eprosima::fastdds::dds; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; //Enums and configuration structure enum Reliability_type @@ -216,7 +216,7 @@ DataWriter* initPublisher( { //Create Publisher Participant DomainParticipantQos ppqos; - ppqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastrtps::c_TimeInfinite; + ppqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::c_TimeInfinite; ppqos.name("PublisherParticipant"); PubParticipant = DomainParticipantFactory::get_instance()->create_participant(0, ppqos); @@ -274,7 +274,7 @@ DataReader* initSubscriber( { //Create Subscriber Participant DomainParticipantQos psqos; - psqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastrtps::c_TimeInfinite; + psqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::c_TimeInfinite; psqos.name("SubscriberParticipant"); SubParticipant = DomainParticipantFactory::get_instance()->create_participant(0, psqos); diff --git a/examples/cpp/dds/Keys/samplePubSubTypes.cxx b/examples/cpp/dds/Keys/samplePubSubTypes.cxx index 321f250d975..e9e7bc3d756 100644 --- a/examples/cpp/dds/Keys/samplePubSubTypes.cxx +++ b/examples/cpp/dds/Keys/samplePubSubTypes.cxx @@ -27,8 +27,8 @@ #include "sampleCdrAux.hpp" #include "sampleTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; samplePubSubType::samplePubSubType() diff --git a/examples/cpp/dds/Keys/samplePubSubTypes.h b/examples/cpp/dds/Keys/samplePubSubTypes.h index 1ec6375ba7f..85770981545 100644 --- a/examples/cpp/dds/Keys/samplePubSubTypes.h +++ b/examples/cpp/dds/Keys/samplePubSubTypes.h @@ -54,18 +54,18 @@ class samplePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -80,7 +80,7 @@ class samplePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/examples/cpp/dds/RequestReplyExample/CalculatorClient.cpp b/examples/cpp/dds/RequestReplyExample/CalculatorClient.cpp index 3c6aa796f9a..45ad39c952a 100644 --- a/examples/cpp/dds/RequestReplyExample/CalculatorClient.cpp +++ b/examples/cpp/dds/RequestReplyExample/CalculatorClient.cpp @@ -54,7 +54,7 @@ class CalculatorClient } } - eprosima::fastrtps::rtps::WriteParams write_params; + eprosima::fastdds::rtps::WriteParams write_params; // Structures for waiting reply std::mutex reception_mutex; diff --git a/examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.cxx b/examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.cxx index 7d458c70499..bdcd570ab7b 100644 --- a/examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.cxx +++ b/examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "CalculatorCdrAux.hpp" #include "CalculatorTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; RequestTypePubSubType::RequestTypePubSubType() diff --git a/examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.h b/examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.h index f8a5c87c045..31387bc0040 100644 --- a/examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.h +++ b/examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.h @@ -54,18 +54,18 @@ class RequestTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -80,7 +80,7 @@ class RequestTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -145,18 +145,18 @@ class ReplyTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -171,7 +171,7 @@ class ReplyTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/examples/cpp/dds/RequestReplyExample/CalculatorServer.cpp b/examples/cpp/dds/RequestReplyExample/CalculatorServer.cpp index 59f933e5c96..a825096798b 100644 --- a/examples/cpp/dds/RequestReplyExample/CalculatorServer.cpp +++ b/examples/cpp/dds/RequestReplyExample/CalculatorServer.cpp @@ -69,7 +69,7 @@ class CalculatorServer reply.z(request.x() / request.y()); } } - eprosima::fastrtps::rtps::WriteParams write_params; + eprosima::fastdds::rtps::WriteParams write_params; write_params.related_sample_identity().writer_guid(sample_info.sample_identity.writer_guid()); write_params.related_sample_identity().sequence_number(sample_info.sample_identity.sequence_number()); writer_->write(reinterpret_cast(&reply), write_params); diff --git a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPubSubTypes.cxx index aa161b2e163..a73cf0ffa55 100644 --- a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "HelloWorldCdrAux.hpp" #include "HelloWorldTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; HelloWorldPubSubType::HelloWorldPubSubType() diff --git a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPubSubTypes.h b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPubSubTypes.h index 7c83d2b300b..f048c9be28e 100644 --- a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPubSubTypes.h +++ b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPubSubTypes.h @@ -54,18 +54,18 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -80,7 +80,7 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/examples/cpp/dds/SecureHelloWorldExample/HelloWorld_main.cpp b/examples/cpp/dds/SecureHelloWorldExample/HelloWorld_main.cpp index 215766a17e2..91394aad3ee 100644 --- a/examples/cpp/dds/SecureHelloWorldExample/HelloWorld_main.cpp +++ b/examples/cpp/dds/SecureHelloWorldExample/HelloWorld_main.cpp @@ -23,7 +23,7 @@ #include "HelloWorldSubscriber.h" using namespace eprosima; -using namespace fastrtps; +using namespace fastdds; using namespace rtps; using namespace eprosima::fastdds::dds; diff --git a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPubSubTypes.cxx index aa161b2e163..a73cf0ffa55 100644 --- a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "HelloWorldCdrAux.hpp" #include "HelloWorldTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; HelloWorldPubSubType::HelloWorldPubSubType() diff --git a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPubSubTypes.h b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPubSubTypes.h index 7c83d2b300b..f048c9be28e 100644 --- a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPubSubTypes.h +++ b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPubSubTypes.h @@ -54,18 +54,18 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -80,7 +80,7 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/examples/cpp/dds/StaticHelloWorldExample/HelloWorld_main.cpp b/examples/cpp/dds/StaticHelloWorldExample/HelloWorld_main.cpp index 954b0f91ae8..2e76def6fb5 100644 --- a/examples/cpp/dds/StaticHelloWorldExample/HelloWorld_main.cpp +++ b/examples/cpp/dds/StaticHelloWorldExample/HelloWorld_main.cpp @@ -23,7 +23,7 @@ #include "HelloWorldSubscriber.h" using namespace eprosima; -using namespace fastrtps; +using namespace fastdds; using namespace rtps; using namespace eprosima::fastdds::dds; diff --git a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.cxx b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.cxx index 9465143dada..792d35a17d9 100644 --- a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "LoanableHelloWorldCdrAux.hpp" #include "LoanableHelloWorldTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; LoanableHelloWorldPubSubType::LoanableHelloWorldPubSubType() diff --git a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.h b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.h index 67ffb09d3bc..c2bd7d23106 100644 --- a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.h +++ b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.h @@ -87,18 +87,18 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -113,7 +113,7 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.cxx b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.cxx index 9465143dada..792d35a17d9 100644 --- a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "LoanableHelloWorldCdrAux.hpp" #include "LoanableHelloWorldTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; LoanableHelloWorldPubSubType::LoanableHelloWorldPubSubType() diff --git a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.h b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.h index 67ffb09d3bc..c2bd7d23106 100644 --- a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.h +++ b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.h @@ -87,18 +87,18 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -113,7 +113,7 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/examples/cpp/hello_world/HelloWorldPubSubTypes.cxx b/examples/cpp/hello_world/HelloWorldPubSubTypes.cxx index aa161b2e163..a73cf0ffa55 100644 --- a/examples/cpp/hello_world/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/hello_world/HelloWorldPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "HelloWorldCdrAux.hpp" #include "HelloWorldTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; HelloWorldPubSubType::HelloWorldPubSubType() diff --git a/examples/cpp/hello_world/HelloWorldPubSubTypes.h b/examples/cpp/hello_world/HelloWorldPubSubTypes.h index 7c83d2b300b..f048c9be28e 100644 --- a/examples/cpp/hello_world/HelloWorldPubSubTypes.h +++ b/examples/cpp/hello_world/HelloWorldPubSubTypes.h @@ -54,18 +54,18 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -80,7 +80,7 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/examples/cpp/hello_world/WaitsetSubscriberApp.cpp b/examples/cpp/hello_world/WaitsetSubscriberApp.cpp index ff98788651f..49a39760e96 100644 --- a/examples/cpp/hello_world/WaitsetSubscriberApp.cpp +++ b/examples/cpp/hello_world/WaitsetSubscriberApp.cpp @@ -115,7 +115,7 @@ void WaitsetSubscriberApp::run() while (!is_stopped()) { ConditionSeq triggered_conditions; - ReturnCode_t ret_code = wait_set_.wait(triggered_conditions, eprosima::fastrtps::c_TimeInfinite); + ReturnCode_t ret_code = wait_set_.wait(triggered_conditions, eprosima::fastdds::c_TimeInfinite); if (RETCODE_OK != ret_code) { EPROSIMA_LOG_ERROR(SUBSCRIBER_WAITSET, "Error waiting for conditions"); diff --git a/examples/cpp/rtps/AsSocket/TestReaderSocket.cpp b/examples/cpp/rtps/AsSocket/TestReaderSocket.cpp index c42c61862da..b8a82dcab19 100644 --- a/examples/cpp/rtps/AsSocket/TestReaderSocket.cpp +++ b/examples/cpp/rtps/AsSocket/TestReaderSocket.cpp @@ -28,8 +28,8 @@ #include #include -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; TestReaderSocket::TestReaderSocket() : mp_participant(nullptr) @@ -52,7 +52,7 @@ bool TestReaderSocket::init( { //CREATE PARTICIPANT RTPSParticipantAttributes PParam; - PParam.builtin.discovery_config.discoveryProtocol = eprosima::fastrtps::rtps::DiscoveryProtocol_t::NONE; + PParam.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::NONE; PParam.builtin.use_WriterLivelinessProtocol = false; mp_participant = RTPSDomain::createParticipant(0, PParam); if (mp_participant == nullptr) diff --git a/examples/cpp/rtps/AsSocket/TestReaderSocket.h b/examples/cpp/rtps/AsSocket/TestReaderSocket.h index 5acfc19ebba..093dfc09e2d 100644 --- a/examples/cpp/rtps/AsSocket/TestReaderSocket.h +++ b/examples/cpp/rtps/AsSocket/TestReaderSocket.h @@ -23,13 +23,13 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSParticipant; class ReaderHistory; class RTPSReader; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima class TestReaderSocket @@ -40,11 +40,11 @@ class TestReaderSocket virtual ~TestReaderSocket(); - eprosima::fastrtps::rtps::RTPSParticipant* mp_participant; + eprosima::fastdds::rtps::RTPSParticipant* mp_participant; - eprosima::fastrtps::rtps::RTPSReader* mp_reader; + eprosima::fastdds::rtps::RTPSReader* mp_reader; - eprosima::fastrtps::rtps::ReaderHistory* mp_history; + eprosima::fastdds::rtps::ReaderHistory* mp_history; bool init( std::string ip, @@ -52,7 +52,7 @@ class TestReaderSocket void run(); - class MyListener : public eprosima::fastrtps::rtps::ReaderListener + class MyListener : public eprosima::fastdds::rtps::ReaderListener { public: @@ -66,8 +66,9 @@ class TestReaderSocket } void on_new_cache_change_added( - eprosima::fastrtps::rtps::RTPSReader* reader, - const eprosima::fastrtps::rtps::CacheChange_t* const change) override; + eprosima::fastdds::rtps::RTPSReader* reader, + const eprosima::fastdds::rtps::CacheChange_t* const change) override; + uint32_t m_received; } m_listener; diff --git a/examples/cpp/rtps/AsSocket/TestWriterSocket.cpp b/examples/cpp/rtps/AsSocket/TestWriterSocket.cpp index 4b8b4f8a1ad..de31b665d0c 100644 --- a/examples/cpp/rtps/AsSocket/TestWriterSocket.cpp +++ b/examples/cpp/rtps/AsSocket/TestWriterSocket.cpp @@ -29,8 +29,8 @@ #include #include -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; TestWriterSocket::TestWriterSocket() : mp_participant(nullptr) @@ -51,7 +51,7 @@ bool TestWriterSocket::init( { //CREATE PARTICIPANT RTPSParticipantAttributes PParam; - PParam.builtin.discovery_config.discoveryProtocol = eprosima::fastrtps::rtps::DiscoveryProtocol::NONE; + PParam.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::NONE; PParam.builtin.use_WriterLivelinessProtocol = false; mp_participant = RTPSDomain::createParticipant(0, PParam); if (mp_participant == nullptr) diff --git a/examples/cpp/rtps/AsSocket/TestWriterSocket.h b/examples/cpp/rtps/AsSocket/TestWriterSocket.h index c8151687d47..b427f872ebc 100644 --- a/examples/cpp/rtps/AsSocket/TestWriterSocket.h +++ b/examples/cpp/rtps/AsSocket/TestWriterSocket.h @@ -25,13 +25,13 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSParticipant; class WriterHistory; class RTPSWriter; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima class TestWriterSocket @@ -43,11 +43,11 @@ class TestWriterSocket virtual ~TestWriterSocket(); - eprosima::fastrtps::rtps::RTPSParticipant* mp_participant; + eprosima::fastdds::rtps::RTPSParticipant* mp_participant; - eprosima::fastrtps::rtps::RTPSWriter* mp_writer; + eprosima::fastdds::rtps::RTPSWriter* mp_writer; - eprosima::fastrtps::rtps::WriterHistory* mp_history; + eprosima::fastdds::rtps::WriterHistory* mp_history; bool init( std::string ip, diff --git a/examples/cpp/rtps/AsSocket/main_RTPSTest.cpp b/examples/cpp/rtps/AsSocket/main_RTPSTest.cpp index 1b15de7c479..0d264664fb9 100644 --- a/examples/cpp/rtps/AsSocket/main_RTPSTest.cpp +++ b/examples/cpp/rtps/AsSocket/main_RTPSTest.cpp @@ -26,7 +26,7 @@ #include "TestReaderSocket.h" using namespace eprosima; -using namespace fastrtps; +using namespace fastdds; using namespace rtps; using namespace std; diff --git a/examples/cpp/rtps/Persistent/TestReaderPersistent.cpp b/examples/cpp/rtps/Persistent/TestReaderPersistent.cpp index 7f3c9b409da..f3ce257c420 100644 --- a/examples/cpp/rtps/Persistent/TestReaderPersistent.cpp +++ b/examples/cpp/rtps/Persistent/TestReaderPersistent.cpp @@ -29,8 +29,8 @@ #include #include -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; TestReaderPersistent::TestReaderPersistent() : mp_participant(nullptr) @@ -51,7 +51,7 @@ bool TestReaderPersistent::init() { //CREATE PARTICIPANT RTPSParticipantAttributes PParam; - PParam.builtin.discovery_config.discoveryProtocol = eprosima::fastrtps::rtps::DiscoveryProtocol::SIMPLE; + PParam.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::SIMPLE; PParam.builtin.use_WriterLivelinessProtocol = true; mp_participant = RTPSDomain::createParticipant(0, PParam); if (mp_participant == nullptr) diff --git a/examples/cpp/rtps/Persistent/TestReaderPersistent.h b/examples/cpp/rtps/Persistent/TestReaderPersistent.h index 1f52314504c..e11b00e8142 100644 --- a/examples/cpp/rtps/Persistent/TestReaderPersistent.h +++ b/examples/cpp/rtps/Persistent/TestReaderPersistent.h @@ -23,13 +23,13 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSParticipant; class ReaderHistory; class RTPSReader; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima class TestReaderPersistent @@ -38,13 +38,13 @@ class TestReaderPersistent TestReaderPersistent(); virtual ~TestReaderPersistent(); - eprosima::fastrtps::rtps::RTPSParticipant* mp_participant; - eprosima::fastrtps::rtps::RTPSReader* mp_reader; - eprosima::fastrtps::rtps::ReaderHistory* mp_history; + eprosima::fastdds::rtps::RTPSParticipant* mp_participant; + eprosima::fastdds::rtps::RTPSReader* mp_reader; + eprosima::fastdds::rtps::ReaderHistory* mp_history; bool init(); //Initialization bool reg(); //Register void run(); //Run - class MyListener : public eprosima::fastrtps::rtps::ReaderListener + class MyListener : public eprosima::fastdds::rtps::ReaderListener { public: @@ -59,13 +59,14 @@ class TestReaderPersistent } void on_new_cache_change_added( - eprosima::fastrtps::rtps::RTPSReader* reader, - const eprosima::fastrtps::rtps::CacheChange_t* const change) override; + eprosima::fastdds::rtps::RTPSReader* reader, + const eprosima::fastdds::rtps::CacheChange_t* const change) override; void on_reader_matched( - eprosima::fastrtps::rtps::RTPSReader*, - const eprosima::fastrtps::rtps::MatchingInfo& info) override + eprosima::fastdds::rtps::RTPSReader*, + const eprosima::fastdds::rtps::MatchingInfo& info) override + { - if (info.status == eprosima::fastrtps::rtps::MATCHED_MATCHING) + if (info.status == eprosima::fastdds::rtps::MATCHED_MATCHING) { n_matched++; } @@ -73,7 +74,6 @@ class TestReaderPersistent uint32_t n_received; uint32_t n_matched; - } m_listener; }; diff --git a/examples/cpp/rtps/Persistent/TestWriterPersistent.cpp b/examples/cpp/rtps/Persistent/TestWriterPersistent.cpp index 0170d72bd9e..8972f6fb649 100644 --- a/examples/cpp/rtps/Persistent/TestWriterPersistent.cpp +++ b/examples/cpp/rtps/Persistent/TestWriterPersistent.cpp @@ -32,8 +32,8 @@ #include #include -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; using namespace std; TestWriterPersistent::TestWriterPersistent() @@ -55,7 +55,7 @@ bool TestWriterPersistent::init() { //CREATE PARTICIPANT RTPSParticipantAttributes PParam; - PParam.builtin.discovery_config.discoveryProtocol = eprosima::fastrtps::rtps::DiscoveryProtocol::SIMPLE; + PParam.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::SIMPLE; PParam.builtin.use_WriterLivelinessProtocol = true; mp_participant = RTPSDomain::createParticipant(0, PParam); if (mp_participant == nullptr) diff --git a/examples/cpp/rtps/Persistent/TestWriterPersistent.h b/examples/cpp/rtps/Persistent/TestWriterPersistent.h index 0e4e875c51c..4cd38648312 100644 --- a/examples/cpp/rtps/Persistent/TestWriterPersistent.h +++ b/examples/cpp/rtps/Persistent/TestWriterPersistent.h @@ -23,13 +23,13 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSParticipant; class WriterHistory; class RTPSWriter; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima class TestWriterPersistent @@ -38,14 +38,14 @@ class TestWriterPersistent TestWriterPersistent(); virtual ~TestWriterPersistent(); - eprosima::fastrtps::rtps::RTPSParticipant* mp_participant; - eprosima::fastrtps::rtps::RTPSWriter* mp_writer; - eprosima::fastrtps::rtps::WriterHistory* mp_history; + eprosima::fastdds::rtps::RTPSParticipant* mp_participant; + eprosima::fastdds::rtps::RTPSWriter* mp_writer; + eprosima::fastdds::rtps::WriterHistory* mp_history; bool init(); //Initialize writer bool reg(); //Register the Writer void run( uint16_t samples); //Run the Writer - class MyListener : public eprosima::fastrtps::rtps::WriterListener + class MyListener : public eprosima::fastdds::rtps::WriterListener { public: @@ -59,10 +59,10 @@ class TestWriterPersistent } void onWriterMatched( - eprosima::fastrtps::rtps::RTPSWriter*, - eprosima::fastrtps::rtps::MatchingInfo& info) override + eprosima::fastdds::rtps::RTPSWriter*, + eprosima::fastdds::rtps::MatchingInfo& info) override { - if (info.status == eprosima::fastrtps::rtps::MATCHED_MATCHING) + if (info.status == eprosima::fastdds::rtps::MATCHED_MATCHING) { ++n_matched; } @@ -72,7 +72,7 @@ class TestWriterPersistent private: - using eprosima::fastrtps::rtps::WriterListener::onWriterMatched; + using eprosima::fastdds::rtps::WriterListener::onWriterMatched; } m_listener; }; diff --git a/examples/cpp/rtps/Persistent/main_RTPSTest.cpp b/examples/cpp/rtps/Persistent/main_RTPSTest.cpp index 171675f3bef..fc50819521d 100644 --- a/examples/cpp/rtps/Persistent/main_RTPSTest.cpp +++ b/examples/cpp/rtps/Persistent/main_RTPSTest.cpp @@ -26,7 +26,7 @@ #include "TestWriterPersistent.h" using namespace eprosima; -using namespace fastrtps; +using namespace fastdds; using namespace rtps; using namespace std; diff --git a/examples/cpp/rtps/Registered/TestReaderRegistered.cpp b/examples/cpp/rtps/Registered/TestReaderRegistered.cpp index 32f95f7b87d..1aba5e48c5d 100644 --- a/examples/cpp/rtps/Registered/TestReaderRegistered.cpp +++ b/examples/cpp/rtps/Registered/TestReaderRegistered.cpp @@ -29,8 +29,8 @@ #include #include -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; TestReaderRegistered::TestReaderRegistered() : mp_participant(nullptr) @@ -51,7 +51,7 @@ bool TestReaderRegistered::init() { //CREATE PARTICIPANT RTPSParticipantAttributes PParam; - PParam.builtin.discovery_config.discoveryProtocol = eprosima::fastrtps::rtps::DiscoveryProtocol::SIMPLE; + PParam.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::SIMPLE; PParam.builtin.use_WriterLivelinessProtocol = true; mp_participant = RTPSDomain::createParticipant(0, PParam); if (mp_participant == nullptr) diff --git a/examples/cpp/rtps/Registered/TestReaderRegistered.h b/examples/cpp/rtps/Registered/TestReaderRegistered.h index bd8f9da4e8b..514d4b87e37 100644 --- a/examples/cpp/rtps/Registered/TestReaderRegistered.h +++ b/examples/cpp/rtps/Registered/TestReaderRegistered.h @@ -24,13 +24,13 @@ namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSParticipant; class ReaderHistory; class RTPSReader; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima class TestReaderRegistered @@ -39,13 +39,13 @@ class TestReaderRegistered TestReaderRegistered(); virtual ~TestReaderRegistered(); - eprosima::fastrtps::rtps::RTPSParticipant* mp_participant; - eprosima::fastrtps::rtps::RTPSReader* mp_reader; - eprosima::fastrtps::rtps::ReaderHistory* mp_history; + eprosima::fastdds::rtps::RTPSParticipant* mp_participant; + eprosima::fastdds::rtps::RTPSReader* mp_reader; + eprosima::fastdds::rtps::ReaderHistory* mp_history; bool init(); //Initialization bool reg(); //Register void run(); //Run - class MyListener : public eprosima::fastrtps::rtps::ReaderListener + class MyListener : public eprosima::fastdds::rtps::ReaderListener { public: @@ -60,13 +60,14 @@ class TestReaderRegistered } void on_new_cache_change_added( - eprosima::fastrtps::rtps::RTPSReader* reader, - const eprosima::fastrtps::rtps::CacheChange_t* const change) override; + eprosima::fastdds::rtps::RTPSReader* reader, + const eprosima::fastdds::rtps::CacheChange_t* const change) override; void on_reader_matched( - eprosima::fastrtps::rtps::RTPSReader*, - const eprosima::fastrtps::rtps::MatchingInfo& info) override + eprosima::fastdds::rtps::RTPSReader*, + const eprosima::fastdds::rtps::MatchingInfo& info) override + { - if (info.status == eprosima::fastrtps::rtps::MATCHED_MATCHING) + if (info.status == eprosima::fastdds::rtps::MATCHED_MATCHING) { n_matched++; } @@ -74,7 +75,6 @@ class TestReaderRegistered uint32_t n_received; uint32_t n_matched; - } m_listener; }; diff --git a/examples/cpp/rtps/Registered/TestWriterRegistered.cpp b/examples/cpp/rtps/Registered/TestWriterRegistered.cpp index 05071191227..9f0fa278037 100644 --- a/examples/cpp/rtps/Registered/TestWriterRegistered.cpp +++ b/examples/cpp/rtps/Registered/TestWriterRegistered.cpp @@ -32,8 +32,8 @@ #include #include -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; using namespace std; TestWriterRegistered::TestWriterRegistered() @@ -55,7 +55,7 @@ bool TestWriterRegistered::init() { //CREATE PARTICIPANT RTPSParticipantAttributes PParam; - PParam.builtin.discovery_config.discoveryProtocol = eprosima::fastrtps::rtps::DiscoveryProtocol::SIMPLE; + PParam.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::SIMPLE; PParam.builtin.use_WriterLivelinessProtocol = true; mp_participant = RTPSDomain::createParticipant(0, PParam); if (mp_participant == nullptr) diff --git a/examples/cpp/rtps/Registered/TestWriterRegistered.h b/examples/cpp/rtps/Registered/TestWriterRegistered.h index 2e8837ffd0b..5f8a035c827 100644 --- a/examples/cpp/rtps/Registered/TestWriterRegistered.h +++ b/examples/cpp/rtps/Registered/TestWriterRegistered.h @@ -23,12 +23,12 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSParticipant; class WriterHistory; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima class TestWriterRegistered @@ -37,14 +37,14 @@ class TestWriterRegistered TestWriterRegistered(); virtual ~TestWriterRegistered(); - eprosima::fastrtps::rtps::RTPSParticipant* mp_participant; - eprosima::fastrtps::rtps::RTPSWriter* mp_writer; - eprosima::fastrtps::rtps::WriterHistory* mp_history; + eprosima::fastdds::rtps::RTPSParticipant* mp_participant; + eprosima::fastdds::rtps::RTPSWriter* mp_writer; + eprosima::fastdds::rtps::WriterHistory* mp_history; bool init(); //Initialize writer bool reg(); //Register the Writer void run( uint16_t samples); //Run the Writer - class MyListener : public eprosima::fastrtps::rtps::WriterListener + class MyListener : public eprosima::fastdds::rtps::WriterListener { public: @@ -58,10 +58,10 @@ class TestWriterRegistered } void onWriterMatched( - eprosima::fastrtps::rtps::RTPSWriter*, - eprosima::fastrtps::rtps::MatchingInfo& info) override + eprosima::fastdds::rtps::RTPSWriter*, + eprosima::fastdds::rtps::MatchingInfo& info) override { - if (info.status == eprosima::fastrtps::rtps::MATCHED_MATCHING) + if (info.status == eprosima::fastdds::rtps::MATCHED_MATCHING) { ++n_matched; } @@ -71,7 +71,7 @@ class TestWriterRegistered private: - using eprosima::fastrtps::rtps::WriterListener::onWriterMatched; + using eprosima::fastdds::rtps::WriterListener::onWriterMatched; } m_listener; }; diff --git a/examples/cpp/rtps/Registered/main_RTPSTest.cpp b/examples/cpp/rtps/Registered/main_RTPSTest.cpp index cf444a2a450..43778a89ec7 100644 --- a/examples/cpp/rtps/Registered/main_RTPSTest.cpp +++ b/examples/cpp/rtps/Registered/main_RTPSTest.cpp @@ -26,7 +26,7 @@ #include "TestWriterRegistered.h" using namespace eprosima; -using namespace fastrtps; +using namespace fastdds; using namespace rtps; using namespace std; diff --git a/examples/cpp/xtypes/SubscriberApp.cpp b/examples/cpp/xtypes/SubscriberApp.cpp index 46335e5c449..7c1b1b0f050 100644 --- a/examples/cpp/xtypes/SubscriberApp.cpp +++ b/examples/cpp/xtypes/SubscriberApp.cpp @@ -189,7 +189,7 @@ void SubscriberApp::on_data_available( void SubscriberApp::on_data_writer_discovery( DomainParticipant* /*participant*/, - eprosima::fastrtps::rtps::WriterDiscoveryInfo&& info, + eprosima::fastdds::rtps::WriterDiscoveryInfo&& info, bool& should_be_ignored) { // We don't want to ignore the writer diff --git a/examples/cpp/xtypes/SubscriberApp.hpp b/examples/cpp/xtypes/SubscriberApp.hpp index 951b94694ea..3b6be9b0480 100644 --- a/examples/cpp/xtypes/SubscriberApp.hpp +++ b/examples/cpp/xtypes/SubscriberApp.hpp @@ -60,7 +60,7 @@ class SubscriberApp : public Application, public DomainParticipantListener void on_data_writer_discovery( DomainParticipant* participant, - eprosima::fastrtps::rtps::WriterDiscoveryInfo&& info, + eprosima::fastdds::rtps::WriterDiscoveryInfo&& info, bool& should_be_ignored) override; //! Run subscriber diff --git a/fuzz/C++/fuzz_XMLProfiles/fuzz_XMLProfiles.cxx b/fuzz/C++/fuzz_XMLProfiles/fuzz_XMLProfiles.cxx index 60dfb3fe62c..cfcf54d6fd9 100644 --- a/fuzz/C++/fuzz_XMLProfiles/fuzz_XMLProfiles.cxx +++ b/fuzz/C++/fuzz_XMLProfiles/fuzz_XMLProfiles.cxx @@ -3,7 +3,7 @@ #include using namespace eprosima; -using namespace eprosima::fastrtps; +using namespace eprosima::fastdds; static bool initialized = false; diff --git a/fuzz/C++/fuzz_processCDRMsg/fuzz_processCDRMsg.cxx b/fuzz/C++/fuzz_processCDRMsg/fuzz_processCDRMsg.cxx index cc1d1faa45c..4c57fdb7553 100644 --- a/fuzz/C++/fuzz_processCDRMsg/fuzz_processCDRMsg.cxx +++ b/fuzz/C++/fuzz_processCDRMsg/fuzz_processCDRMsg.cxx @@ -11,8 +11,8 @@ #define MIN_SIZE RTPSMESSAGE_HEADER_SIZE #define MAX_SIZE 64000 -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; static const Locator_t remoteLocator; static const Locator_t recvLocator; diff --git a/include/fastdds/dds/common/InstanceHandle.hpp b/include/fastdds/dds/common/InstanceHandle.hpp index 8f55182cb21..ae3ecee39d0 100644 --- a/include/fastdds/dds/common/InstanceHandle.hpp +++ b/include/fastdds/dds/common/InstanceHandle.hpp @@ -28,7 +28,7 @@ namespace eprosima { namespace fastdds { namespace dds { -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; extern FASTDDS_EXPORTED_API const InstanceHandle_t HANDLE_NIL; diff --git a/include/fastdds/dds/core/condition/WaitSet.hpp b/include/fastdds/dds/core/condition/WaitSet.hpp index 367fd591ce2..7838117de74 100644 --- a/include/fastdds/dds/core/condition/WaitSet.hpp +++ b/include/fastdds/dds/core/condition/WaitSet.hpp @@ -86,7 +86,7 @@ class WaitSet */ FASTDDS_EXPORTED_API ReturnCode_t wait( ConditionSeq& active_conditions, - const fastrtps::Duration_t timeout) const; + const Duration_t timeout) const; /** * @brief Retrieves the list of attached conditions diff --git a/include/fastdds/dds/core/policy/ParameterTypes.hpp b/include/fastdds/dds/core/policy/ParameterTypes.hpp index c09da61d6d1..1f80b455b20 100644 --- a/include/fastdds/dds/core/policy/ParameterTypes.hpp +++ b/include/fastdds/dds/core/policy/ParameterTypes.hpp @@ -40,8 +40,7 @@ #endif // if HAVE_SECURITY namespace eprosima { - -namespace fastrtps { +namespace fastdds { namespace rtps { struct CDRMessage_t; #if HAVE_SECURITY @@ -54,9 +53,7 @@ typedef uint32_t ParticipantSecurityAttributesMask; } // namespace security #endif // HAVE_SECURITY } // namespace rtps -} // namespace fastrtps -namespace fastdds { namespace dds { /** @@ -237,7 +234,7 @@ class ParameterKey_t : public Parameter_t public: //!Instance Handle.
By default, c_InstanceHandle_Unknown. - fastrtps::rtps::InstanceHandle_t key; + fastdds::rtps::InstanceHandle_t key; /** * @brief Constructor without parameters */ @@ -268,7 +265,7 @@ class ParameterKey_t : public Parameter_t ParameterKey_t( ParameterId_t pid, uint16_t in_length, - const fastrtps::rtps::InstanceHandle_t& ke) + const fastdds::rtps::InstanceHandle_t& ke) : Parameter_t(pid, in_length) , key(ke) { @@ -468,7 +465,7 @@ class ParameterGuid_t : public Parameter_t public: //!GUID
By default, unknown GUID. - fastrtps::rtps::GUID_t guid; + fastdds::rtps::GUID_t guid; /** * @brief Constructor without parameters @@ -500,7 +497,7 @@ class ParameterGuid_t : public Parameter_t ParameterGuid_t( ParameterId_t pid, uint16_t in_length, - const fastrtps::rtps::GUID_t& guidin) + const fastdds::rtps::GUID_t& guidin) : Parameter_t(pid, in_length) , guid(guidin) { @@ -516,10 +513,10 @@ class ParameterGuid_t : public Parameter_t ParameterGuid_t( ParameterId_t pid, uint16_t in_length, - const fastrtps::rtps::InstanceHandle_t& iH) + const fastdds::rtps::InstanceHandle_t& iH) : Parameter_t(pid, in_length) { - fastrtps::rtps::iHandle2GUID(guid, iH); + fastdds::rtps::iHandle2GUID(guid, iH); } }; @@ -571,14 +568,14 @@ class ParameterProtocolVersion_t : public Parameter_t public: //!Protocol Version.
By default, c_ProtocolVersion. - fastrtps::rtps::ProtocolVersion_t protocolVersion; + fastdds::rtps::ProtocolVersion_t protocolVersion; /** * @brief Constructor without parameters */ ParameterProtocolVersion_t() { - protocolVersion = fastrtps::rtps::c_ProtocolVersion; + protocolVersion = fastdds::rtps::c_ProtocolVersion; } /** @@ -592,7 +589,7 @@ class ParameterProtocolVersion_t : public Parameter_t uint16_t in_length) : Parameter_t(pid, in_length) { - protocolVersion = fastrtps::rtps::c_ProtocolVersion; + protocolVersion = fastdds::rtps::c_ProtocolVersion; } }; @@ -643,7 +640,7 @@ class ParameterIP4Address_t : public Parameter_t public: //!Address
By default [0,0,0,0]. - fastrtps::rtps::octet address[4]; + fastdds::rtps::octet address[4]; /** * @brief Constructor without parameters @@ -676,10 +673,10 @@ class ParameterIP4Address_t : public Parameter_t * @param o4 Fourth octet */ void setIP4Address( - fastrtps::rtps::octet o1, - fastrtps::rtps::octet o2, - fastrtps::rtps::octet o3, - fastrtps::rtps::octet o4) + fastdds::rtps::octet o1, + fastdds::rtps::octet o2, + fastdds::rtps::octet o3, + fastdds::rtps::octet o4) { address[0] = o1; address[1] = o2; @@ -803,7 +800,7 @@ class ParameterCount_t : public Parameter_t public: //!Count
By default, 0. - fastrtps::rtps::Count_t count; + fastdds::rtps::Count_t count; /** * @brief Constructor without parameter @@ -839,7 +836,7 @@ class ParameterEntityId_t : public Parameter_t public: //!EntityId
By default, ENTITYID_UNKNOWN. - fastrtps::rtps::EntityId_t entityId; + fastdds::rtps::EntityId_t entityId; /** * @brief Constructor without parameters @@ -875,7 +872,7 @@ class ParameterTime_t : public Parameter_t public: //!Time
By default, 0. - fastrtps::rtps::Time_t time; + fastdds::rtps::Time_t time; /** * @brief Constructor without parameters @@ -909,7 +906,7 @@ class ParameterBuiltinEndpointSet_t : public Parameter_t public: //!Builtin Endpoint Set
By default, 0. - fastrtps::rtps::BuiltinEndpointSet_t endpointSet; + fastdds::rtps::BuiltinEndpointSet_t endpointSet; /** * @brief Constructor without parameters @@ -945,7 +942,7 @@ class ParameterNetworkConfigSet_t : public Parameter_t public: //!Network Config Set
By default, 0. - fastrtps::rtps::NetworkConfigSet_t netconfigSet; + fastdds::rtps::NetworkConfigSet_t netconfigSet; /** * @brief Constructor without parameters @@ -984,7 +981,7 @@ class ParameterProperty_t private: //!Data
By default, nullptr. - fastrtps::rtps::octet* data; + fastdds::rtps::octet* data; public: @@ -1004,7 +1001,7 @@ class ParameterProperty_t explicit ParameterProperty_t( void* ptr) { - data = (fastrtps::rtps::octet*)ptr; + data = (fastdds::rtps::octet*)ptr; } /** @@ -1054,7 +1051,7 @@ class ParameterProperty_t return false; } - fastrtps::rtps::octet* current = data; + fastdds::rtps::octet* current = data; memcpy(current, &first_size, 4); memcpy(current + 4, new_value.first.c_str(), first_size); memset(current + 4 + first_size, 0, first_alignment); @@ -1114,7 +1111,7 @@ class ParameterProperty_t * @return Size of the pointer data */ static uint32_t element_size( - const fastrtps::rtps::octet* ptr) + const fastdds::rtps::octet* ptr) { //Size of the element (with alignment) uint32_t size = *(uint32_t*)ptr; @@ -1187,7 +1184,7 @@ class ParameterPropertyList_t : public Parameter_t private: //!Properties - fastrtps::rtps::SerializedPayload_t properties_; + fastdds::rtps::SerializedPayload_t properties_; //!Number of properties uint32_t Nproperties_ = 0; //!Maximum size @@ -1212,7 +1209,7 @@ class ParameterPropertyList_t : public Parameter_t * @param ptr Octet pointer to be set */ iterator( - fastrtps::rtps::octet* ptr) + fastdds::rtps::octet* ptr) : ptr_(ptr) , value_(ptr) { @@ -1270,7 +1267,7 @@ class ParameterPropertyList_t : public Parameter_t * * @return the pointer */ - fastrtps::rtps::octet* address() const + fastdds::rtps::octet* address() const { return ptr_; } @@ -1278,7 +1275,7 @@ class ParameterPropertyList_t : public Parameter_t private: //!Pointer - fastrtps::rtps::octet* ptr_; + fastdds::rtps::octet* ptr_; //!Parameter Property ParameterProperty_t value_; }; @@ -1300,9 +1297,9 @@ class ParameterPropertyList_t : public Parameter_t * @param ptr Pointer to be set */ const_iterator( - const fastrtps::rtps::octet* ptr) + const fastdds::rtps::octet* ptr) : ptr_(ptr) - , value_(const_cast(ptr)) + , value_(const_cast(ptr)) { } @@ -1350,7 +1347,7 @@ class ParameterPropertyList_t : public Parameter_t void advance() { ptr_ += value_.size(); - value_ = ParameterProperty_t(const_cast(ptr_)); + value_ = ParameterProperty_t(const_cast(ptr_)); } /** @@ -1358,7 +1355,7 @@ class ParameterPropertyList_t : public Parameter_t * * @return the pointer */ - const fastrtps::rtps::octet* address() const + const fastdds::rtps::octet* address() const { return ptr_; } @@ -1366,7 +1363,7 @@ class ParameterPropertyList_t : public Parameter_t private: //!Pointer - const fastrtps::rtps::octet* ptr_; + const fastdds::rtps::octet* ptr_; //!Parameter Property ParameterProperty_t value_; }; @@ -1544,8 +1541,8 @@ class ParameterPropertyList_t : public Parameter_t str1_size + alignment1 + 4 + str2_size + alignment2 + 4); - push_back_helper((fastrtps::rtps::octet*)str1, str1_size, alignment1); - push_back_helper((fastrtps::rtps::octet*)str2, str2_size, alignment2); + push_back_helper((fastdds::rtps::octet*)str1, str1_size, alignment1); + push_back_helper((fastdds::rtps::octet*)str2, str2_size, alignment2); ++Nproperties_; return true; } @@ -1606,11 +1603,11 @@ class ParameterPropertyList_t : public Parameter_t protected: void push_back_helper ( - const fastrtps::rtps::octet* data, + const fastdds::rtps::octet* data, uint32_t size, uint32_t alignment) { - fastrtps::rtps::octet* o = (fastrtps::rtps::octet*)&size; + fastdds::rtps::octet* o = (fastdds::rtps::octet*)&size; memcpy(properties_.data + properties_.length, o, 4); properties_.length += 4; @@ -1635,13 +1632,13 @@ class ParameterSampleIdentity_t : public Parameter_t public: //!Sample Identity
By default, unknown. - fastrtps::rtps::SampleIdentity sample_id; + fastdds::rtps::SampleIdentity sample_id; /** * @brief Constructor without parameters */ ParameterSampleIdentity_t() - : sample_id(fastrtps::rtps::SampleIdentity::unknown()) + : sample_id(fastdds::rtps::SampleIdentity::unknown()) { } @@ -1655,7 +1652,7 @@ class ParameterSampleIdentity_t : public Parameter_t ParameterId_t pid, uint16_t in_length) : Parameter_t(pid, in_length) - , sample_id(fastrtps::rtps::SampleIdentity::unknown()) + , sample_id(fastdds::rtps::SampleIdentity::unknown()) { } @@ -1666,7 +1663,7 @@ class ParameterSampleIdentity_t : public Parameter_t * @return True if the parameter was correctly added. */ bool addToCDRMessage( - fastrtps::rtps::CDRMessage_t* msg) const; + fastdds::rtps::CDRMessage_t* msg) const; /** * Read the parameter from a CDRMessage_t message. @@ -1676,7 +1673,7 @@ class ParameterSampleIdentity_t : public Parameter_t * @return True if the parameter was correctly taken. */ bool readFromCDRMessage( - fastrtps::rtps::CDRMessage_t* msg, + fastdds::rtps::CDRMessage_t* msg, uint16_t size); }; @@ -1694,7 +1691,7 @@ class ParameterToken_t : public Parameter_t public: //!Token - fastrtps::rtps::Token token; + fastdds::rtps::Token token; /** * @brief Constructor without parameters @@ -1729,9 +1726,9 @@ class ParameterParticipantSecurityInfo_t : public Parameter_t public: //!Participant Security Attributes Mask
By default, 0. - fastrtps::rtps::security::ParticipantSecurityAttributesMask security_attributes = 0; + fastdds::rtps::security::ParticipantSecurityAttributesMask security_attributes = 0; //!Plugin Participant Security Attributes Mask
By default, 0. - fastrtps::rtps::security::PluginParticipantSecurityAttributesMask plugin_security_attributes = 0; + fastdds::rtps::security::PluginParticipantSecurityAttributesMask plugin_security_attributes = 0; /** * @brief Constructor without parameters.
@@ -1768,8 +1765,8 @@ class ParameterEndpointSecurityInfo_t : public Parameter_t { public: - fastrtps::rtps::security::EndpointSecurityAttributesMask security_attributes = 0; - fastrtps::rtps::security::PluginEndpointSecurityAttributesMask plugin_security_attributes = 0; + fastdds::rtps::security::EndpointSecurityAttributesMask security_attributes = 0; + fastdds::rtps::security::PluginEndpointSecurityAttributesMask plugin_security_attributes = 0; /** * @brief Constructor without parameters.
diff --git a/include/fastdds/dds/core/policy/QosPolicies.hpp b/include/fastdds/dds/core/policy/QosPolicies.hpp index f49f2fc3a08..f3753cb6913 100644 --- a/include/fastdds/dds/core/policy/QosPolicies.hpp +++ b/include/fastdds/dds/core/policy/QosPolicies.hpp @@ -238,7 +238,7 @@ class EntityFactoryQosPolicy /** * Enum DurabilityQosPolicyKind_t, different kinds of durability for DurabilityQosPolicy. */ -typedef enum DurabilityQosPolicyKind : fastrtps::rtps::octet +typedef enum DurabilityQosPolicyKind : fastdds::rtps::octet { /** * The Service does not need to keep any samples of data-instances on behalf of any DataReader that is not @@ -294,17 +294,17 @@ class DurabilityQosPolicy : public Parameter_t, public QosPolicy /** * Translates kind to rtps layer equivalent * - * @return fastrtps::rtps::DurabilityKind_t + * @return fastdds::rtps::DurabilityKind_t */ - inline fastrtps::rtps::DurabilityKind_t durabilityKind() const + inline fastdds::rtps::DurabilityKind_t durabilityKind() const { switch (kind) { default: - case VOLATILE_DURABILITY_QOS: return fastrtps::rtps::VOLATILE; - case TRANSIENT_LOCAL_DURABILITY_QOS: return fastrtps::rtps::TRANSIENT_LOCAL; - case TRANSIENT_DURABILITY_QOS: return fastrtps::rtps::TRANSIENT; - case PERSISTENT_DURABILITY_QOS: return fastrtps::rtps::PERSISTENT; + case VOLATILE_DURABILITY_QOS: return fastdds::rtps::VOLATILE; + case TRANSIENT_LOCAL_DURABILITY_QOS: return fastdds::rtps::TRANSIENT_LOCAL; + case TRANSIENT_DURABILITY_QOS: return fastdds::rtps::TRANSIENT; + case PERSISTENT_DURABILITY_QOS: return fastdds::rtps::PERSISTENT; } } @@ -319,18 +319,18 @@ class DurabilityQosPolicy : public Parameter_t, public QosPolicy /** * Set kind passing the rtps layer equivalent kind * - * @param new_kind fastrtps::rtps::DurabilityKind_t + * @param new_kind fastdds::rtps::DurabilityKind_t */ inline void durabilityKind( - const fastrtps::rtps::DurabilityKind_t new_kind) + const fastdds::rtps::DurabilityKind_t new_kind) { switch (new_kind) { default: - case fastrtps::rtps::VOLATILE: kind = VOLATILE_DURABILITY_QOS; break; - case fastrtps::rtps::TRANSIENT_LOCAL: kind = TRANSIENT_LOCAL_DURABILITY_QOS; break; - case fastrtps::rtps::TRANSIENT: kind = TRANSIENT_DURABILITY_QOS; break; - case fastrtps::rtps::PERSISTENT: kind = PERSISTENT_DURABILITY_QOS; break; + case fastdds::rtps::VOLATILE: kind = VOLATILE_DURABILITY_QOS; break; + case fastdds::rtps::TRANSIENT_LOCAL: kind = TRANSIENT_LOCAL_DURABILITY_QOS; break; + case fastdds::rtps::TRANSIENT: kind = TRANSIENT_DURABILITY_QOS; break; + case fastdds::rtps::PERSISTENT: kind = PERSISTENT_DURABILITY_QOS; break; } } @@ -398,7 +398,7 @@ class DeadlineQosPolicy : public Parameter_t, public QosPolicy * minimum_separation.
* By default, c_TimeInifinite. */ - fastrtps::Duration_t period; + fastdds::Duration_t period; }; /** @@ -446,13 +446,13 @@ class LatencyBudgetQosPolicy : public Parameter_t, public QosPolicy public: //!Maximum acceptable delay from the time data is written until it is received.
By default, c_TimeZero. - fastrtps::Duration_t duration; + fastdds::Duration_t duration; }; /** * Enum LivelinessQosPolicyKind, different kinds of liveliness for LivelinessQosPolicy */ -typedef enum LivelinessQosPolicyKind : fastrtps::rtps::octet +typedef enum LivelinessQosPolicyKind : fastdds::rtps::octet { /** * The infrastructure will automatically signal liveliness for the DataWriters at least as often as required by the lease_duration. @@ -529,20 +529,20 @@ class LivelinessQosPolicy : public Parameter_t, public QosPolicy * inactive. * By default, c_TimeInfinite. */ - fastrtps::Duration_t lease_duration; + fastdds::Duration_t lease_duration; /*! The period for automatic assertion of liveliness. * Only used for DataWriters with AUTOMATIC liveliness. * By default, c_TimeInfinite. * * @warning When not infinite, must be < lease_duration, and it is advisable to be less than 0.7*lease_duration. */ - fastrtps::Duration_t announcement_period; + fastdds::Duration_t announcement_period; }; /** * Enum ReliabilityQosPolicyKind, different kinds of reliability for ReliabilityQosPolicy. */ -typedef enum ReliabilityQosPolicyKind : fastrtps::rtps::octet +typedef enum ReliabilityQosPolicyKind : fastdds::rtps::octet { /** * Indicates that it is acceptable to not retry propagation of any samples. Presumably new values for the samples @@ -617,7 +617,7 @@ class ReliabilityQosPolicy : public Parameter_t, public QosPolicy *
* By default, 100 ms. */ - fastrtps::Duration_t max_blocking_time; + fastdds::Duration_t max_blocking_time; }; @@ -625,7 +625,7 @@ class ReliabilityQosPolicy : public Parameter_t, public QosPolicy /** * Enum OwnershipQosPolicyKind, different kinds of ownership for OwnershipQosPolicy. */ -enum OwnershipQosPolicyKind : fastrtps::rtps::octet +enum OwnershipQosPolicyKind : fastdds::rtps::octet { /** * Indicates shared ownership for each instance. Multiple writers are allowed to update the same instance and all the @@ -688,7 +688,7 @@ class OwnershipQosPolicy : public Parameter_t, public QosPolicy /** * Enum DestinationOrderQosPolicyKind, different kinds of destination order for DestinationOrderQosPolicy. */ -enum DestinationOrderQosPolicyKind : fastrtps::rtps::octet +enum DestinationOrderQosPolicyKind : fastdds::rtps::octet { /** * Indicates that data is ordered based on the reception time at each Subscriber. Since each subscriber may receive @@ -757,9 +757,9 @@ class DestinationOrderQosPolicy : public Parameter_t, public QosPolicy * Class GenericDataQosPolicy, base class to transmit user data during the discovery phase. */ class GenericDataQosPolicy : public Parameter_t, public QosPolicy, - public fastrtps::ResourceLimitedVector + public fastdds::ResourceLimitedVector { - using ResourceLimitedOctetVector = fastrtps::ResourceLimitedVector; + using ResourceLimitedOctetVector = fastdds::ResourceLimitedVector; public: @@ -887,12 +887,12 @@ class GenericDataQosPolicy : public Parameter_t, public QosPolicy, { if (size > 0) { - configuration_ = fastrtps::ResourceLimitedContainerConfig::fixed_size_configuration(size); + configuration_ = fastdds::ResourceLimitedContainerConfig::fixed_size_configuration(size); collection_.reserve(configuration_.maximum); } else { - configuration_ = fastrtps::ResourceLimitedContainerConfig::dynamic_allocation_configuration(); + configuration_ = fastdds::ResourceLimitedContainerConfig::dynamic_allocation_configuration(); } } @@ -1134,13 +1134,13 @@ class TimeBasedFilterQosPolicy : public Parameter_t, public QosPolicy public: //! Minimum interval between samples. By default, c_TimeZero (the DataReader is interested in all values) - fastrtps::Duration_t minimum_separation; + fastdds::Duration_t minimum_separation; }; /** * Enum PresentationQosPolicyAccessScopeKind, different kinds of Presentation Policy order for PresentationQosPolicy. */ -enum PresentationQosPolicyAccessScopeKind : fastrtps::rtps::octet +enum PresentationQosPolicyAccessScopeKind : fastdds::rtps::octet { /** * Scope spans only a single instance. Indicates that changes to one instance need not be coherent nor ordered with @@ -1323,7 +1323,7 @@ class PartitionQosPolicy : public Parameter_t, public QosPolicy * @param ptr Pointer to be set */ const_iterator( - const fastrtps::rtps::octet* ptr) + const fastdds::rtps::octet* ptr) : ptr_(ptr) , value_ (ptr_) { @@ -1381,7 +1381,7 @@ class PartitionQosPolicy : public Parameter_t, public QosPolicy private: //!Pointer - const fastrtps::rtps::octet* ptr_; + const fastdds::rtps::octet* ptr_; //!Partition Partition_t value_; @@ -1545,7 +1545,7 @@ class PartitionQosPolicy : public Parameter_t, public QosPolicy partitions_.reserve(partitions_.length + size + alignment + 4); - fastrtps::rtps::octet* o = (fastrtps::rtps::octet*)&size; + fastdds::rtps::octet* o = (fastdds::rtps::octet*)&size; memcpy(partitions_.data + partitions_.length, o, 4); partitions_.length += 4; @@ -1629,7 +1629,7 @@ class PartitionQosPolicy : public Parameter_t, public QosPolicy //! Maximum size
By default, 0. uint32_t max_size_; //! Partitions - fastrtps::rtps::SerializedPayload_t partitions_; + fastdds::rtps::SerializedPayload_t partitions_; //! Number of partitions.
By default, 0. uint32_t Npartitions_; }; @@ -1637,7 +1637,7 @@ class PartitionQosPolicy : public Parameter_t, public QosPolicy /** * Enum HistoryQosPolicyKind, different kinds of History Qos for HistoryQosPolicy. */ -enum HistoryQosPolicyKind : fastrtps::rtps::octet +enum HistoryQosPolicyKind : fastdds::rtps::octet { /** * On the publishing side, the Service will only attempt to keep the most recent “depth” samples of each instance @@ -1852,7 +1852,7 @@ class DurabilityServiceQosPolicy : public Parameter_t, public QosPolicy * @brief Control when the service is able to remove all information regarding a data-instance.
* By default, c_TimeZero. */ - fastrtps::Duration_t service_cleanup_delay; + fastdds::Duration_t service_cleanup_delay; /** * @brief Controls the HistoryQosPolicy of the fictitious DataReader that stores the data within the durability service. *
@@ -1929,7 +1929,7 @@ class LifespanQosPolicy : public Parameter_t, public QosPolicy public: //! Period of validity.
By default, c_TimeInfinite. - fastrtps::Duration_t duration; + fastdds::Duration_t duration; }; /** @@ -2027,7 +2027,7 @@ class TransportPriorityQosPolicy : public Parameter_t, public QosPolicy /** * Enum PublishModeQosPolicyKind, different kinds of publication synchronism */ -typedef enum PublishModeQosPolicyKind : fastrtps::rtps::octet +typedef enum PublishModeQosPolicyKind : fastdds::rtps::octet { SYNCHRONOUS_PUBLISH_MODE, //!< Synchronous publication mode (default for writers). ASYNCHRONOUS_PUBLISH_MODE //!< Asynchronous publication mode. @@ -2280,7 +2280,7 @@ class DisablePositiveACKsQosPolicy : public Parameter_t, public QosPolicy //! True if this QoS is enabled.
By default, false bool enabled; //! The duration to keep samples for (not serialized as not needed by reader).
By default, c_TimeInfinite - fastrtps::Duration_t duration; + fastdds::Duration_t duration; }; /** @@ -2647,10 +2647,10 @@ class TypeInformationParameter : public Parameter_t, public QosPolicy } // namespace xtypes //!Holds allocation limits affecting collections managed by a participant. -using ParticipantResourceLimitsQos = fastrtps::rtps::RTPSParticipantAllocationAttributes; +using ParticipantResourceLimitsQos = fastdds::rtps::RTPSParticipantAllocationAttributes; //! Property policies -using PropertyPolicyQos = fastrtps::rtps::PropertyPolicy; +using PropertyPolicyQos = fastdds::rtps::PropertyPolicy; //! Qos Policy that configures the wire protocol class WireProtocolConfigQos : public QosPolicy @@ -2693,16 +2693,16 @@ class WireProtocolConfigQos : public QosPolicy } //! Optionally allows user to define the GuidPrefix_t - fastrtps::rtps::GuidPrefix_t prefix; + fastdds::rtps::GuidPrefix_t prefix; //! Participant ID
By default, -1. int32_t participant_id; //! Builtin parameters. - fastrtps::rtps::BuiltinAttributes builtin; + fastdds::rtps::BuiltinAttributes builtin; //! Port Parameters - fastrtps::rtps::PortParameters port; + fastdds::rtps::PortParameters port; /** * Default list of Unicast Locators to be used for any Endpoint defined inside this RTPSParticipant in the case @@ -2845,8 +2845,8 @@ class RTPSEndpointQos int16_t entity_id = -1; //! Underlying History memory policy.
By default, PREALLOCATED_WITH_REALLOC_MEMORY_MODE. - fastrtps::rtps::MemoryManagementPolicy_t history_memory_policy = - fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; + fastdds::rtps::MemoryManagementPolicy_t history_memory_policy = + fastdds::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; }; //!Qos Policy to configure the limit of the writer resources @@ -2876,15 +2876,15 @@ class WriterResourceLimitsQos } //!Matched subscribers allocation limits. - fastrtps::ResourceLimitedContainerConfig matched_subscriber_allocation; + fastdds::ResourceLimitedContainerConfig matched_subscriber_allocation; //!Reader filters allocation limits. - fastrtps::ResourceLimitedContainerConfig reader_filters_allocation; + fastdds::ResourceLimitedContainerConfig reader_filters_allocation; }; /** * Data sharing configuration kinds */ -enum DataSharingKind : fastrtps::rtps::octet +enum DataSharingKind : fastdds::rtps::octet { /** * Automatic configuration. diff --git a/include/fastdds/dds/core/policy/ReaderDataLifecycleQosPolicy.hpp b/include/fastdds/dds/core/policy/ReaderDataLifecycleQosPolicy.hpp index 2a3dd9f2a98..8541d50bcf1 100644 --- a/include/fastdds/dds/core/policy/ReaderDataLifecycleQosPolicy.hpp +++ b/include/fastdds/dds/core/policy/ReaderDataLifecycleQosPolicy.hpp @@ -23,7 +23,7 @@ #include -using eprosima::fastrtps::Duration_t; +using eprosima::fastdds::Duration_t; namespace eprosima { namespace fastdds { diff --git a/include/fastdds/dds/core/status/BaseStatus.hpp b/include/fastdds/dds/core/status/BaseStatus.hpp index 5ac8fcda99b..4ca105ac33f 100644 --- a/include/fastdds/dds/core/status/BaseStatus.hpp +++ b/include/fastdds/dds/core/status/BaseStatus.hpp @@ -43,14 +43,10 @@ using LivelinessLostStatus = BaseStatus; using InconsistentTopicStatus = BaseStatus; } //namespace dds -} //namespace fastdds - -namespace fastrtps { using LivelinessLostStatus = fastdds::dds::BaseStatus; -} - +} //namespace fastdds } //namespace eprosima #endif // _FASTDDS_BASE_STATUS_HPP_ diff --git a/include/fastdds/dds/domain/DomainParticipant.hpp b/include/fastdds/dds/domain/DomainParticipant.hpp index e5a0a9b0b5e..e359c38eab4 100644 --- a/include/fastdds/dds/domain/DomainParticipant.hpp +++ b/include/fastdds/dds/domain/DomainParticipant.hpp @@ -49,13 +49,11 @@ class DomainParticipant; } // namespace dds namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class ResourceEvent; } // namespace rtps -} //namespace fastrtps -namespace fastdds { namespace dds { class DomainParticipantImpl; @@ -388,7 +386,7 @@ class DomainParticipant : public Entity */ FASTDDS_EXPORTED_API Topic* find_topic( const std::string& topic_name, - const fastrtps::Duration_t& timeout); + const fastdds::Duration_t& timeout); /** * Looks up an existing, locally created @ref TopicDescription, based on its name. @@ -749,7 +747,7 @@ class DomainParticipant : public Entity * @return RETCODE_OK */ FASTDDS_EXPORTED_API ReturnCode_t get_current_time( - fastrtps::Time_t& current_time) const; + fastdds::Time_t& current_time) const; // DomainParticipant methods specific from Fast DDS @@ -808,7 +806,7 @@ class DomainParticipant : public Entity * * @return A reference to the GUID */ - FASTDDS_EXPORTED_API const fastrtps::rtps::GUID_t& guid() const; + FASTDDS_EXPORTED_API const fastdds::rtps::GUID_t& guid() const; /** * @brief Getter for the participant names @@ -819,7 +817,7 @@ class DomainParticipant : public Entity /** * This method can be used when using a StaticEndpointDiscovery mechanism different that the one - * included in FastRTPS, for example when communicating with other implementations. + * included in Fast DDS, for example when communicating with other implementations. * It indicates the Participant that an Endpoint from the XML has been discovered and * should be activated. * @@ -829,9 +827,9 @@ class DomainParticipant : public Entity * @return True if correctly found and activated. */ FASTDDS_EXPORTED_API bool new_remote_endpoint_discovered( - const fastrtps::rtps::GUID_t& partguid, + const fastdds::rtps::GUID_t& partguid, uint16_t userId, - fastrtps::rtps::EndpointKind_t kind); + fastdds::rtps::EndpointKind_t kind); /** * Register a custom content filter factory, which can be used to create a ContentFilteredTopic. diff --git a/include/fastdds/dds/domain/DomainParticipantFactory.hpp b/include/fastdds/dds/domain/DomainParticipantFactory.hpp index 09df4a26027..e34afcf2f16 100644 --- a/include/fastdds/dds/domain/DomainParticipantFactory.hpp +++ b/include/fastdds/dds/domain/DomainParticipantFactory.hpp @@ -34,7 +34,7 @@ namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSDomainImpl; @@ -43,9 +43,7 @@ namespace detail { class TopicPayloadPoolRegistry; } // namespace detail } // namespace rtps -} // namespace fastrtps -namespace fastdds { namespace dds { class DomainParticipantListener; @@ -373,9 +371,9 @@ class DomainParticipantFactory DomainParticipantQos default_participant_qos_; - std::shared_ptr topic_pool_; + std::shared_ptr topic_pool_; - std::shared_ptr rtps_domain_; + std::shared_ptr rtps_domain_; std::shared_ptr log_resources_; diff --git a/include/fastdds/dds/domain/DomainParticipantListener.hpp b/include/fastdds/dds/domain/DomainParticipantListener.hpp index 9455729d6e5..ee210266cf2 100644 --- a/include/fastdds/dds/domain/DomainParticipantListener.hpp +++ b/include/fastdds/dds/domain/DomainParticipantListener.hpp @@ -69,7 +69,7 @@ class DomainParticipantListener : */ virtual void on_participant_discovery( DomainParticipant* participant, - fastrtps::rtps::ParticipantDiscoveryInfo&& info, + rtps::ParticipantDiscoveryInfo&& info, bool& should_be_ignored) { static_cast(participant); @@ -86,7 +86,7 @@ class DomainParticipantListener : */ virtual void onParticipantAuthentication( DomainParticipant* participant, - fastrtps::rtps::ParticipantAuthenticationInfo&& info) + rtps::ParticipantAuthenticationInfo&& info) { static_cast(participant); static_cast(info); @@ -104,7 +104,7 @@ class DomainParticipantListener : */ virtual void on_data_reader_discovery( DomainParticipant* participant, - fastrtps::rtps::ReaderDiscoveryInfo&& info, + rtps::ReaderDiscoveryInfo&& info, bool& should_be_ignored) { static_cast(participant); @@ -122,7 +122,7 @@ class DomainParticipantListener : */ virtual void on_data_writer_discovery( DomainParticipant* participant, - fastrtps::rtps::WriterDiscoveryInfo&& info, + rtps::WriterDiscoveryInfo&& info, bool& should_be_ignored) { static_cast(participant); diff --git a/include/fastdds/dds/publisher/DataWriter.hpp b/include/fastdds/dds/publisher/DataWriter.hpp index 58e0c9b64c0..f6ecd2a1870 100644 --- a/include/fastdds/dds/publisher/DataWriter.hpp +++ b/include/fastdds/dds/publisher/DataWriter.hpp @@ -33,16 +33,14 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class WriteParams; struct GUID_t; } // namespace rtps -} // namespace fastrtps -namespace fastdds { namespace dds { class PublisherListener; @@ -144,7 +142,7 @@ class DataWriter : public DomainEntity */ FASTDDS_EXPORTED_API bool write( void* data, - fastrtps::rtps::WriteParams& params); + fastdds::rtps::WriteParams& params); /** * Write data with handle. @@ -180,7 +178,7 @@ class DataWriter : public DomainEntity FASTDDS_EXPORTED_API ReturnCode_t write_w_timestamp( void* data, const InstanceHandle_t& handle, - const fastrtps::Time_t& timestamp); + const fastdds::Time_t& timestamp); /*! * @brief Informs that the application will be modifying a particular instance. @@ -214,7 +212,7 @@ class DataWriter : public DomainEntity */ FASTDDS_EXPORTED_API InstanceHandle_t register_instance_w_timestamp( void* instance, - const fastrtps::Time_t& timestamp); + const fastdds::Time_t& timestamp); /*! * @brief This operation reverses the action of `register_instance`. @@ -253,7 +251,7 @@ class DataWriter : public DomainEntity FASTDDS_EXPORTED_API ReturnCode_t unregister_instance_w_timestamp( void* instance, const InstanceHandle_t& handle, - const fastrtps::Time_t& timestamp); + const fastdds::Time_t& timestamp); /** * This operation can be used to retrieve the instance key that corresponds to an @@ -292,7 +290,7 @@ class DataWriter : public DomainEntity * * @return Reference to the DataWriter GUID */ - FASTDDS_EXPORTED_API const fastrtps::rtps::GUID_t& guid() const; + FASTDDS_EXPORTED_API const fastdds::rtps::GUID_t& guid() const; /** * Returns the DataWriter's InstanceHandle @@ -315,7 +313,7 @@ class DataWriter : public DomainEntity * @return RETCODE_OK if the DataWriter receive the acknowledgments before the time expires and RETCODE_ERROR otherwise */ FASTDDS_EXPORTED_API ReturnCode_t wait_for_acknowledgments( - const fastrtps::Duration_t& max_wait); + const fastdds::Duration_t& max_wait); /** * @brief Returns the offered deadline missed status @@ -446,7 +444,7 @@ class DataWriter : public DomainEntity FASTDDS_EXPORTED_API ReturnCode_t dispose_w_timestamp( void* instance, const InstanceHandle_t& handle, - const fastrtps::Time_t& timestamp); + const fastdds::Time_t& timestamp); /** * @brief Returns the liveliness lost status * @@ -584,7 +582,7 @@ class DataWriter : public DomainEntity FASTDDS_EXPORTED_API ReturnCode_t wait_for_acknowledgments( void* instance, const InstanceHandle_t& handle, - const fastrtps::Duration_t& max_wait); + const fastdds::Duration_t& max_wait); protected: diff --git a/include/fastdds/dds/publisher/Publisher.hpp b/include/fastdds/dds/publisher/Publisher.hpp index 867d15134b7..a7368d88f36 100644 --- a/include/fastdds/dds/publisher/Publisher.hpp +++ b/include/fastdds/dds/publisher/Publisher.hpp @@ -36,13 +36,10 @@ class Publisher; } // namespace dds namespace eprosima { -namespace fastrtps { +namespace fastdds { class TopicAttributes; -} // namespace fastrtps - -namespace fastdds { namespace dds { class DomainParticipant; @@ -161,7 +158,7 @@ class Publisher : public DomainEntity const DataWriterQos& qos, DataWriterListener* listener = nullptr, const StatusMask& mask = StatusMask::all(), - std::shared_ptr payload_pool = nullptr); + std::shared_ptr payload_pool = nullptr); /** * This operation creates a DataWriter. The returned DataWriter will be attached and belongs to the Publisher. @@ -178,7 +175,7 @@ class Publisher : public DomainEntity const std::string& profile_name, DataWriterListener* listener = nullptr, const StatusMask& mask = StatusMask::all(), - std::shared_ptr payload_pool = nullptr); + std::shared_ptr payload_pool = nullptr); /** * This operation deletes a DataWriter that belongs to the Publisher. @@ -259,7 +256,7 @@ class Publisher : public DomainEntity * Publisher receives the acknowledgments and RETCODE_ERROR otherwise. */ FASTDDS_EXPORTED_API ReturnCode_t wait_for_acknowledgments( - const fastrtps::Duration_t& max_wait); + const fastdds::Duration_t& max_wait); /** * This operation returns the DomainParticipant to which the Publisher belongs. diff --git a/include/fastdds/dds/publisher/qos/DataWriterQos.hpp b/include/fastdds/dds/publisher/qos/DataWriterQos.hpp index 7630ca52044..de82cad9a0d 100644 --- a/include/fastdds/dds/publisher/qos/DataWriterQos.hpp +++ b/include/fastdds/dds/publisher/qos/DataWriterQos.hpp @@ -59,7 +59,7 @@ class RTPSReliableWriterQos } //!Writer Timing Attributes - fastrtps::rtps::WriterTimes times; + fastdds::rtps::WriterTimes times; //!Disable positive acks QoS, implemented in the library. DisablePositiveACKsQosPolicy disable_positive_acks; diff --git a/include/fastdds/dds/subscriber/DataReader.hpp b/include/fastdds/dds/subscriber/DataReader.hpp index 107800c1e5f..f72e651af6b 100644 --- a/include/fastdds/dds/subscriber/DataReader.hpp +++ b/include/fastdds/dds/subscriber/DataReader.hpp @@ -52,13 +52,11 @@ class DataReader; } // namespace dds namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { struct GUID_t; } // namespace rtps -} // namespace fastrtps -namespace fastdds { namespace dds { class Subscriber; @@ -124,7 +122,7 @@ class DataReader : public DomainEntity * @return true if there is new unread message, false if timeout */ FASTDDS_EXPORTED_API bool wait_for_unread_message( - const fastrtps::Duration_t& timeout); + const fastdds::Duration_t& timeout); /** * NOT YET IMPLEMENTED @@ -137,7 +135,7 @@ class DataReader : public DomainEntity * @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED */ FASTDDS_EXPORTED_API ReturnCode_t wait_for_historical_data( - const fastrtps::Duration_t& max_wait) const; + const fastdds::Duration_t& max_wait) const; /** @name Read or take data methods. @@ -819,14 +817,14 @@ class DataReader : public DomainEntity * * @return Associated GUID */ - FASTDDS_EXPORTED_API const fastrtps::rtps::GUID_t& guid(); + FASTDDS_EXPORTED_API const fastdds::rtps::GUID_t& guid(); /** * Get associated GUID. * * @return Associated GUID */ - FASTDDS_EXPORTED_API const fastrtps::rtps::GUID_t& guid() const; + FASTDDS_EXPORTED_API const fastdds::rtps::GUID_t& guid() const; /** * @brief Getter for the associated InstanceHandle. @@ -980,7 +978,7 @@ class DataReader : public DomainEntity */ FASTDDS_EXPORTED_API ReturnCode_t get_matched_publication_data( builtin::PublicationBuiltinTopicData& publication_data, - const fastrtps::rtps::InstanceHandle_t& publication_handle) const; + const fastdds::rtps::InstanceHandle_t& publication_handle) const; /** * @brief Fills the given vector with the InstanceHandle_t of matched DataReaders diff --git a/include/fastdds/dds/subscriber/SampleInfo.hpp b/include/fastdds/dds/subscriber/SampleInfo.hpp index ccc173fc78c..3a4329deab1 100644 --- a/include/fastdds/dds/subscriber/SampleInfo.hpp +++ b/include/fastdds/dds/subscriber/SampleInfo.hpp @@ -65,10 +65,10 @@ struct SampleInfo int32_t absolute_generation_rank; //! time provided by the DataWriter when the sample was written - fastrtps::rtps::Time_t source_timestamp; + rtps::Time_t source_timestamp; //! time provided by the DataReader when the sample was added to its history - fastrtps::rtps::Time_t reception_timestamp; + rtps::Time_t reception_timestamp; //! identifies locally the corresponding instance InstanceHandle_t instance_handle; @@ -82,10 +82,10 @@ struct SampleInfo bool valid_data; //!Sample Identity (Extension for RPC) - fastrtps::rtps::SampleIdentity sample_identity; + rtps::SampleIdentity sample_identity; //!Related Sample Identity (Extension for RPC) - fastrtps::rtps::SampleIdentity related_sample_identity; + rtps::SampleIdentity related_sample_identity; }; diff --git a/include/fastdds/dds/subscriber/Subscriber.hpp b/include/fastdds/dds/subscriber/Subscriber.hpp index 15d900c8d95..d92351c7d84 100644 --- a/include/fastdds/dds/subscriber/Subscriber.hpp +++ b/include/fastdds/dds/subscriber/Subscriber.hpp @@ -39,11 +39,11 @@ class Subscriber; } // namespace dds namespace eprosima { -namespace fastrtps { +namespace fastdds { class TopicAttributes; -} // namespace fastrtps +} // namespace fastdds namespace fastdds { namespace dds { @@ -168,7 +168,7 @@ class Subscriber : public DomainEntity const DataReaderQos& reader_qos, DataReaderListener* listener = nullptr, const StatusMask& mask = StatusMask::all(), - std::shared_ptr payload_pool = nullptr); + std::shared_ptr payload_pool = nullptr); /** * This operation creates a DataReader. The returned DataReader will be attached and belongs to the Subscriber. @@ -185,7 +185,7 @@ class Subscriber : public DomainEntity const std::string& profile_name, DataReaderListener* listener = nullptr, const StatusMask& mask = StatusMask::all(), - std::shared_ptr payload_pool = nullptr); + std::shared_ptr payload_pool = nullptr); /** * This operation deletes a DataReader that belongs to the Subscriber. diff --git a/include/fastdds/dds/subscriber/qos/DataReaderQos.hpp b/include/fastdds/dds/subscriber/qos/DataReaderQos.hpp index 06e6321c096..e9e3db92f36 100644 --- a/include/fastdds/dds/subscriber/qos/DataReaderQos.hpp +++ b/include/fastdds/dds/subscriber/qos/DataReaderQos.hpp @@ -32,7 +32,7 @@ namespace eprosima { namespace fastdds { namespace dds { -using TopicAttributesQos = fastrtps::TopicAttributes; +using TopicAttributesQos = fastdds::TopicAttributes; //! Qos Policy to configure the DisablePositiveACKsQos and the reader attributes class RTPSReliableReaderQos @@ -67,7 +67,7 @@ class RTPSReliableReaderQos /*! * @brief Times associated with the Reliable Readers events. */ - fastrtps::rtps::ReaderTimes times; + fastdds::rtps::ReaderTimes times; /*! * @brief Control the sending of positive ACKs @@ -107,11 +107,11 @@ class ReaderResourceLimitsQos } //! Matched publishers allocation limits. - fastrtps::ResourceLimitedContainerConfig matched_publisher_allocation; + fastdds::ResourceLimitedContainerConfig matched_publisher_allocation; //! SampleInfo allocation limits. - fastrtps::ResourceLimitedContainerConfig sample_infos_allocation{ 32u }; + fastdds::ResourceLimitedContainerConfig sample_infos_allocation{ 32u }; //! Loaned collections allocation limits. - fastrtps::ResourceLimitedContainerConfig outstanding_reads_allocation{ 2u }; + fastdds::ResourceLimitedContainerConfig outstanding_reads_allocation{ 2u }; /** * Maximum number of samples to return on a single call to read / take. diff --git a/include/fastdds/dds/topic/IContentFilter.hpp b/include/fastdds/dds/topic/IContentFilter.hpp index aef9f387a59..e490d9698f6 100644 --- a/include/fastdds/dds/topic/IContentFilter.hpp +++ b/include/fastdds/dds/topic/IContentFilter.hpp @@ -34,8 +34,8 @@ namespace dds { */ struct IContentFilter { - using SerializedPayload = eprosima::fastrtps::rtps::SerializedPayload_t; - using GUID_t = fastrtps::rtps::GUID_t; + using SerializedPayload = eprosima::fastdds::rtps::SerializedPayload_t; + using GUID_t = fastdds::rtps::GUID_t; /** * Selected information from the cache change that is passed to the content filter object on @@ -43,7 +43,7 @@ struct IContentFilter */ struct FilterSampleInfo { - using SampleIdentity = eprosima::fastrtps::rtps::SampleIdentity; + using SampleIdentity = eprosima::fastdds::rtps::SampleIdentity; /// Identity of the sample being filtered. SampleIdentity sample_identity; diff --git a/include/fastdds/dds/topic/TopicDataType.hpp b/include/fastdds/dds/topic/TopicDataType.hpp index 604f1f9b498..736421f4eb8 100644 --- a/include/fastdds/dds/topic/TopicDataType.hpp +++ b/include/fastdds/dds/topic/TopicDataType.hpp @@ -41,15 +41,13 @@ #define TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { struct SerializedPayload_t; struct InstanceHandle_t; } // namespace rtps -} // namespace fastrtps -namespace fastdds { namespace dds { class TypeSupport; @@ -85,7 +83,7 @@ class TopicDataType // FASTDDS_TODO_BEFORE(3, 0, "Remove this overload") FASTDDS_EXPORTED_API virtual bool serialize( void* data, - fastrtps::rtps::SerializedPayload_t* payload) = 0; + fastdds::rtps::SerializedPayload_t* payload) = 0; /** * Serialize method, it should be implemented by the user, since it is abstract. If not implemented, this method @@ -99,7 +97,7 @@ class TopicDataType */ FASTDDS_EXPORTED_API virtual bool serialize( void* data, - fastrtps::rtps::SerializedPayload_t* payload, + fastdds::rtps::SerializedPayload_t* payload, DataRepresentationId_t data_representation); /** @@ -110,7 +108,7 @@ class TopicDataType * @return True if correct. */ FASTDDS_EXPORTED_API virtual bool deserialize( - fastrtps::rtps::SerializedPayload_t* payload, + fastdds::rtps::SerializedPayload_t* payload, void* data) = 0; /*! @@ -158,7 +156,7 @@ class TopicDataType */ FASTDDS_EXPORTED_API virtual bool getKey( void* data, - fastrtps::rtps::InstanceHandle_t* ihandle, + fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) = 0; /** diff --git a/include/fastdds/dds/topic/TypeSupport.hpp b/include/fastdds/dds/topic/TypeSupport.hpp index 8a614d82ee8..ae60a62dd1a 100644 --- a/include/fastdds/dds/topic/TypeSupport.hpp +++ b/include/fastdds/dds/topic/TypeSupport.hpp @@ -141,7 +141,7 @@ class TypeSupport : public std::shared_ptr FASTDDS_EXPORTED_API virtual bool serialize( void* data, - fastrtps::rtps::SerializedPayload_t* payload) + fastdds::rtps::SerializedPayload_t* payload) { return serialize(data, payload, DEFAULT_DATA_REPRESENTATION); } @@ -156,7 +156,7 @@ class TypeSupport : public std::shared_ptr */ FASTDDS_EXPORTED_API virtual bool serialize( void* data, - fastrtps::rtps::SerializedPayload_t* payload, + fastdds::rtps::SerializedPayload_t* payload, DataRepresentationId_t data_representation); /** @@ -167,7 +167,7 @@ class TypeSupport : public std::shared_ptr * @return true if it is deserialized correctly, false if not */ FASTDDS_EXPORTED_API virtual bool deserialize( - fastrtps::rtps::SerializedPayload_t* payload, + fastdds::rtps::SerializedPayload_t* payload, void* data); /*! diff --git a/include/fastdds/dds/xtypes/dynamic_types/DynamicData.hpp b/include/fastdds/dds/xtypes/dynamic_types/DynamicData.hpp index d1c29039eb3..be1fa559962 100644 --- a/include/fastdds/dds/xtypes/dynamic_types/DynamicData.hpp +++ b/include/fastdds/dds/xtypes/dynamic_types/DynamicData.hpp @@ -487,7 +487,7 @@ class DynamicData : public std::enable_shared_from_this * @retval RETCODE_BAD_PARAMETER when the @ref MemberId is invalid or the member type is not promotable to \b byte. */ FASTDDS_EXPORTED_API virtual ReturnCode_t get_byte_value( - eprosima::fastrtps::rtps::octet& value, + eprosima::fastdds::rtps::octet& value, MemberId id) = 0; /*! @@ -500,7 +500,7 @@ class DynamicData : public std::enable_shared_from_this */ FASTDDS_EXPORTED_API virtual ReturnCode_t set_byte_value( MemberId id, - eprosima::fastrtps::rtps::octet value) = 0; + eprosima::fastdds::rtps::octet value) = 0; /*! * Retrieves an \b bool value associated to an identifier. diff --git a/include/fastdds/dds/xtypes/dynamic_types/DynamicPubSubType.hpp b/include/fastdds/dds/xtypes/dynamic_types/DynamicPubSubType.hpp index d2dfb8a3ffd..392f953e5a1 100644 --- a/include/fastdds/dds/xtypes/dynamic_types/DynamicPubSubType.hpp +++ b/include/fastdds/dds/xtypes/dynamic_types/DynamicPubSubType.hpp @@ -68,12 +68,12 @@ class DynamicPubSubType : public virtual eprosima::fastdds::dds::TopicDataType /* * Deserialize an object from the given payload - * @param payload @ref eprosima::fastrtps::rtps::SerializedPayload_t to parse + * @param payload @ref eprosima::fastdds::rtps::SerializedPayload_t to parse * @param data object to fill in with payload data * @return bool specifying success */ FASTDDS_EXPORTED_API bool deserialize ( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; /* @@ -85,13 +85,13 @@ class DynamicPubSubType : public virtual eprosima::fastdds::dds::TopicDataType /* * Calculate the key associated to a given object * @param data object whose key is calculated - * @param ihandle @ref eprosima::fastrtps::rtps::InstanceHandle_t to fill in + * @param ihandle @ref eprosima::fastdds::rtps::InstanceHandle_t to fill in * @param force_md5 use always md5 even if key payload footprint is smaller than the hash * @return bool specifying success */ FASTDDS_EXPORTED_API bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; /* @@ -110,12 +110,12 @@ class DynamicPubSubType : public virtual eprosima::fastdds::dds::TopicDataType /* * Serialize an object into a given payload * @param data object to serialize - * @param payload @ref eprosima::fastrtps::rtps::SerializedPayload_t to fill in + * @param payload @ref eprosima::fastdds::rtps::SerializedPayload_t to fill in * @return bool specifying success */ FASTDDS_EXPORTED_API bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, fastdds::dds::DEFAULT_DATA_REPRESENTATION); } @@ -123,12 +123,12 @@ class DynamicPubSubType : public virtual eprosima::fastdds::dds::TopicDataType /* * Serialize an object into a given payload * @param data object to serialize - * @param payload @ref eprosima::fastrtps::rtps::SerializedPayload_t to fill in + * @param payload @ref eprosima::fastdds::rtps::SerializedPayload_t to fill in * @return bool specifying success */ FASTDDS_EXPORTED_API bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, fastdds::dds::DataRepresentationId_t data_representation) override; /* diff --git a/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.h b/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.h index badfe1246a9..cb8e8271b62 100644 --- a/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.h +++ b/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.h @@ -178,18 +178,18 @@ class StringSTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -204,7 +204,7 @@ class StringSTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -324,18 +324,18 @@ class StringLTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -350,7 +350,7 @@ class StringLTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -437,18 +437,18 @@ class PlainCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -463,7 +463,7 @@ class PlainCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -528,18 +528,18 @@ class PlainSequenceSElemDefnPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -554,7 +554,7 @@ class PlainSequenceSElemDefnPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -619,18 +619,18 @@ class PlainSequenceLElemDefnPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -645,7 +645,7 @@ class PlainSequenceLElemDefnPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -710,18 +710,18 @@ class PlainArraySElemDefnPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -736,7 +736,7 @@ class PlainArraySElemDefnPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -801,18 +801,18 @@ class PlainArrayLElemDefnPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -827,7 +827,7 @@ class PlainArrayLElemDefnPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -892,18 +892,18 @@ class PlainMapSTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -918,7 +918,7 @@ class PlainMapSTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -983,18 +983,18 @@ class PlainMapLTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1009,7 +1009,7 @@ class PlainMapLTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1074,18 +1074,18 @@ class StronglyConnectedComponentIdPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1100,7 +1100,7 @@ class StronglyConnectedComponentIdPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1165,18 +1165,18 @@ class ExtendedTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1191,7 +1191,7 @@ class ExtendedTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1261,18 +1261,18 @@ class ExtendedAnnotationParameterValuePubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1287,7 +1287,7 @@ class ExtendedAnnotationParameterValuePubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1353,18 +1353,18 @@ class AppliedAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1379,7 +1379,7 @@ class AppliedAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1445,18 +1445,18 @@ class AppliedAnnotationPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1471,7 +1471,7 @@ class AppliedAnnotationPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1537,18 +1537,18 @@ class AppliedVerbatimAnnotationPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1563,7 +1563,7 @@ class AppliedVerbatimAnnotationPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1628,18 +1628,18 @@ class AppliedBuiltinMemberAnnotationsPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1654,7 +1654,7 @@ class AppliedBuiltinMemberAnnotationsPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1719,18 +1719,18 @@ class CommonStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1745,7 +1745,7 @@ class CommonStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1810,18 +1810,18 @@ class CompleteMemberDetailPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1836,7 +1836,7 @@ class CompleteMemberDetailPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1934,18 +1934,18 @@ class MinimalMemberDetailPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1960,7 +1960,7 @@ class MinimalMemberDetailPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2047,18 +2047,18 @@ class CompleteStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2073,7 +2073,7 @@ class CompleteStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2139,18 +2139,18 @@ class MinimalStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2165,7 +2165,7 @@ class MinimalStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2231,18 +2231,18 @@ class AppliedBuiltinTypeAnnotationsPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2257,7 +2257,7 @@ class AppliedBuiltinTypeAnnotationsPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2322,18 +2322,18 @@ class MinimalTypeDetailPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2348,7 +2348,7 @@ class MinimalTypeDetailPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2431,18 +2431,18 @@ class CompleteTypeDetailPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2457,7 +2457,7 @@ class CompleteTypeDetailPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2522,18 +2522,18 @@ class CompleteStructHeaderPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2548,7 +2548,7 @@ class CompleteStructHeaderPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2613,18 +2613,18 @@ class MinimalStructHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2639,7 +2639,7 @@ class MinimalStructHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2704,18 +2704,18 @@ class CompleteStructTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2730,7 +2730,7 @@ class CompleteStructTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2795,18 +2795,18 @@ class MinimalStructTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2821,7 +2821,7 @@ class MinimalStructTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2887,18 +2887,18 @@ class CommonUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2913,7 +2913,7 @@ class CommonUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2978,18 +2978,18 @@ class CompleteUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3004,7 +3004,7 @@ class CompleteUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3070,18 +3070,18 @@ class MinimalUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3096,7 +3096,7 @@ class MinimalUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3162,18 +3162,18 @@ class CommonDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3188,7 +3188,7 @@ class CommonDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3253,18 +3253,18 @@ class CompleteDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3279,7 +3279,7 @@ class CompleteDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3344,18 +3344,18 @@ class MinimalDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3370,7 +3370,7 @@ class MinimalDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3435,18 +3435,18 @@ class CompleteUnionHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3461,7 +3461,7 @@ class CompleteUnionHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3526,18 +3526,18 @@ class MinimalUnionHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3552,7 +3552,7 @@ class MinimalUnionHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3617,18 +3617,18 @@ class CompleteUnionTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3643,7 +3643,7 @@ class CompleteUnionTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3708,18 +3708,18 @@ class MinimalUnionTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3734,7 +3734,7 @@ class MinimalUnionTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3799,18 +3799,18 @@ class CommonAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3825,7 +3825,7 @@ class CommonAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3890,18 +3890,18 @@ class CompleteAnnotationParameterPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3916,7 +3916,7 @@ class CompleteAnnotationParameterPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3982,18 +3982,18 @@ class MinimalAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4008,7 +4008,7 @@ class MinimalAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4074,18 +4074,18 @@ class CompleteAnnotationHeaderPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4100,7 +4100,7 @@ class CompleteAnnotationHeaderPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4165,18 +4165,18 @@ class MinimalAnnotationHeaderPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4191,7 +4191,7 @@ class MinimalAnnotationHeaderPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4256,18 +4256,18 @@ class CompleteAnnotationTypePubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4282,7 +4282,7 @@ class CompleteAnnotationTypePubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4347,18 +4347,18 @@ class MinimalAnnotationTypePubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4373,7 +4373,7 @@ class MinimalAnnotationTypePubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4438,18 +4438,18 @@ class CommonAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4464,7 +4464,7 @@ class CommonAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4529,18 +4529,18 @@ class CompleteAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4555,7 +4555,7 @@ class CompleteAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4620,18 +4620,18 @@ class MinimalAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4646,7 +4646,7 @@ class MinimalAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4711,18 +4711,18 @@ class CompleteAliasHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4737,7 +4737,7 @@ class CompleteAliasHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4802,18 +4802,18 @@ class MinimalAliasHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4828,7 +4828,7 @@ class MinimalAliasHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4893,18 +4893,18 @@ class CompleteAliasTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4919,7 +4919,7 @@ class CompleteAliasTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4984,18 +4984,18 @@ class MinimalAliasTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5010,7 +5010,7 @@ class MinimalAliasTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5075,18 +5075,18 @@ class CompleteElementDetailPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5101,7 +5101,7 @@ class CompleteElementDetailPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5166,18 +5166,18 @@ class CommonCollectionElementPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5192,7 +5192,7 @@ class CommonCollectionElementPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5257,18 +5257,18 @@ class CompleteCollectionElementPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5283,7 +5283,7 @@ class CompleteCollectionElementPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5348,18 +5348,18 @@ class MinimalCollectionElementPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5374,7 +5374,7 @@ class MinimalCollectionElementPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5472,18 +5472,18 @@ class CommonCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5498,7 +5498,7 @@ class CommonCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5585,18 +5585,18 @@ class CompleteCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5611,7 +5611,7 @@ class CompleteCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5676,18 +5676,18 @@ class MinimalCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5702,7 +5702,7 @@ class MinimalCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5767,18 +5767,18 @@ class CompleteSequenceTypePubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5793,7 +5793,7 @@ class CompleteSequenceTypePubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5858,18 +5858,18 @@ class MinimalSequenceTypePubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5884,7 +5884,7 @@ class MinimalSequenceTypePubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5949,18 +5949,18 @@ class CommonArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5975,7 +5975,7 @@ class CommonArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6040,18 +6040,18 @@ class CompleteArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6066,7 +6066,7 @@ class CompleteArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6131,18 +6131,18 @@ class MinimalArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6157,7 +6157,7 @@ class MinimalArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6222,18 +6222,18 @@ class CompleteArrayTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6248,7 +6248,7 @@ class CompleteArrayTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6313,18 +6313,18 @@ class MinimalArrayTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6339,7 +6339,7 @@ class MinimalArrayTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6404,18 +6404,18 @@ class CompleteMapTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6430,7 +6430,7 @@ class CompleteMapTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6495,18 +6495,18 @@ class MinimalMapTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6521,7 +6521,7 @@ class MinimalMapTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6587,18 +6587,18 @@ class CommonEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6613,7 +6613,7 @@ class CommonEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6678,18 +6678,18 @@ class CompleteEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6704,7 +6704,7 @@ class CompleteEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6770,18 +6770,18 @@ class MinimalEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6796,7 +6796,7 @@ class MinimalEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6895,18 +6895,18 @@ class CommonEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6921,7 +6921,7 @@ class CommonEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7008,18 +7008,18 @@ class CompleteEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7034,7 +7034,7 @@ class CompleteEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7099,18 +7099,18 @@ class MinimalEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7125,7 +7125,7 @@ class MinimalEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7190,18 +7190,18 @@ class CompleteEnumeratedTypePubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7216,7 +7216,7 @@ class CompleteEnumeratedTypePubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7281,18 +7281,18 @@ class MinimalEnumeratedTypePubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7307,7 +7307,7 @@ class MinimalEnumeratedTypePubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7372,18 +7372,18 @@ class CommonBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7398,7 +7398,7 @@ class CommonBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7463,18 +7463,18 @@ class CompleteBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7489,7 +7489,7 @@ class CompleteBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7555,18 +7555,18 @@ class MinimalBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7581,7 +7581,7 @@ class MinimalBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7680,18 +7680,18 @@ class CommonBitmaskHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7706,7 +7706,7 @@ class CommonBitmaskHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7795,18 +7795,18 @@ class CompleteBitmaskTypePubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7821,7 +7821,7 @@ class CompleteBitmaskTypePubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7886,18 +7886,18 @@ class MinimalBitmaskTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7912,7 +7912,7 @@ class MinimalBitmaskTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7977,18 +7977,18 @@ class CommonBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8003,7 +8003,7 @@ class CommonBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8068,18 +8068,18 @@ class CompleteBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8094,7 +8094,7 @@ class CompleteBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8160,18 +8160,18 @@ class MinimalBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8186,7 +8186,7 @@ class MinimalBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8252,18 +8252,18 @@ class CompleteBitsetHeaderPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8278,7 +8278,7 @@ class CompleteBitsetHeaderPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8343,18 +8343,18 @@ class MinimalBitsetHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8369,7 +8369,7 @@ class MinimalBitsetHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8434,18 +8434,18 @@ class CompleteBitsetTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8460,7 +8460,7 @@ class CompleteBitsetTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8525,18 +8525,18 @@ class MinimalBitsetTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8551,7 +8551,7 @@ class MinimalBitsetTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8616,18 +8616,18 @@ class CompleteExtendedTypePubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8642,7 +8642,7 @@ class CompleteExtendedTypePubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8708,18 +8708,18 @@ class MinimalExtendedTypePubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8734,7 +8734,7 @@ class MinimalExtendedTypePubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8803,18 +8803,18 @@ class TypeIdentifierTypeObjectPairPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8829,7 +8829,7 @@ class TypeIdentifierTypeObjectPairPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8895,18 +8895,18 @@ class TypeIdentifierPairPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8921,7 +8921,7 @@ class TypeIdentifierPairPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8987,18 +8987,18 @@ class TypeIdentfierWithSizePubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -9013,7 +9013,7 @@ class TypeIdentfierWithSizePubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -9079,18 +9079,18 @@ class TypeIdentifierWithDependenciesPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -9105,7 +9105,7 @@ class TypeIdentifierWithDependenciesPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -9171,18 +9171,18 @@ class TypeInformationPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -9197,7 +9197,7 @@ class TypeInformationPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/include/fastdds/rtps/Endpoint.h b/include/fastdds/rtps/Endpoint.h index fd34fc14b72..a9ba1433e56 100644 --- a/include/fastdds/rtps/Endpoint.h +++ b/include/fastdds/rtps/Endpoint.h @@ -28,7 +28,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSParticipantImpl; diff --git a/include/fastdds/rtps/RTPSDomain.h b/include/fastdds/rtps/RTPSDomain.h index ac2da360cc0..25441033009 100644 --- a/include/fastdds/rtps/RTPSDomain.h +++ b/include/fastdds/rtps/RTPSDomain.h @@ -32,7 +32,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSParticipantImpl; @@ -335,7 +335,7 @@ class RTPSDomain }; } // namespace rtps -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif /* _FASTDDS_RTPS_DOMAIN_H_*/ diff --git a/include/fastdds/rtps/attributes/EndpointAttributes.h b/include/fastdds/rtps/attributes/EndpointAttributes.h index 6451c9eda18..11dbca15283 100644 --- a/include/fastdds/rtps/attributes/EndpointAttributes.h +++ b/include/fastdds/rtps/attributes/EndpointAttributes.h @@ -29,7 +29,7 @@ #include #endif // if HAVE_SECURITY namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** @@ -56,7 +56,7 @@ class EndpointAttributes GUID_t persistence_guid; //! The collection of external locators to use for communication. - fastdds::rtps::ExternalLocators external_unicast_locators; + ExternalLocators external_unicast_locators; //! Whether locators that don't match with the announced locators should be kept. bool ignore_non_matching_locators = false; @@ -171,7 +171,7 @@ class EndpointAttributes }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif /* _FASTDDS_ENDPOINTATTRIBUTES_H_ */ diff --git a/include/fastdds/rtps/attributes/EndpointSecurityAttributes.h b/include/fastdds/rtps/attributes/EndpointSecurityAttributes.h index 421f5ed23d2..89873896316 100644 --- a/include/fastdds/rtps/attributes/EndpointSecurityAttributes.h +++ b/include/fastdds/rtps/attributes/EndpointSecurityAttributes.h @@ -21,7 +21,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -124,7 +124,7 @@ struct EndpointSecurityAttributes } // namespace security } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _FASTDDS_RTPS_SECURITY_ACCESSCONTROL_ENDPOINTSECURITYATTRIBUTES_H_ diff --git a/include/fastdds/rtps/attributes/HistoryAttributes.h b/include/fastdds/rtps/attributes/HistoryAttributes.h index 1f45ec99ae2..c5b0b72bcb5 100644 --- a/include/fastdds/rtps/attributes/HistoryAttributes.h +++ b/include/fastdds/rtps/attributes/HistoryAttributes.h @@ -26,7 +26,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** @@ -124,7 +124,7 @@ class FASTDDS_EXPORTED_API HistoryAttributes }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif /* _FASTDDS_HISTORYATTRIBUTES_H_ */ diff --git a/include/fastdds/rtps/attributes/PropertyPolicy.h b/include/fastdds/rtps/attributes/PropertyPolicy.h index c38e495b8a7..ac673936b39 100644 --- a/include/fastdds/rtps/attributes/PropertyPolicy.h +++ b/include/fastdds/rtps/attributes/PropertyPolicy.h @@ -23,7 +23,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class PropertyPolicy @@ -143,7 +143,7 @@ class PropertyPolicyHelper }; } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _FASTDDS_RTPS_ATTRIBUTES_PROPERTYPOLICY_H_ diff --git a/include/fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp b/include/fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp index a8a23af90d3..c5c1dc9bb8d 100644 --- a/include/fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp +++ b/include/fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp @@ -24,7 +24,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** @@ -189,7 +189,7 @@ const RTPSParticipantAllocationAttributes c_default_RTPSParticipantAllocationAtt = RTPSParticipantAllocationAttributes(); } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif /* _FASTDDS_RTPS_RTPSPARTICIPANTALLOCATIONATTRIBUTES_HPP_ */ diff --git a/include/fastdds/rtps/attributes/RTPSParticipantAttributes.h b/include/fastdds/rtps/attributes/RTPSParticipantAttributes.h index 79b2e726c1b..cce436b31eb 100644 --- a/include/fastdds/rtps/attributes/RTPSParticipantAttributes.h +++ b/include/fastdds/rtps/attributes/RTPSParticipantAttributes.h @@ -63,11 +63,11 @@ struct ParticipantType } // namespace rtps } // namespace fastdds -namespace fastrtps { +namespace fastdds { namespace rtps { //! PDP subclass choice -typedef enum DiscoveryProtocol +enum class DiscoveryProtocol { NONE, /*!< @@ -94,7 +94,7 @@ typedef enum DiscoveryProtocol SUPER_CLIENT /*!< The participant will behave as a client concerning all internal behaviour. Remote servers will treat it as a server and will share every discovery information. */ -} DiscoveryProtocol_t; +}; inline std::ostream& operator <<( std::ostream& output, @@ -130,13 +130,13 @@ inline std::ostream& operator <<( } //! Filtering flags when discovering participants -typedef enum ParticipantFilteringFlags : uint32_t +enum ParticipantFilteringFlags : uint32_t { NO_FILTER = 0, FILTER_DIFFERENT_HOST = 0x1, FILTER_DIFFERENT_PROCESS = 0x2, FILTER_SAME_PROCESS = 0x4 -} ParticipantFilteringFlags_t; +}; #define BUILTIN_DATA_MAX_SIZE 512 @@ -144,7 +144,7 @@ typedef enum ParticipantFilteringFlags : uint32_t class PDP; class BuiltinProtocols; -typedef struct _PDPFactory +typedef struct PDPFactory { // Pointer to the PDP creator PDP* (*CreatePDPInstance)(BuiltinProtocols*); @@ -153,7 +153,7 @@ typedef struct _PDPFactory PDP*); bool operator ==( - const struct _PDPFactory& e) const + const struct PDPFactory& e) const { return (CreatePDPInstance == e.CreatePDPInstance) && (ReleasePDPInstance == e.ReleasePDPInstance); @@ -236,7 +236,7 @@ class DiscoverySettings public: //! Chosen discovery protocol - DiscoveryProtocol_t discoveryProtocol = DiscoveryProtocol_t::SIMPLE; + DiscoveryProtocol discoveryProtocol = DiscoveryProtocol::SIMPLE; /** * If set to true, SimpleEDP would be used. @@ -280,7 +280,7 @@ class DiscoverySettings eprosima::fastdds::rtps::RemoteServerList_t m_DiscoveryServers; //! Filtering participants out depending on location - ParticipantFilteringFlags_t ignoreParticipantFlags = ParticipantFilteringFlags::NO_FILTER; + ParticipantFilteringFlags ignoreParticipantFlags = ParticipantFilteringFlags::NO_FILTER; DiscoverySettings() = default; @@ -575,7 +575,7 @@ class RTPSParticipantAttributes }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _FASTDDS_RTPSPARTICIPANTPARAMETERS_H_ diff --git a/include/fastdds/rtps/attributes/ReaderAttributes.h b/include/fastdds/rtps/attributes/ReaderAttributes.h index 7336f1a03a6..73ed60f7db7 100644 --- a/include/fastdds/rtps/attributes/ReaderAttributes.h +++ b/include/fastdds/rtps/attributes/ReaderAttributes.h @@ -27,7 +27,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** @@ -96,7 +96,7 @@ class ReaderAttributes }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif /* _FASTDDS_RTPS_ATTRIBUTES_READERATTRIBUTES_H_ */ diff --git a/include/fastdds/rtps/attributes/ServerAttributes.h b/include/fastdds/rtps/attributes/ServerAttributes.h index 4076cba29e2..2fb237b7f68 100644 --- a/include/fastdds/rtps/attributes/ServerAttributes.h +++ b/include/fastdds/rtps/attributes/ServerAttributes.h @@ -30,14 +30,9 @@ namespace eprosima { -namespace fastrtps { -namespace rtps { -class ParticipantProxyData; -} // fastrtps -} // rtps - namespace fastdds { namespace rtps { +class ParticipantProxyData; /** * Class RemoteServerAttributes, to define the attributes of the Discovery Server Protocol. @@ -58,16 +53,16 @@ class RemoteServerAttributes FASTDDS_EXPORTED_API void clear() { - guidPrefix = fastrtps::rtps::GuidPrefix_t::unknown(); + guidPrefix = fastdds::rtps::GuidPrefix_t::unknown(); metatrafficUnicastLocatorList.clear(); metatrafficMulticastLocatorList.clear(); is_connected = false; } - FASTDDS_EXPORTED_API fastrtps::rtps::GUID_t GetParticipant() const; + FASTDDS_EXPORTED_API fastdds::rtps::GUID_t GetParticipant() const; - FASTDDS_EXPORTED_API fastrtps::rtps::GUID_t GetPDPReader() const; - FASTDDS_EXPORTED_API fastrtps::rtps::GUID_t GetPDPWriter() const; + FASTDDS_EXPORTED_API fastdds::rtps::GUID_t GetPDPReader() const; + FASTDDS_EXPORTED_API fastdds::rtps::GUID_t GetPDPWriter() const; FASTDDS_EXPORTED_API inline bool ReadguidPrefix( const char* pfx) @@ -81,7 +76,7 @@ class RemoteServerAttributes LocatorList metatrafficMulticastLocatorList; //!Guid prefix - fastrtps::rtps::GuidPrefix_t guidPrefix; + fastdds::rtps::GuidPrefix_t guidPrefix; // Whether connection has been established bool is_connected = false; @@ -219,28 +214,10 @@ FASTDDS_EXPORTED_API bool ros_super_client_env(); */ FASTDDS_EXPORTED_API bool get_server_client_default_guidPrefix( int id, - fastrtps::rtps::GuidPrefix_t& guid); - -} // namespace rtps -} // namespace fastdds - -// keep former namespace references available -namespace fastrtps { -namespace rtps { + fastdds::rtps::GuidPrefix_t& guid); -using fastdds::rtps::RemoteServerAttributes; -using fastdds::rtps::RemoteServerList_t; -using fastdds::rtps::DEFAULT_ROS2_SERVER_PORT; -using fastdds::rtps::DEFAULT_ROS2_SERVER_GUIDPREFIX; -using fastdds::rtps::DEFAULT_ROS2_MASTER_URI; -using fastdds::rtps::ROS_SUPER_CLIENT; -using fastdds::rtps::load_environment_server_info; -using fastdds::rtps::ros_discovery_server_env; -using fastdds::rtps::get_server_client_default_guidPrefix; -using fastdds::rtps::ros_super_client_env; - -} // fastrtps } // rtps +} // fastdds } // namespace eprosima diff --git a/include/fastdds/rtps/attributes/TopicAttributes.h b/include/fastdds/rtps/attributes/TopicAttributes.h index 8b1ecb7ffcd..6ff489d8081 100644 --- a/include/fastdds/rtps/attributes/TopicAttributes.h +++ b/include/fastdds/rtps/attributes/TopicAttributes.h @@ -26,11 +26,11 @@ namespace eprosima { -namespace fastrtps { +namespace fastdds { /** * Class TopicAttributes, used by the user to define the attributes of the topic associated with a Publisher or Subscriber. - * @ingroup FASTRTPS_ATTRIBUTES_MODULE + * @ingroup FASTDDS_ATTRIBUTES_MODULE */ class TopicAttributes { @@ -146,7 +146,7 @@ bool inline operator !=( #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif /* TOPICPARAMETERS_H_ */ diff --git a/include/fastdds/rtps/attributes/WriterAttributes.h b/include/fastdds/rtps/attributes/WriterAttributes.h index 625186312b6..c5706c656bb 100644 --- a/include/fastdds/rtps/attributes/WriterAttributes.h +++ b/include/fastdds/rtps/attributes/WriterAttributes.h @@ -29,7 +29,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { typedef enum RTPSWriterPublishMode : octet @@ -139,7 +139,7 @@ class WriterAttributes }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif /* _FASTDDS_WRITERATTRIBUTES_H_ */ diff --git a/include/fastdds/rtps/builtin/data/ContentFilterProperty.hpp b/include/fastdds/rtps/builtin/data/ContentFilterProperty.hpp index ec174f85cea..32cded64db7 100644 --- a/include/fastdds/rtps/builtin/data/ContentFilterProperty.hpp +++ b/include/fastdds/rtps/builtin/data/ContentFilterProperty.hpp @@ -46,7 +46,7 @@ class ContentFilterProperty /// Preallocated size of the filter expression size_t expression_initial_size = 0; /// Allocation configuration for the list of expression parameters - fastrtps::ResourceLimitedContainerConfig expression_parameters{ 0, 100, 1 }; + fastdds::ResourceLimitedContainerConfig expression_parameters{ 0, 100, 1 }; }; /** @@ -72,7 +72,7 @@ class ContentFilterProperty /// May be empty to indicate the ContentFilterProperty is not present. std::string filter_expression; /// List of values for the parameters present on the filter expression - fastrtps::ResourceLimitedVector expression_parameters; + fastdds::ResourceLimitedVector expression_parameters; }; } // namespace rtps diff --git a/include/fastdds/rtps/builtin/data/ParticipantProxyData.hpp b/include/fastdds/rtps/builtin/data/ParticipantProxyData.hpp index 88a18655bee..e518af95e1a 100644 --- a/include/fastdds/rtps/builtin/data/ParticipantProxyData.hpp +++ b/include/fastdds/rtps/builtin/data/ParticipantProxyData.hpp @@ -35,7 +35,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { struct CDRMessage_t; @@ -232,7 +232,7 @@ class ParticipantProxyData }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/include/fastdds/rtps/builtin/data/ReaderProxyData.h b/include/fastdds/rtps/builtin/data/ReaderProxyData.h index 5cfbc4a0956..f13a438625c 100644 --- a/include/fastdds/rtps/builtin/data/ReaderProxyData.h +++ b/include/fastdds/rtps/builtin/data/ReaderProxyData.h @@ -33,7 +33,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { struct CDRMessage_t; diff --git a/include/fastdds/rtps/builtin/data/WriterProxyData.h b/include/fastdds/rtps/builtin/data/WriterProxyData.h index 088ea0c1865..e9b56255684 100644 --- a/include/fastdds/rtps/builtin/data/WriterProxyData.h +++ b/include/fastdds/rtps/builtin/data/WriterProxyData.h @@ -35,7 +35,7 @@ namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { struct CDRMessage_t; @@ -509,7 +509,7 @@ class WriterProxyData }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/include/fastdds/rtps/common/BinaryProperty.h b/include/fastdds/rtps/common/BinaryProperty.h index 05a12d38c13..21786c620c1 100644 --- a/include/fastdds/rtps/common/BinaryProperty.h +++ b/include/fastdds/rtps/common/BinaryProperty.h @@ -25,158 +25,198 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class BinaryProperty { - public: - - BinaryProperty() : propagate_(false) {} - - BinaryProperty(const BinaryProperty& property) : - name_(property.name_), - value_(property.value_), - propagate_(property.propagate_) {} - - BinaryProperty(BinaryProperty&& property) : - name_(std::move(property.name_)), - value_(std::move(property.value_)), - propagate_(property.propagate_) {} - - BinaryProperty(const std::string& name, - const std::vector& value) : - name_(name), value_(value) {} - - BinaryProperty(std::string&& name, - std::vector&& value) : - name_(std::move(name)), value_(std::move(value)) {} - - BinaryProperty& operator=(const BinaryProperty& property) - { - name_ = property.name_; - value_ = property.value_; - propagate_ = property.propagate_; - return *this; - } - - BinaryProperty& operator=(BinaryProperty&& property) - { - name_ = std::move(property.name_); - value_ = std::move(property.value_); - propagate_ = property.propagate_; - return *this; - } - - bool operator==(const BinaryProperty& b) const - { - return (this->name_ == b.name_) && - (this->value_ == b.value_); - } - - void name(const std::string& name) - { - name_ = name; - } - - void name(std::string&& name) - { - name_ = std::move(name); - } - - const std::string& name() const - { - return name_; - } - - std::string& name() - { - return name_; - } - - void value(const std::vector& value) - { - value_ = value; - } - - void value(std::vector&& value) - { - value_ = std::move(value); - } - - const std::vector& value() const - { - return value_; - } - - std::vector& value() - { - return value_; - } - - void propagate(bool propagate) - { - propagate_ = propagate; - } - - bool propagate() const - { - return propagate_; - } - - bool& propagate() - { - return propagate_; - } - - private: - - std::string name_; - - std::vector value_; - - bool propagate_; +public: + + BinaryProperty() + : propagate_(false) + { + } + + BinaryProperty( + const BinaryProperty& property) + : name_(property.name_) + , value_(property.value_) + , propagate_(property.propagate_) + { + } + + BinaryProperty( + BinaryProperty&& property) + : name_(std::move(property.name_)) + , value_(std::move(property.value_)) + , propagate_(property.propagate_) + { + } + + BinaryProperty( + const std::string& name, + const std::vector& value) + : name_(name) + , value_(value) + { + } + + BinaryProperty( + std::string&& name, + std::vector&& value) + : name_(std::move(name)) + , value_(std::move(value)) + { + } + + BinaryProperty& operator =( + const BinaryProperty& property) + { + name_ = property.name_; + value_ = property.value_; + propagate_ = property.propagate_; + return *this; + } + + BinaryProperty& operator =( + BinaryProperty&& property) + { + name_ = std::move(property.name_); + value_ = std::move(property.value_); + propagate_ = property.propagate_; + return *this; + } + + bool operator ==( + const BinaryProperty& b) const + { + return (this->name_ == b.name_) && + (this->value_ == b.value_); + } + + void name( + const std::string& name) + { + name_ = name; + } + + void name( + std::string&& name) + { + name_ = std::move(name); + } + + const std::string& name() const + { + return name_; + } + + std::string& name() + { + return name_; + } + + void value( + const std::vector& value) + { + value_ = value; + } + + void value( + std::vector&& value) + { + value_ = std::move(value); + } + + const std::vector& value() const + { + return value_; + } + + std::vector& value() + { + return value_; + } + + void propagate( + bool propagate) + { + propagate_ = propagate; + } + + bool propagate() const + { + return propagate_; + } + + bool& propagate() + { + return propagate_; + } + +private: + + std::string name_; + + std::vector value_; + + bool propagate_; }; typedef std::vector BinaryPropertySeq; class BinaryPropertyHelper { - public: +public: - static size_t serialized_size(const BinaryProperty& binary_property, size_t current_alignment = 0) + static size_t serialized_size( + const BinaryProperty& binary_property, + size_t current_alignment = 0) + { + if (binary_property.propagate()) { - if(binary_property.propagate()) - { - size_t initial_alignment = current_alignment; + size_t initial_alignment = current_alignment; - current_alignment += 4 + alignment(current_alignment, 4) + binary_property.name().size() + 1; - current_alignment += 4 + alignment(current_alignment, 4) + binary_property.value().size(); + current_alignment += 4 + alignment(current_alignment, 4) + binary_property.name().size() + 1; + current_alignment += 4 + alignment(current_alignment, 4) + binary_property.value().size(); - return current_alignment - initial_alignment; - } - else - return 0; + return current_alignment - initial_alignment; } - - static size_t serialized_size(const BinaryPropertySeq& binary_properties, size_t current_alignment = 0) + else { - size_t initial_alignment = current_alignment; + return 0; + } + } - current_alignment += 4 + alignment(current_alignment, 4); - for(auto binary_property = binary_properties.begin(); binary_property != binary_properties.end(); ++binary_property) - current_alignment += serialized_size(*binary_property, current_alignment); + static size_t serialized_size( + const BinaryPropertySeq& binary_properties, + size_t current_alignment = 0) + { + size_t initial_alignment = current_alignment; - return current_alignment - initial_alignment; + current_alignment += 4 + alignment(current_alignment, 4); + for (auto binary_property = binary_properties.begin(); binary_property != binary_properties.end(); + ++binary_property) + { + current_alignment += serialized_size(*binary_property, current_alignment); } - private: + return current_alignment - initial_alignment; + } + +private: + + inline static size_t alignment( + size_t current_alignment, + size_t dataSize) + { + return (dataSize - (current_alignment % dataSize)) & (dataSize - 1); + } - inline static size_t alignment(size_t current_alignment, size_t dataSize) { return (dataSize - (current_alignment % dataSize)) & (dataSize-1);} }; } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _FASTDDS_RTPS_COMMON_BINARYPROPERTY_H_ diff --git a/include/fastdds/rtps/common/CDRMessage_t.h b/include/fastdds/rtps/common/CDRMessage_t.h index d5e6e1f934a..35d572433a1 100644 --- a/include/fastdds/rtps/common/CDRMessage_t.h +++ b/include/fastdds/rtps/common/CDRMessage_t.h @@ -27,7 +27,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { //!Max size of RTPS message in bytes. @@ -221,7 +221,7 @@ struct FASTDDS_EXPORTED_API CDRMessage_t final }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif /* DOXYGEN_SHOULD_SKIP_THIS_PUBLIC */ diff --git a/include/fastdds/rtps/common/CacheChange.h b/include/fastdds/rtps/common/CacheChange.h index f0ca5010498..841b363cb03 100644 --- a/include/fastdds/rtps/common/CacheChange.h +++ b/include/fastdds/rtps/common/CacheChange.h @@ -33,7 +33,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { struct CacheChange_t; @@ -424,7 +424,7 @@ struct FASTDDS_EXPORTED_API CacheChange_t }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif /* _FASTDDS_RTPS_CACHECHANGE_H_ */ diff --git a/include/fastdds/rtps/common/ChangeKind_t.hpp b/include/fastdds/rtps/common/ChangeKind_t.hpp index 69a500eeb04..b9944f4413b 100644 --- a/include/fastdds/rtps/common/ChangeKind_t.hpp +++ b/include/fastdds/rtps/common/ChangeKind_t.hpp @@ -22,7 +22,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** @@ -38,7 +38,7 @@ enum FASTDDS_EXPORTED_API ChangeKind_t }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif /* _FASTDDS_RTPS_COMMON_CHANGEKINDT_HPP_ */ diff --git a/include/fastdds/rtps/common/EntityId_t.hpp b/include/fastdds/rtps/common/EntityId_t.hpp index fbbc675bdde..835da80500a 100644 --- a/include/fastdds/rtps/common/EntityId_t.hpp +++ b/include/fastdds/rtps/common/EntityId_t.hpp @@ -27,7 +27,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { @@ -382,15 +382,15 @@ const EntityId_t monitor_service_status_writer = ENTITYID_MONITOR_SERVICE_WRITER #endif // if FASTDDS_STATISTICS } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima namespace std { template <> -struct hash +struct hash { std::size_t operator ()( - const eprosima::fastrtps::rtps::EntityId_t& k) const + const eprosima::fastdds::rtps::EntityId_t& k) const { return (static_cast(k.value[0]) << 16) | (static_cast(k.value[1]) << 8) | diff --git a/include/fastdds/rtps/common/FragmentNumber.h b/include/fastdds/rtps/common/FragmentNumber.h index 99a90caf5f4..5c195a91849 100644 --- a/include/fastdds/rtps/common/FragmentNumber.h +++ b/include/fastdds/rtps/common/FragmentNumber.h @@ -28,7 +28,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { using FragmentNumber_t = uint32_t; @@ -51,7 +51,7 @@ inline std::ostream& operator <<( } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif /* _FASTDDS_RTPS_RPTS_ELEM_FRAGNUM_H_ */ diff --git a/include/fastdds/rtps/common/Guid.h b/include/fastdds/rtps/common/Guid.h index 985466ae1d3..53ed949d6c9 100644 --- a/include/fastdds/rtps/common/Guid.h +++ b/include/fastdds/rtps/common/Guid.h @@ -29,7 +29,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { struct InstanceHandle_t; @@ -278,7 +278,7 @@ inline std::istream& operator >>( #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif /* _FASTDDS_RTPS_RTPS_GUID_H_ */ diff --git a/include/fastdds/rtps/common/GuidPrefix_t.hpp b/include/fastdds/rtps/common/GuidPrefix_t.hpp index 2174a0c5585..e7bdcaf615e 100644 --- a/include/fastdds/rtps/common/GuidPrefix_t.hpp +++ b/include/fastdds/rtps/common/GuidPrefix_t.hpp @@ -28,7 +28,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { //!@brief Structure GuidPrefix_t, Guid Prefix of GUID_t. @@ -209,7 +209,7 @@ inline std::istream& operator >>( } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif /* _FASTDDS_RTPS_COMMON_GUIDPREFIX_T_HPP_ */ diff --git a/include/fastdds/rtps/common/InstanceHandle.h b/include/fastdds/rtps/common/InstanceHandle.h index 0697af118e3..5b0e08bdc4a 100644 --- a/include/fastdds/rtps/common/InstanceHandle.h +++ b/include/fastdds/rtps/common/InstanceHandle.h @@ -26,7 +26,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { using KeyHash_t = std::array; @@ -359,7 +359,7 @@ inline std::istream& operator >>( #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif /* _FASTDDS_RTPS_INSTANCEHANDLE_H_ */ diff --git a/include/fastdds/rtps/common/Locator.h b/include/fastdds/rtps/common/Locator.h index f19a558f83d..c203188b711 100644 --- a/include/fastdds/rtps/common/Locator.h +++ b/include/fastdds/rtps/common/Locator.h @@ -34,7 +34,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /// Initialize locator with invalid values @@ -510,14 +510,14 @@ typedef std::vector::iterator LocatorListIterator; typedef std::vector::const_iterator LocatorListConstIterator; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima namespace eprosima { namespace fastdds { namespace rtps { -using Locator = eprosima::fastrtps::rtps::Locator_t; +using Locator = eprosima::fastdds::rtps::Locator_t; } // namespace rtps } // namespace fastdds diff --git a/include/fastdds/rtps/common/LocatorList.hpp b/include/fastdds/rtps/common/LocatorList.hpp index ce28a0c04fe..299d9686a30 100644 --- a/include/fastdds/rtps/common/LocatorList.hpp +++ b/include/fastdds/rtps/common/LocatorList.hpp @@ -456,17 +456,11 @@ inline std::istream& operator >>( return input; } -} // namespace rtps -} // namespace fastdds - -namespace fastrtps { -namespace rtps { - using Locators = eprosima::fastdds::rtps::Locators; using LocatorList_t = eprosima::fastdds::rtps::LocatorList; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif /* _FASTDDS_RTPS_COMMON_LOCATORLIST_HPP_ */ diff --git a/include/fastdds/rtps/common/LocatorListComparisons.hpp b/include/fastdds/rtps/common/LocatorListComparisons.hpp index 59591c3400d..cb1740bf7d1 100644 --- a/include/fastdds/rtps/common/LocatorListComparisons.hpp +++ b/include/fastdds/rtps/common/LocatorListComparisons.hpp @@ -24,7 +24,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** @@ -56,7 +56,7 @@ static inline bool operator == ( } } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif /* _FASTDDS_RTPS_COMMON_LOCATORLISTCOMPARISONS_HPP_ */ diff --git a/include/fastdds/rtps/common/LocatorSelector.hpp b/include/fastdds/rtps/common/LocatorSelector.hpp index 0ed3418e9bd..706035a9a0d 100644 --- a/include/fastdds/rtps/common/LocatorSelector.hpp +++ b/include/fastdds/rtps/common/LocatorSelector.hpp @@ -29,7 +29,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** @@ -473,7 +473,7 @@ class LocatorSelector }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif /* _FASTDDS_RTPS_COMMON_LOCATORSELECTOR_H_ */ diff --git a/include/fastdds/rtps/common/LocatorSelectorEntry.hpp b/include/fastdds/rtps/common/LocatorSelectorEntry.hpp index b2b209d6cec..d5aa401a78a 100644 --- a/include/fastdds/rtps/common/LocatorSelectorEntry.hpp +++ b/include/fastdds/rtps/common/LocatorSelectorEntry.hpp @@ -27,7 +27,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** @@ -138,7 +138,7 @@ struct LocatorSelectorEntry }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif /* DOXYGEN_SHOULD_SKIP_THIS_PUBLIC */ diff --git a/include/fastdds/rtps/common/LocatorsIterator.hpp b/include/fastdds/rtps/common/LocatorsIterator.hpp index 3d880e8db7b..88b80050863 100644 --- a/include/fastdds/rtps/common/LocatorsIterator.hpp +++ b/include/fastdds/rtps/common/LocatorsIterator.hpp @@ -63,16 +63,10 @@ struct LocatorsIterator virtual const Locator& operator *() const = 0; }; -} // namespace rtps -} // namespace fastdds - -namespace fastrtps { -namespace rtps { - using LocatorsIterator = eprosima::fastdds::rtps::LocatorsIterator; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif /* _FASTDDS_RTPS_COMMON_LOCATORSITERATOR_HPP_ */ diff --git a/include/fastdds/rtps/common/MatchingInfo.h b/include/fastdds/rtps/common/MatchingInfo.h index 50025f870f9..2849de12db4 100644 --- a/include/fastdds/rtps/common/MatchingInfo.h +++ b/include/fastdds/rtps/common/MatchingInfo.h @@ -23,7 +23,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** @@ -79,7 +79,7 @@ class FASTDDS_EXPORTED_API MatchingInfo GUID_t remoteEndpointGuid; }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif /* _FASTDDS_RTPS_MATCHINGINFO_H_ */ diff --git a/include/fastdds/rtps/common/PortParameters.h b/include/fastdds/rtps/common/PortParameters.h index 03e0025d0f9..57eef8aa145 100644 --- a/include/fastdds/rtps/common/PortParameters.h +++ b/include/fastdds/rtps/common/PortParameters.h @@ -23,7 +23,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** diff --git a/include/fastdds/rtps/common/Property.h b/include/fastdds/rtps/common/Property.h index c99ddc8a0a6..d03bae40842 100644 --- a/include/fastdds/rtps/common/Property.h +++ b/include/fastdds/rtps/common/Property.h @@ -24,7 +24,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class Property @@ -339,7 +339,7 @@ struct PropertyParser }; } //namespace eprosima -} //namespace fastrtps +} //namespace fastdds } //namespace rtps #endif // _FASTDDS_RTPS_COMMON_PROPERTYQOS_H_ diff --git a/include/fastdds/rtps/common/RemoteLocators.hpp b/include/fastdds/rtps/common/RemoteLocators.hpp index 8ef8eeb0058..bfe5ee3a7a0 100644 --- a/include/fastdds/rtps/common/RemoteLocators.hpp +++ b/include/fastdds/rtps/common/RemoteLocators.hpp @@ -24,7 +24,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** @@ -234,7 +234,7 @@ inline std::istream& operator >>( } } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif /* _FASTDDS_RTPS_COMMON_REMOTELOCATORS_HPP_ */ diff --git a/include/fastdds/rtps/common/SampleIdentity.h b/include/fastdds/rtps/common/SampleIdentity.h index d5657dcb8b5..d0030a5c160 100644 --- a/include/fastdds/rtps/common/SampleIdentity.h +++ b/include/fastdds/rtps/common/SampleIdentity.h @@ -23,7 +23,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /*! @@ -244,7 +244,7 @@ inline std::ostream& operator <<( #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _FASTDDS_RTPS_COMMON_SAMPLEIDENTITY_H_ diff --git a/include/fastdds/rtps/common/SequenceNumber.h b/include/fastdds/rtps/common/SequenceNumber.h index a529ea0368d..4c82a286685 100644 --- a/include/fastdds/rtps/common/SequenceNumber.h +++ b/include/fastdds/rtps/common/SequenceNumber.h @@ -29,7 +29,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { @@ -415,7 +415,7 @@ inline std::istream& operator >>( #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif /* _FASTDDS_RTPS_ELEM_SEQNUM_H_ */ diff --git a/include/fastdds/rtps/common/SerializedPayload.h b/include/fastdds/rtps/common/SerializedPayload.h index 7d39c6ee265..775a7286641 100644 --- a/include/fastdds/rtps/common/SerializedPayload.h +++ b/include/fastdds/rtps/common/SerializedPayload.h @@ -36,7 +36,7 @@ */ namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { //Pre define data encapsulation schemes @@ -150,7 +150,7 @@ struct FASTDDS_EXPORTED_API SerializedPayload_t }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif /* _FASTDDS_RTPS_SERIALIZEDPAYLOAD_H_ */ diff --git a/include/fastdds/rtps/common/Time_t.h b/include/fastdds/rtps/common/Time_t.h index 24e21f36f29..22369beed5b 100644 --- a/include/fastdds/rtps/common/Time_t.h +++ b/include/fastdds/rtps/common/Time_t.h @@ -26,7 +26,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { /** * Structure Time_t, used to describe times. @@ -118,10 +118,10 @@ class FASTDDS_EXPORTED_API Time_t long double sec); /** - * @param time fastrtps::Time_t, aka. Duration_t. + * @param time fastdds::Time_t, aka. Duration_t. */ Time_t( - const eprosima::fastrtps::Time_t& time); + const eprosima::fastdds::Time_t& time); /** * Returns stored time as nanoseconds (including seconds) @@ -687,11 +687,11 @@ const Time_t c_TimeZero{0, 0}; //! Time_t (Duration_t) representing an invalid time. DONT USE IT IN CONSTRUCTORS const Time_t c_TimeInvalid{-1, Time_t::INFINITE_NANOSECONDS}; -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima // defines to avoid the "static initialization order fiasco" -#define TIME_T_INFINITE_SECONDS (eprosima::fastrtps::Time_t::INFINITE_SECONDS) -#define TIME_T_INFINITE_NANOSECONDS (eprosima::fastrtps::Time_t::INFINITE_NANOSECONDS) +#define TIME_T_INFINITE_SECONDS (eprosima::fastdds::Time_t::INFINITE_SECONDS) +#define TIME_T_INFINITE_NANOSECONDS (eprosima::fastdds::Time_t::INFINITE_NANOSECONDS) #endif /* _FASTDDS_RTPS_TIME_T_H_ */ diff --git a/include/fastdds/rtps/common/Token.h b/include/fastdds/rtps/common/Token.h index 3f4bebc7b37..9c7d15632be 100644 --- a/include/fastdds/rtps/common/Token.h +++ b/include/fastdds/rtps/common/Token.h @@ -23,7 +23,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class DataHolder @@ -190,7 +190,7 @@ class DataHolderHelper }; } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _FASTDDS_RTPS_COMMON_TOKEN_H_ diff --git a/include/fastdds/rtps/common/Types.h b/include/fastdds/rtps/common/Types.h index 2834d1d7446..aee2cb2892e 100644 --- a/include/fastdds/rtps/common/Types.h +++ b/include/fastdds/rtps/common/Types.h @@ -29,7 +29,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /*! @@ -163,13 +163,11 @@ const ProtocolVersion_t c_ProtocolVersion_2_3{2, 3}; const ProtocolVersion_t c_ProtocolVersion; //!@brief Structure VendorId_t, specifying the vendor Id of the implementation. -// FASTDDS_TODO_BEFORE(3, 0, "Remove eprosima::fastrtps::rtps::VendorId_t usings"); +// FASTDDS_TODO_BEFORE(3, 0, "Remove eprosima::fastdds::rtps::VendorId_t usings"); using VendorId_t = eprosima::fastdds::rtps::VendorId_t; -using eprosima::fastdds::rtps::c_VendorId_Unknown; -using eprosima::fastdds::rtps::c_VendorId_eProsima; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif /* _FASTDDS_RTPS_COMMON_TYPES_H_ */ diff --git a/include/fastdds/rtps/common/WriteParams.h b/include/fastdds/rtps/common/WriteParams.h index 3214da72a48..8199448e781 100644 --- a/include/fastdds/rtps/common/WriteParams.h +++ b/include/fastdds/rtps/common/WriteParams.h @@ -22,7 +22,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /*! @@ -207,7 +207,7 @@ class FASTDDS_EXPORTED_API WriteParams }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif //_FASTDDS_RTPS_COMMON_WRITEPARAMS_H_ diff --git a/include/fastdds/rtps/history/History.h b/include/fastdds/rtps/history/History.h index 883d9c701bb..fdf3773505e 100644 --- a/include/fastdds/rtps/history/History.h +++ b/include/fastdds/rtps/history/History.h @@ -34,7 +34,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** @@ -293,7 +293,7 @@ class History }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif /* _FASTDDS_RTPS_HISTORY_H_ */ diff --git a/include/fastdds/rtps/history/IChangePool.h b/include/fastdds/rtps/history/IChangePool.h index 60c33719ac5..313e31049b9 100644 --- a/include/fastdds/rtps/history/IChangePool.h +++ b/include/fastdds/rtps/history/IChangePool.h @@ -20,7 +20,7 @@ #define _FASTDDS_RTPS_HISTORY_ICHANGEPOOL_H_ namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { struct CacheChange_t; @@ -66,7 +66,7 @@ class IChangePool }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/include/fastdds/rtps/history/IPayloadPool.h b/include/fastdds/rtps/history/IPayloadPool.h index d08ea201e96..a565ee54843 100644 --- a/include/fastdds/rtps/history/IPayloadPool.h +++ b/include/fastdds/rtps/history/IPayloadPool.h @@ -23,7 +23,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { struct SerializedPayload_t; @@ -104,7 +104,7 @@ class IPayloadPool }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/include/fastdds/rtps/history/ReaderHistory.h b/include/fastdds/rtps/history/ReaderHistory.h index 7ec05496277..606b3a0cbbe 100644 --- a/include/fastdds/rtps/history/ReaderHistory.h +++ b/include/fastdds/rtps/history/ReaderHistory.h @@ -25,7 +25,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class WriterProxy; @@ -268,7 +268,7 @@ class ReaderHistory : public History }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif /* _FASTDDS_RTPS_READERHISTORY_H_ */ diff --git a/include/fastdds/rtps/history/WriterHistory.h b/include/fastdds/rtps/history/WriterHistory.h index 031035fe255..2ca114720aa 100644 --- a/include/fastdds/rtps/history/WriterHistory.h +++ b/include/fastdds/rtps/history/WriterHistory.h @@ -24,7 +24,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSWriter; @@ -251,7 +251,7 @@ class WriterHistory : public rtps::History }; } // namespace rtps -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif /* _FASTDDS_RTPS_WRITERHISTORY_H_ */ diff --git a/include/fastdds/rtps/interfaces/IReaderDataFilter.hpp b/include/fastdds/rtps/interfaces/IReaderDataFilter.hpp index 4173af8e092..79cc7637140 100644 --- a/include/fastdds/rtps/interfaces/IReaderDataFilter.hpp +++ b/include/fastdds/rtps/interfaces/IReaderDataFilter.hpp @@ -44,8 +44,8 @@ class IReaderDataFilter * @return true if relevant, false otherwise. */ virtual bool is_relevant( - const fastrtps::rtps::CacheChange_t& change, - const fastrtps::rtps::GUID_t& reader_guid) const = 0; + const fastdds::rtps::CacheChange_t& change, + const fastdds::rtps::GUID_t& reader_guid) const = 0; }; } /* namespace rtps */ diff --git a/include/fastdds/rtps/messages/RTPSMessageSenderInterface.hpp b/include/fastdds/rtps/messages/RTPSMessageSenderInterface.hpp index 925ba9da8ec..e8848117483 100644 --- a/include/fastdds/rtps/messages/RTPSMessageSenderInterface.hpp +++ b/include/fastdds/rtps/messages/RTPSMessageSenderInterface.hpp @@ -29,7 +29,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { struct CDRMessage_t; @@ -99,7 +99,7 @@ class RTPSMessageSenderInterface }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/include/fastdds/rtps/messages/RTPS_messages.h b/include/fastdds/rtps/messages/RTPS_messages.h index c1859d0fae8..069f8184d2c 100644 --- a/include/fastdds/rtps/messages/RTPS_messages.h +++ b/include/fastdds/rtps/messages/RTPS_messages.h @@ -28,7 +28,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { // //!@brief Enumeration of the different Submessages types @@ -123,7 +123,7 @@ inline std::ostream& operator <<( } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/include/fastdds/rtps/participant/ParticipantDiscoveryInfo.h b/include/fastdds/rtps/participant/ParticipantDiscoveryInfo.h index 515215c4aeb..7e4405b745c 100644 --- a/include/fastdds/rtps/participant/ParticipantDiscoveryInfo.h +++ b/include/fastdds/rtps/participant/ParticipantDiscoveryInfo.h @@ -24,7 +24,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** @@ -110,7 +110,7 @@ inline bool operator ==( #endif // if HAVE_SECURITY } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _FASTDDS_RTPS_PARTICIPANT_PARTICIPANTDISCOVERYINFO_H__ diff --git a/include/fastdds/rtps/participant/RTPSParticipant.h b/include/fastdds/rtps/participant/RTPSParticipant.h index df880e79b89..91a179c747b 100644 --- a/include/fastdds/rtps/participant/RTPSParticipant.h +++ b/include/fastdds/rtps/participant/RTPSParticipant.h @@ -51,7 +51,7 @@ struct IStatusObserver; #endif //FASTDDS_STATISTICS -namespace fastrtps { +namespace fastdds { class TopicAttributes; @@ -403,7 +403,7 @@ class FASTDDS_EXPORTED_API RTPSParticipant * @return true if the operation succeeds. */ bool fill_discovery_data_from_cdr_message( - fastrtps::rtps::ParticipantProxyData& data, + fastdds::rtps::ParticipantProxyData& data, fastdds::statistics::MonitorServiceStatusData& msg); /** @@ -415,7 +415,7 @@ class FASTDDS_EXPORTED_API RTPSParticipant * @return true if the operation succeeds. */ bool fill_discovery_data_from_cdr_message( - fastrtps::rtps::WriterProxyData& data, + fastdds::rtps::WriterProxyData& data, fastdds::statistics::MonitorServiceStatusData& msg); /** @@ -427,7 +427,7 @@ class FASTDDS_EXPORTED_API RTPSParticipant * @return true if the operation succeeds. */ bool fill_discovery_data_from_cdr_message( - fastrtps::rtps::ReaderProxyData& data, + fastdds::rtps::ReaderProxyData& data, fastdds::statistics::MonitorServiceStatusData& msg); #endif // FASTDDS_STATISTICS diff --git a/include/fastdds/rtps/participant/RTPSParticipantListener.h b/include/fastdds/rtps/participant/RTPSParticipantListener.h index 6801a1ae22d..54a9d67b6e4 100644 --- a/include/fastdds/rtps/participant/RTPSParticipantListener.h +++ b/include/fastdds/rtps/participant/RTPSParticipantListener.h @@ -25,7 +25,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSParticipant; @@ -115,7 +115,7 @@ class FASTDDS_EXPORTED_API RTPSParticipantListener }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif //_FASTDDS_RTPS_PARTICIPANT_RTPSPARTICIPANTLISTENER_H__ diff --git a/include/fastdds/rtps/reader/RTPSReader.h b/include/fastdds/rtps/reader/RTPSReader.h index 92c09bd8c8c..ee0cfe4cf84 100644 --- a/include/fastdds/rtps/reader/RTPSReader.h +++ b/include/fastdds/rtps/reader/RTPSReader.h @@ -35,7 +35,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { // Forward declarations @@ -162,7 +162,7 @@ class RTPSReader : public Endpoint * @return true if there is an unread CacheChange_t in the history. */ FASTDDS_EXPORTED_API virtual bool wait_for_unread_cache( - const eprosima::fastrtps::Duration_t& timeout) = 0; + const eprosima::fastdds::Duration_t& timeout) = 0; /** * Get the number of unread CacheChange_t in the history. @@ -254,8 +254,8 @@ class RTPSReader : public Endpoint }; -} // namespace rtps -} // namespace fastrtps -} // namespace eprosima +} /* namespace rtps */ +} /* namespace fastdds */ +} /* namespace eprosima */ #endif /* _FASTDDS_RTPS_READER_RTPSREADER_H_ */ diff --git a/include/fastdds/rtps/reader/ReaderDiscoveryInfo.h b/include/fastdds/rtps/reader/ReaderDiscoveryInfo.h index 6fc5f52d359..3305016a8e3 100644 --- a/include/fastdds/rtps/reader/ReaderDiscoveryInfo.h +++ b/include/fastdds/rtps/reader/ReaderDiscoveryInfo.h @@ -24,7 +24,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** @@ -37,6 +37,8 @@ struct ReaderDiscoveryInfo //!Enum DISCOVERY_STATUS, four different status for discovered readers. //!@ingroup RTPS_MODULE + // *INDENT-OFF* : Does not understand the #if correctly and ends up removing the ; + // at the end of the enum, which does not build. #if defined(_WIN32) enum FASTDDS_EXPORTED_API DISCOVERY_STATUS #else @@ -48,7 +50,7 @@ struct ReaderDiscoveryInfo REMOVED_READER, IGNORED_READER }; - + // *INDENT-ON* ReaderDiscoveryInfo( const ReaderProxyData& data) : status(DISCOVERED_READER) @@ -68,7 +70,7 @@ struct ReaderDiscoveryInfo }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _FASTDDS_RTPS_READER_READERDISCOVERYINFO_H__ diff --git a/include/fastdds/rtps/reader/ReaderListener.h b/include/fastdds/rtps/reader/ReaderListener.h index 1ae490e952b..3a7ef7c67d3 100644 --- a/include/fastdds/rtps/reader/ReaderListener.h +++ b/include/fastdds/rtps/reader/ReaderListener.h @@ -29,7 +29,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSReader; @@ -200,7 +200,7 @@ class FASTDDS_EXPORTED_API ReaderListener }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif /* _FASTDDS_RTPS_READERLISTENER_H_ */ diff --git a/include/fastdds/rtps/resources/ResourceManagement.h b/include/fastdds/rtps/resources/ResourceManagement.h index 24d5f6feac0..c21f5bc77b0 100644 --- a/include/fastdds/rtps/resources/ResourceManagement.h +++ b/include/fastdds/rtps/resources/ResourceManagement.h @@ -21,15 +21,16 @@ #define _FASTDDS_RTPS_RESOURCE_MANAGEMENT_H_ -namespace eprosima{ -namespace fastrtps{ -namespace rtps{ +namespace eprosima { +namespace fastdds { +namespace rtps { /** * Enum MemoryuManagementPolicy_t, indicated the way memory is managed in terms of dealing with CacheChanges */ -typedef enum MemoryManagementPolicy{ +typedef enum MemoryManagementPolicy +{ PREALLOCATED_MEMORY_MODE, //!< Preallocated memory. Size set to the data type maximum. Largest memory footprint but smallest allocation count. PREALLOCATED_WITH_REALLOC_MEMORY_MODE, //!< Default size preallocated, requires reallocation when a bigger message arrives. Smaller memory footprint at the cost of an increased allocation count. DYNAMIC_RESERVE_MEMORY_MODE, //< Dynamic allocation at the time of message arrival. Least memory footprint but highest allocation count. @@ -38,7 +39,7 @@ typedef enum MemoryManagementPolicy{ } // end namespaces -} -} +} // namespace fastdds +} // namespace eprosima #endif /* _FASTDDS_RTPS_RESOURCE_MANAGEMENT_H_ */ diff --git a/include/fastdds/rtps/transport/ChainingTransport.h b/include/fastdds/rtps/transport/ChainingTransport.h index 6fdf2562ed7..bcfb681fbec 100644 --- a/include/fastdds/rtps/transport/ChainingTransport.h +++ b/include/fastdds/rtps/transport/ChainingTransport.h @@ -74,7 +74,7 @@ class ChainingTransport : public TransportInterface * @return True when the transport was correctly initialized. */ FASTDDS_EXPORTED_API bool init( - const fastrtps::rtps::PropertyPolicy* properties = nullptr, + const fastdds::rtps::PropertyPolicy* properties = nullptr, const uint32_t& max_msg_size_no_frag = 0) override { return low_level_transport_->init(properties, max_msg_size_no_frag); @@ -86,7 +86,7 @@ class ChainingTransport : public TransportInterface * fully closed or fully open, so that "open" and "close" operations are whole and definitive. */ FASTDDS_EXPORTED_API bool IsInputChannelOpen( - const fastrtps::rtps::Locator_t& loc) const override + const fastdds::rtps::Locator_t& loc) const override { return low_level_transport_->IsInputChannelOpen(loc); } @@ -96,7 +96,7 @@ class ChainingTransport : public TransportInterface * Must report whether the given locator is supported by this transport (typically inspecting its "kind" value). */ FASTDDS_EXPORTED_API bool IsLocatorSupported( - const fastrtps::rtps::Locator_t& loc) const override + const fastdds::rtps::Locator_t& loc) const override { return low_level_transport_->IsLocatorSupported(loc); } @@ -105,8 +105,8 @@ class ChainingTransport : public TransportInterface * Call the low-level transport `RemoteToMainLocal()`. * Returns the locator describing the main (most general) channel that can write to the provided remote locator. */ - FASTDDS_EXPORTED_API fastrtps::rtps::Locator_t RemoteToMainLocal( - const fastrtps::rtps::Locator_t& loc) const override + FASTDDS_EXPORTED_API fastdds::rtps::Locator_t RemoteToMainLocal( + const fastdds::rtps::Locator_t& loc) const override { return low_level_transport_->RemoteToMainLocal(loc); } @@ -117,7 +117,7 @@ class ChainingTransport : public TransportInterface * If there is an existing channel it registers the receiver interface. */ FASTDDS_EXPORTED_API bool OpenInputChannel( - const fastrtps::rtps::Locator_t& loc, + const fastdds::rtps::Locator_t& loc, TransportReceiverInterface* receiver_interface, uint32_t max_message_size) override; @@ -128,7 +128,7 @@ class ChainingTransport : public TransportInterface */ FASTDDS_EXPORTED_API bool OpenOutputChannel( SendResourceList& sender_resource_list, - const fastrtps::rtps::Locator_t& loc) override; + const fastdds::rtps::Locator_t& loc) override; /*! * Call the low-level transport `CloseInputChannel()`. @@ -137,7 +137,7 @@ class ChainingTransport : public TransportInterface * any necessary mutual exclusion and timeout mechanisms to make sure the channel can be closed without damage. */ FASTDDS_EXPORTED_API bool CloseInputChannel( - const fastrtps::rtps::Locator_t& loc) override + const fastdds::rtps::Locator_t& loc) override { return low_level_transport_->CloseInputChannel(loc); } @@ -146,8 +146,8 @@ class ChainingTransport : public TransportInterface * Call the low-level transport `NormalizeLocator()`. * Performs locator normalization (assign valid IP if not defined by user) */ - FASTDDS_EXPORTED_API fastrtps::rtps::LocatorList_t NormalizeLocator( - const fastrtps::rtps::Locator_t& locator) override + FASTDDS_EXPORTED_API fastdds::rtps::LocatorList_t NormalizeLocator( + const fastdds::rtps::Locator_t& locator) override { return low_level_transport_->NormalizeLocator(locator); } @@ -157,7 +157,7 @@ class ChainingTransport : public TransportInterface * Must report whether the given locator is from the local host */ FASTDDS_EXPORTED_API bool is_local_locator( - const fastrtps::rtps::Locator_t& locator) const override + const fastdds::rtps::Locator_t& locator) const override { return low_level_transport_->is_local_locator(locator); } @@ -185,8 +185,8 @@ class ChainingTransport : public TransportInterface * Must report whether two locators map to the same internal channel. */ FASTDDS_EXPORTED_API bool DoInputLocatorsMatch( - const fastrtps::rtps::Locator_t& locator_1, - const fastrtps::rtps::Locator_t& locator_2) const override + const fastdds::rtps::Locator_t& locator_1, + const fastdds::rtps::Locator_t& locator_2) const override { return low_level_transport_->DoInputLocatorsMatch(locator_1, locator_2); } @@ -196,7 +196,7 @@ class ChainingTransport : public TransportInterface * Performs the locator selection algorithm for this transport. */ FASTDDS_EXPORTED_API void select_locators( - fastrtps::rtps::LocatorSelector& selector) const override + fastdds::rtps::LocatorSelector& selector) const override { return low_level_transport_->select_locators(selector); } @@ -206,7 +206,7 @@ class ChainingTransport : public TransportInterface * Add default output locator to the locator list */ FASTDDS_EXPORTED_API void AddDefaultOutputLocator( - fastrtps::rtps::LocatorList_t& defaultList) override + fastdds::rtps::LocatorList_t& defaultList) override { return low_level_transport_->AddDefaultOutputLocator(defaultList); } @@ -216,7 +216,7 @@ class ChainingTransport : public TransportInterface * Add metatraffic multicast locator with the given port */ FASTDDS_EXPORTED_API bool getDefaultMetatrafficMulticastLocators( - fastrtps::rtps::LocatorList_t& locators, + fastdds::rtps::LocatorList_t& locators, uint32_t metatraffic_multicast_port) const override { return low_level_transport_->getDefaultMetatrafficMulticastLocators(locators, metatraffic_multicast_port); @@ -227,7 +227,7 @@ class ChainingTransport : public TransportInterface * Add metatraffic unicast locator with the given port */ FASTDDS_EXPORTED_API bool getDefaultMetatrafficUnicastLocators( - fastrtps::rtps::LocatorList_t& locators, + fastdds::rtps::LocatorList_t& locators, uint32_t metatraffic_unicast_port) const override { return low_level_transport_->getDefaultMetatrafficUnicastLocators(locators, metatraffic_unicast_port); @@ -238,7 +238,7 @@ class ChainingTransport : public TransportInterface * Add unicast locator with the given port */ FASTDDS_EXPORTED_API bool getDefaultUnicastLocators( - fastrtps::rtps::LocatorList_t& locators, + fastdds::rtps::LocatorList_t& locators, uint32_t unicast_port) const override { return low_level_transport_->getDefaultUnicastLocators(locators, unicast_port); @@ -249,7 +249,7 @@ class ChainingTransport : public TransportInterface * Assign port to the given metatraffic multicast locator if not already defined */ FASTDDS_EXPORTED_API bool fillMetatrafficMulticastLocator( - fastrtps::rtps::Locator_t& locator, + fastdds::rtps::Locator_t& locator, uint32_t metatraffic_multicast_port) const override { return low_level_transport_->fillMetatrafficMulticastLocator(locator, metatraffic_multicast_port); @@ -260,7 +260,7 @@ class ChainingTransport : public TransportInterface * Assign port to the given metatraffic unicast locator if not already defined */ FASTDDS_EXPORTED_API bool fillMetatrafficUnicastLocator( - fastrtps::rtps::Locator_t& locator, + fastdds::rtps::Locator_t& locator, uint32_t metatraffic_unicast_port) const override { return low_level_transport_->fillMetatrafficUnicastLocator(locator, metatraffic_unicast_port); @@ -271,10 +271,10 @@ class ChainingTransport : public TransportInterface * Configure the initial peer locators list */ FASTDDS_EXPORTED_API bool configureInitialPeerLocator( - fastrtps::rtps::Locator_t& locator, - const fastrtps::rtps::PortParameters& port_params, + fastdds::rtps::Locator_t& locator, + const fastdds::rtps::PortParameters& port_params, uint32_t domainId, - fastrtps::rtps::LocatorList_t& list) const override + fastdds::rtps::LocatorList_t& list) const override { return low_level_transport_->configureInitialPeerLocator(locator, port_params, domainId, list); } @@ -284,7 +284,7 @@ class ChainingTransport : public TransportInterface * Assign port to the given unicast locator if not already defined */ FASTDDS_EXPORTED_API bool fillUnicastLocator( - fastrtps::rtps::Locator_t& locator, + fastdds::rtps::Locator_t& locator, uint32_t well_known_port) const override { return low_level_transport_->fillUnicastLocator(locator, well_known_port); @@ -293,8 +293,8 @@ class ChainingTransport : public TransportInterface //! Call the low-level transport `transform_remote_locator()`. //! Transforms a remote locator into a locator optimized for local communications. FASTDDS_EXPORTED_API bool transform_remote_locator( - const fastrtps::rtps::Locator_t& remote_locator, - fastrtps::rtps::Locator_t& result_locator) const override + const fastdds::rtps::Locator_t& remote_locator, + fastdds::rtps::Locator_t& result_locator) const override { return low_level_transport_->transform_remote_locator(remote_locator, result_locator); } @@ -327,11 +327,11 @@ class ChainingTransport : public TransportInterface * @param timeout Maximum blocking time. */ FASTDDS_EXPORTED_API virtual bool send( - fastrtps::rtps::SenderResource* low_sender_resource, + fastdds::rtps::SenderResource* low_sender_resource, const std::vector& buffers, uint32_t total_bytes, - fastrtps::rtps::LocatorsIterator* destination_locators_begin, - fastrtps::rtps::LocatorsIterator* destination_locators_end, + fastdds::rtps::LocatorsIterator* destination_locators_begin, + fastdds::rtps::LocatorsIterator* destination_locators_end, const std::chrono::steady_clock::time_point& timeout) = 0; /*! @@ -351,10 +351,10 @@ class ChainingTransport : public TransportInterface */ FASTDDS_EXPORTED_API virtual void receive( TransportReceiverInterface* next_receiver, - const fastrtps::rtps::octet* receive_buffer, + const fastdds::rtps::octet* receive_buffer, uint32_t receive_buffer_size, - const fastrtps::rtps::Locator_t& local_locator, - const fastrtps::rtps::Locator_t& remote_locator) = 0; + const fastdds::rtps::Locator_t& local_locator, + const fastdds::rtps::Locator_t& remote_locator) = 0; FASTDDS_EXPORTED_API void update_network_interfaces() override { @@ -365,8 +365,8 @@ class ChainingTransport : public TransportInterface //! Transforms a remote locator into a locator optimized for local communications, //! if allowed by both local and remote transports. FASTDDS_EXPORTED_API bool transform_remote_locator( - const fastrtps::rtps::Locator_t& remote_locator, - fastrtps::rtps::Locator_t& result_locator, + const fastdds::rtps::Locator_t& remote_locator, + fastdds::rtps::Locator_t& result_locator, bool allowed_remote_localhost, bool allowed_local_localhost) const override { @@ -379,7 +379,7 @@ class ChainingTransport : public TransportInterface * Must report whether the given locator is allowed by this transport. */ FASTDDS_EXPORTED_API bool is_locator_allowed( - const fastrtps::rtps::Locator_t& locator) const override + const fastdds::rtps::Locator_t& locator) const override { return low_level_transport_->is_locator_allowed(locator); } @@ -390,11 +390,11 @@ class ChainingTransport : public TransportInterface private: - std::map receiver_resources_; + std::map receiver_resources_; }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _FASTDDS_RTPS_TRANSPORT_CHAININGTRANSPORT_H_ diff --git a/include/fastdds/rtps/transport/SenderResource.h b/include/fastdds/rtps/transport/SenderResource.h index a3d869a8240..0670d442c5e 100644 --- a/include/fastdds/rtps/transport/SenderResource.h +++ b/include/fastdds/rtps/transport/SenderResource.h @@ -27,7 +27,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSParticipantImpl; @@ -125,7 +125,7 @@ class SenderResource }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif /* _FASTDDS_RTPS_TRANSPORT_SENDERRESOURCE_H_ */ diff --git a/include/fastdds/rtps/transport/TCPv4TransportDescriptor.h b/include/fastdds/rtps/transport/TCPv4TransportDescriptor.h index 6d33d0b40d5..b2c43629b77 100644 --- a/include/fastdds/rtps/transport/TCPv4TransportDescriptor.h +++ b/include/fastdds/rtps/transport/TCPv4TransportDescriptor.h @@ -26,7 +26,7 @@ namespace rtps { /** * TCPv4 Transport configuration. - * The kind value for TCPv4TransportDescriptor is given by \c eprosima::fastrtps::rtps::LOCATOR_KIND_TCPv4. + * The kind value for TCPv4TransportDescriptor is given by \c eprosima::fastdds::rtps::LOCATOR_KIND_TCPv4. * * - \c wan_addr: Public IP address. Peers on a different LAN will use this IP for communications with this host. * @@ -40,14 +40,14 @@ struct TCPv4TransportDescriptor : public TCPTransportDescriptor virtual TransportInterface* create_transport() const override; //! Public IP address - fastrtps::rtps::octet wan_addr[4]; + fastdds::rtps::octet wan_addr[4]; //! Set the public IP address void set_WAN_address( - fastrtps::rtps::octet o1, - fastrtps::rtps::octet o2, - fastrtps::rtps::octet o3, - fastrtps::rtps::octet o4) + fastdds::rtps::octet o1, + fastdds::rtps::octet o2, + fastdds::rtps::octet o3, + fastdds::rtps::octet o4) { wan_addr[0] = o1; wan_addr[1] = o2; @@ -63,10 +63,10 @@ struct TCPv4TransportDescriptor : public TCPTransportDescriptor int a, b, c, d; //to store the 4 ints char ch; //to temporarily store the '.' ss >> a >> ch >> b >> ch >> c >> ch >> d; - wan_addr[0] = (fastrtps::rtps::octet)a; - wan_addr[1] = (fastrtps::rtps::octet)b; - wan_addr[2] = (fastrtps::rtps::octet)c; - wan_addr[3] = (fastrtps::rtps::octet)d; + wan_addr[0] = (fastdds::rtps::octet)a; + wan_addr[1] = (fastdds::rtps::octet)b; + wan_addr[2] = (fastdds::rtps::octet)c; + wan_addr[3] = (fastdds::rtps::octet)d; } //! Get the public IP address diff --git a/include/fastdds/rtps/transport/TCPv6TransportDescriptor.h b/include/fastdds/rtps/transport/TCPv6TransportDescriptor.h index ad73604d97e..a490f6715f2 100644 --- a/include/fastdds/rtps/transport/TCPv6TransportDescriptor.h +++ b/include/fastdds/rtps/transport/TCPv6TransportDescriptor.h @@ -23,7 +23,7 @@ namespace rtps { /** * TCPv6 Transport configuration - * The kind value for TCPv6TransportDescriptor is given by \c eprosima::fastrtps::rtps::LOCATOR_KIND_TCPv6. + * The kind value for TCPv6TransportDescriptor is given by \c eprosima::fastdds::rtps::LOCATOR_KIND_TCPv6. * * @ingroup TRANSPORT_MODULE */ diff --git a/include/fastdds/rtps/transport/TransportInterface.h b/include/fastdds/rtps/transport/TransportInterface.h index 000e5e0edca..641c096c076 100644 --- a/include/fastdds/rtps/transport/TransportInterface.h +++ b/include/fastdds/rtps/transport/TransportInterface.h @@ -44,7 +44,7 @@ static const std::string s_IPv4AddressAny = "0.0.0.0"; //! Default IPv6 address static const std::string s_IPv6AddressAny = "::"; -using SendResourceList = std::vector>; +using SendResourceList = std::vector>; using NetmaskFilterInfo = std::pair>; using TransportNetmaskFilterInfo = std::pair; @@ -94,7 +94,7 @@ class FASTDDS_EXPORTED_API TransportInterface * @return True when the transport was correctly initialized. */ virtual bool init( - const fastrtps::rtps::PropertyPolicy* properties = nullptr, + const fastdds::rtps::PropertyPolicy* properties = nullptr, const uint32_t& max_msg_size_no_frag = 0) = 0; /** @@ -153,7 +153,7 @@ class FASTDDS_EXPORTED_API TransportInterface */ virtual bool OpenOutputChannels( SendResourceList& sender_resource_list, - const fastrtps::rtps::LocatorSelectorEntry& locator_selector_entry); + const fastdds::rtps::LocatorSelectorEntry& locator_selector_entry); /** * Close the channel that maps to/from the given locator selector entry. @@ -163,7 +163,7 @@ class FASTDDS_EXPORTED_API TransportInterface */ virtual void CloseOutputChannels( SendResourceList& sender_resource_list, - const fastrtps::rtps::LocatorSelectorEntry& locator_selector_entry); + const fastdds::rtps::LocatorSelectorEntry& locator_selector_entry); /** Opens an input channel to receive incoming connections. * If there is an existing channel it registers the receiver interface. @@ -201,7 +201,7 @@ class FASTDDS_EXPORTED_API TransportInterface * @param [in, out] selector Locator selector. */ virtual void select_locators( - fastrtps::rtps::LocatorSelector& selector) const = 0; + fastdds::rtps::LocatorSelector& selector) const = 0; //! Must report whether the given locator is from the local host virtual bool is_local_locator( @@ -242,7 +242,7 @@ class FASTDDS_EXPORTED_API TransportInterface //! Configure the initial peer locators list virtual bool configureInitialPeerLocator( Locator& locator, - const fastrtps::rtps::PortParameters& port_params, + const fastdds::rtps::PortParameters& port_params, uint32_t domainId, LocatorList& list) const = 0; diff --git a/include/fastdds/rtps/transport/TransportReceiverInterface.h b/include/fastdds/rtps/transport/TransportReceiverInterface.h index 1c7e5d6f4c0..f6066a98d61 100644 --- a/include/fastdds/rtps/transport/TransportReceiverInterface.h +++ b/include/fastdds/rtps/transport/TransportReceiverInterface.h @@ -40,7 +40,7 @@ class FASTDDS_EXPORTED_API TransportReceiverInterface * @param remote_locator Locator identifying the remote endpoint. */ virtual void OnDataReceived( - const fastrtps::rtps::octet* data, + const fastdds::rtps::octet* data, const uint32_t size, const Locator& local_locator, const Locator& remote_locator) = 0; diff --git a/include/fastdds/rtps/transport/UDPv4TransportDescriptor.h b/include/fastdds/rtps/transport/UDPv4TransportDescriptor.h index 7bdae6be2f4..b715f357e62 100644 --- a/include/fastdds/rtps/transport/UDPv4TransportDescriptor.h +++ b/include/fastdds/rtps/transport/UDPv4TransportDescriptor.h @@ -23,7 +23,7 @@ namespace rtps { /** * UDPv4 Transport configuration - * The kind value for UDPv4TransportDescriptor is given by \c eprosima::fastrtps::rtps::LOCATOR_KIND_UDPv4. + * The kind value for UDPv4TransportDescriptor is given by \c eprosima::fastdds::rtps::LOCATOR_KIND_UDPv4. * * @ingroup TRANSPORT_MODULE */ diff --git a/include/fastdds/rtps/transport/UDPv6TransportDescriptor.h b/include/fastdds/rtps/transport/UDPv6TransportDescriptor.h index 8ab8a970956..69a4ac414c4 100644 --- a/include/fastdds/rtps/transport/UDPv6TransportDescriptor.h +++ b/include/fastdds/rtps/transport/UDPv6TransportDescriptor.h @@ -25,7 +25,7 @@ class TransportInterface; /** * UDPv6 Transport configuration - * The kind value for UDPv6TransportDescriptor is given by \c eprosima::fastrtps::rtps::LOCATOR_KIND_UDPv6. + * The kind value for UDPv6TransportDescriptor is given by \c eprosima::fastdds::rtps::LOCATOR_KIND_UDPv6. * * @ingroup TRANSPORT_MODULE */ diff --git a/include/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h b/include/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h index 54b0509bd1d..f6ad9734988 100644 --- a/include/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h +++ b/include/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h @@ -29,7 +29,7 @@ class TransportInterface; /** * Shared memory transport configuration. - * The kind value for SharedMemTransportDescriptor is given by eprosima::fastrtps::rtps::LOCATOR_KIND_SHM. + * The kind value for SharedMemTransportDescriptor is given by eprosima::fastdds::rtps::LOCATOR_KIND_SHM. * * - segment_size_: size of the shared memory segment (in octets). * diff --git a/include/fastdds/rtps/transport/test_UDPv4TransportDescriptor.h b/include/fastdds/rtps/transport/test_UDPv4TransportDescriptor.h index 277cde7a531..4ed2fb993db 100644 --- a/include/fastdds/rtps/transport/test_UDPv4TransportDescriptor.h +++ b/include/fastdds/rtps/transport/test_UDPv4TransportDescriptor.h @@ -24,14 +24,10 @@ namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { struct CDRMessage_t; -} //rtps -} //fastrtps -namespace fastdds { -namespace rtps { /** * UDP v4 Test Transport configuration @@ -40,7 +36,7 @@ namespace rtps { struct test_UDPv4TransportDescriptor : public SocketTransportDescriptor { //! Custom message filtering functions - typedef std::function filter; + typedef std::function filter; //! Locator filtering function typedef std::function DestinationLocatorFilter; @@ -91,7 +87,7 @@ struct test_UDPv4TransportDescriptor : public SocketTransportDescriptor DestinationLocatorFilter locator_filter_; //! Vector containing the message's sequence numbers being dropped - std::vector sequenceNumberDataMessagesToDrop; + std::vector sequenceNumberDataMessagesToDrop; //! Log dropped packets uint32_t dropLogLength; diff --git a/include/fastdds/rtps/writer/DeliveryRetCode.hpp b/include/fastdds/rtps/writer/DeliveryRetCode.hpp index 6aac557277a..4140ce501b1 100644 --- a/include/fastdds/rtps/writer/DeliveryRetCode.hpp +++ b/include/fastdds/rtps/writer/DeliveryRetCode.hpp @@ -4,7 +4,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { enum class DeliveryRetCode : uint32_t @@ -15,7 +15,7 @@ enum class DeliveryRetCode : uint32_t }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _FASTDDS_RTPS_WRITER_DELIVERYRETCODE_HPP_ diff --git a/include/fastdds/rtps/writer/LocatorSelectorSender.hpp b/include/fastdds/rtps/writer/LocatorSelectorSender.hpp index 7829104a71c..37b0a0b71e7 100644 --- a/include/fastdds/rtps/writer/LocatorSelectorSender.hpp +++ b/include/fastdds/rtps/writer/LocatorSelectorSender.hpp @@ -9,7 +9,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSWriter; @@ -110,7 +110,7 @@ class LocatorSelectorSender : public RTPSMessageSenderInterface return mutex_.try_lock_until(abs_time); } - fastrtps::rtps::LocatorSelector locator_selector; + fastdds::rtps::LocatorSelector locator_selector; ResourceLimitedVector all_remote_readers; @@ -124,6 +124,6 @@ class LocatorSelectorSender : public RTPSMessageSenderInterface }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _FASTDDS_RTPS_WRITER_LOCATORSELECTORSENDER_HPP_ diff --git a/include/fastdds/rtps/writer/RTPSWriter.h b/include/fastdds/rtps/writer/RTPSWriter.h index a4c1d620bad..6282d20fab9 100644 --- a/include/fastdds/rtps/writer/RTPSWriter.h +++ b/include/fastdds/rtps/writer/RTPSWriter.h @@ -54,7 +54,7 @@ class DataWriterImpl; } // namespace dds } // namespace fastdds -namespace fastrtps { +namespace fastdds { namespace rtps { class WriterListener; @@ -616,7 +616,7 @@ class RTPSWriter }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif /* _FASTDDS_RTPS_RTPSWRITER_H_ */ diff --git a/include/fastdds/rtps/writer/WriterDiscoveryInfo.h b/include/fastdds/rtps/writer/WriterDiscoveryInfo.h index 9167f72a09a..66ac46dacb9 100644 --- a/include/fastdds/rtps/writer/WriterDiscoveryInfo.h +++ b/include/fastdds/rtps/writer/WriterDiscoveryInfo.h @@ -22,7 +22,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** @@ -35,6 +35,8 @@ struct WriterDiscoveryInfo //!Enum DISCOVERY_STATUS, four different status for discovered writers. //!@ingroup RTPS_MODULE + // *INDENT-OFF* : Does not understand the #if correctly and ends up removing the ; + // at the end of the enum, which does not build. #if defined(_WIN32) enum FASTDDS_EXPORTED_API DISCOVERY_STATUS #else @@ -46,7 +48,7 @@ struct WriterDiscoveryInfo REMOVED_WRITER, IGNORED_WRITER }; - + // *INDENT-ON* WriterDiscoveryInfo( const WriterProxyData& data) : status(DISCOVERED_WRITER) @@ -66,7 +68,7 @@ struct WriterDiscoveryInfo }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _RTPS_WRITER_WRITERDISCOVERYINFO_H_ diff --git a/include/fastdds/rtps/writer/WriterListener.h b/include/fastdds/rtps/writer/WriterListener.h index 8932c7d99b9..0e2d291c810 100644 --- a/include/fastdds/rtps/writer/WriterListener.h +++ b/include/fastdds/rtps/writer/WriterListener.h @@ -27,7 +27,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSWriter; @@ -149,7 +149,7 @@ class FASTDDS_EXPORTED_API WriterListener }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/include/fastdds/statistics/dds/domain/DomainParticipant.hpp b/include/fastdds/statistics/dds/domain/DomainParticipant.hpp index e5ab3a6f559..05c829dc06b 100644 --- a/include/fastdds/statistics/dds/domain/DomainParticipant.hpp +++ b/include/fastdds/statistics/dds/domain/DomainParticipant.hpp @@ -28,14 +28,13 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class ReaderProxyData; class WriterProxyData; } // namespace rtps -} // namespace fastrtps -namespace fastdds { + namespace statistics { class MonitorServiceStatusData; @@ -145,7 +144,7 @@ class DomainParticipant : public eprosima::fastdds::dds::DomainParticipant * @return RETCODE_ERROR if the operation fails. */ FASTDDS_EXPORTED_API eprosima::fastdds::dds::ReturnCode_t fill_discovery_data_from_cdr_message( - fastrtps::rtps::ParticipantProxyData& data, + fastdds::rtps::ParticipantProxyData& data, statistics::MonitorServiceStatusData& msg); /** @@ -158,7 +157,7 @@ class DomainParticipant : public eprosima::fastdds::dds::DomainParticipant * @return RETCODE_ERROR if the operation fails. */ FASTDDS_EXPORTED_API eprosima::fastdds::dds::ReturnCode_t fill_discovery_data_from_cdr_message( - fastrtps::rtps::WriterProxyData& data, + fastdds::rtps::WriterProxyData& data, statistics::MonitorServiceStatusData& msg); /** @@ -171,7 +170,7 @@ class DomainParticipant : public eprosima::fastdds::dds::DomainParticipant * @return RETCODE_ERROR if the operation fails. */ FASTDDS_EXPORTED_API eprosima::fastdds::dds::ReturnCode_t fill_discovery_data_from_cdr_message( - fastrtps::rtps::ReaderProxyData& data, + fastdds::rtps::ReaderProxyData& data, statistics::MonitorServiceStatusData& msg); /** @@ -184,7 +183,7 @@ class DomainParticipant : public eprosima::fastdds::dds::DomainParticipant * @return RETCODE_ERROR if the operation fails. */ FASTDDS_EXPORTED_API eprosima::fastdds::dds::ReturnCode_t fill_discovery_data_from_cdr_message( - fastrtps::rtps::ParticipantProxyData& data, + fastdds::rtps::ParticipantProxyData& data, const statistics::MonitorServiceStatusData& msg); /** @@ -197,7 +196,7 @@ class DomainParticipant : public eprosima::fastdds::dds::DomainParticipant * @return RETCODE_ERROR if the operation fails. */ FASTDDS_EXPORTED_API eprosima::fastdds::dds::ReturnCode_t fill_discovery_data_from_cdr_message( - fastrtps::rtps::WriterProxyData& data, + fastdds::rtps::WriterProxyData& data, const statistics::MonitorServiceStatusData& msg); /** @@ -210,7 +209,7 @@ class DomainParticipant : public eprosima::fastdds::dds::DomainParticipant * @return RETCODE_ERROR if the operation fails. */ FASTDDS_EXPORTED_API eprosima::fastdds::dds::ReturnCode_t fill_discovery_data_from_cdr_message( - fastrtps::rtps::ReaderProxyData& data, + fastdds::rtps::ReaderProxyData& data, const statistics::MonitorServiceStatusData& msg); }; diff --git a/include/fastdds/statistics/rtps/StatisticsCommon.hpp b/include/fastdds/statistics/rtps/StatisticsCommon.hpp index c40a57e8da0..aca1c23f106 100644 --- a/include/fastdds/statistics/rtps/StatisticsCommon.hpp +++ b/include/fastdds/statistics/rtps/StatisticsCommon.hpp @@ -31,15 +31,13 @@ namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSMessageGroup; } // rtps -} // fastrtps -namespace fastdds { namespace statistics { #ifdef FASTDDS_STATISTICS @@ -122,13 +120,13 @@ class StatisticsListenersImpl * Retrieve endpoint mutexes from derived class * @return defaults to the endpoint mutex */ - virtual fastrtps::RecursiveTimedMutex& get_statistics_mutex() = 0; + virtual fastdds::RecursiveTimedMutex& get_statistics_mutex() = 0; /** * Retrieve the GUID_t from derived class * @return endpoint GUID_t */ - virtual const fastrtps::rtps::GUID_t& get_guid() const = 0; + virtual const fastdds::rtps::GUID_t& get_guid() const = 0; }; // Members are private details @@ -148,13 +146,13 @@ class StatisticsWriterImpl * Retrieve endpoint mutexes from derived class * @return defaults to the endpoint mutex */ - fastrtps::RecursiveTimedMutex& get_statistics_mutex() final; + fastdds::RecursiveTimedMutex& get_statistics_mutex() final; /** * Retrieve the GUID_t from derived class * @return endpoint GUID_t */ - const fastrtps::rtps::GUID_t& get_guid() const final; + const fastdds::rtps::GUID_t& get_guid() const final; protected: @@ -171,7 +169,7 @@ class StatisticsWriterImpl * @param num_sent_submessages Current total number of submessages sent for the affected sample. */ void on_sample_datas( - const fastrtps::rtps::SampleIdentity& sample_identity, + const fastdds::rtps::SampleIdentity& sample_identity, size_t num_sent_submessages); /** @@ -215,7 +213,7 @@ struct StatisticsReaderAncillary; class StatisticsReaderImpl : protected StatisticsListenersImpl { - friend class fastrtps::rtps::RTPSMessageGroup; + friend class fastdds::rtps::RTPSMessageGroup; /** * Create the auxiliary structure @@ -227,13 +225,13 @@ class StatisticsReaderImpl * Retrieve endpoint mutexes from derived class * @return defaults to the endpoint mutex */ - fastrtps::RecursiveTimedMutex& get_statistics_mutex() final; + fastdds::RecursiveTimedMutex& get_statistics_mutex() final; /** * Retrieve the GUID_t from derived class * @return endpoint GUID_t */ - const fastrtps::rtps::GUID_t& get_guid() const final; + const fastdds::rtps::GUID_t& get_guid() const final; protected: @@ -250,8 +248,8 @@ class StatisticsReaderImpl * @param source_timestamp Source timestamp received from the writer for the sample being notified. */ void on_data_notify( - const fastrtps::rtps::GUID_t& writer_guid, - const fastrtps::rtps::Time_t& source_timestamp); + const fastdds::rtps::GUID_t& writer_guid, + const fastdds::rtps::Time_t& source_timestamp); /** * @brief Report that an ACKNACK message is sent @@ -289,7 +287,7 @@ class StatisticsWriterImpl * Parameter: Current total number of submessages sent for the affected sample. */ inline void on_sample_datas( - const fastrtps::rtps::SampleIdentity&, + const fastdds::rtps::SampleIdentity&, size_t) { } @@ -344,7 +342,7 @@ class StatisticsWriterImpl class StatisticsReaderImpl { - friend class fastrtps::rtps::RTPSMessageGroup; + friend class fastdds::rtps::RTPSMessageGroup; protected: @@ -356,8 +354,8 @@ class StatisticsReaderImpl * Parameter: Source timestamp received from the writer for the sample being notified. */ inline void on_data_notify( - const fastrtps::rtps::GUID_t&, - const fastrtps::rtps::Time_t&) + const fastdds::rtps::GUID_t&, + const fastdds::rtps::Time_t&) { } diff --git a/include/fastdds/utils/IPFinder.h b/include/fastdds/utils/IPFinder.h index 1babd66fd4d..51efa5c4901 100644 --- a/include/fastdds/utils/IPFinder.h +++ b/include/fastdds/utils/IPFinder.h @@ -28,7 +28,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** * Class IPFinder, to determine the IP of the NICs. @@ -130,7 +130,7 @@ class IPFinder }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } /* namespace eprosima */ #endif /* IPFINDER_H_ */ diff --git a/include/fastdds/utils/IPLocator.h b/include/fastdds/utils/IPLocator.h index d2df1cde930..2ad0209b219 100644 --- a/include/fastdds/utils/IPLocator.h +++ b/include/fastdds/utils/IPLocator.h @@ -29,7 +29,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class Locator_t; @@ -300,7 +300,7 @@ class IPLocator }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } /* namespace eprosima */ #endif /* IP_LOCATOR_H_ */ diff --git a/include/fastdds/utils/TimedConditionVariable.hpp b/include/fastdds/utils/TimedConditionVariable.hpp index dbbb3e1267d..e5ddf4c5511 100644 --- a/include/fastdds/utils/TimedConditionVariable.hpp +++ b/include/fastdds/utils/TimedConditionVariable.hpp @@ -61,7 +61,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { #if HAVE_STRICT_REALTIME && (/*defined(_WIN32) ||*/ defined(__unix__)) @@ -190,7 +190,7 @@ class TimedConditionVariable using TimedConditionVariable = std::condition_variable_any; #endif // HAVE_STRICT_REALTIME && (/*defined(_WIN32)*/ || defined(__unix__)) -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _UTILS_TIMEDCONDITIONVARIABLE_HPP_ diff --git a/include/fastdds/utils/TimedMutex.hpp b/include/fastdds/utils/TimedMutex.hpp index d20fae9cb4a..10aaf546251 100644 --- a/include/fastdds/utils/TimedMutex.hpp +++ b/include/fastdds/utils/TimedMutex.hpp @@ -40,7 +40,7 @@ extern int clock_gettime( #endif // if defined(_WIN32) namespace eprosima { -namespace fastrtps { +namespace fastdds { #if defined(_WIN32) @@ -338,7 +338,7 @@ class RecursiveTimedMutex #endif //_WIN32 -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _UTILS_TIMEDMUTEX_HPP_ diff --git a/include/fastdds/utils/collections/ResourceLimitedContainerConfig.hpp b/include/fastdds/utils/collections/ResourceLimitedContainerConfig.hpp index 1d762e2baa4..b20c78acc45 100644 --- a/include/fastdds/utils/collections/ResourceLimitedContainerConfig.hpp +++ b/include/fastdds/utils/collections/ResourceLimitedContainerConfig.hpp @@ -17,14 +17,14 @@ * */ -#ifndef FASTRTPS_UTILS_COLLECTIONS_RESOURCELIMITEDCONTAINERCONFIG_HPP_ -#define FASTRTPS_UTILS_COLLECTIONS_RESOURCELIMITEDCONTAINERCONFIG_HPP_ +#ifndef FASTDDS_UTILS_COLLECTIONS_RESOURCELIMITEDCONTAINERCONFIG_HPP_ +#define FASTDDS_UTILS_COLLECTIONS_RESOURCELIMITEDCONTAINERCONFIG_HPP_ #include #include namespace eprosima { -namespace fastrtps { +namespace fastdds { #define dummy_avoid_winmax @@ -87,7 +87,7 @@ inline bool operator == ( lhs.increment == rhs.increment; } -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima -#endif /* FASTRTPS_UTILS_COLLECTIONS_RESOURCELIMITEDCONTAINERCONFIG_HPP_ */ +#endif /* FASTDDS_UTILS_COLLECTIONS_RESOURCELIMITEDCONTAINERCONFIG_HPP_ */ diff --git a/include/fastdds/utils/collections/ResourceLimitedVector.hpp b/include/fastdds/utils/collections/ResourceLimitedVector.hpp index cbdcb387622..1da769572b6 100644 --- a/include/fastdds/utils/collections/ResourceLimitedVector.hpp +++ b/include/fastdds/utils/collections/ResourceLimitedVector.hpp @@ -17,8 +17,8 @@ * */ -#ifndef FASTRTPS_UTILS_COLLECTIONS_RESOURCELIMITEDVECTOR_HPP_ -#define FASTRTPS_UTILS_COLLECTIONS_RESOURCELIMITEDVECTOR_HPP_ +#ifndef FASTDDS_UTILS_COLLECTIONS_RESOURCELIMITEDVECTOR_HPP_ +#define FASTDDS_UTILS_COLLECTIONS_RESOURCELIMITEDVECTOR_HPP_ #include "ResourceLimitedContainerConfig.hpp" @@ -28,7 +28,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { /** * Resource limited wrapper of std::vector. @@ -616,7 +616,7 @@ class ResourceLimitedVector }; -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima -#endif /* FASTRTPS_UTILS_COLLECTIONS_RESOURCELIMITEDVECTOR_HPP_ */ +#endif /* FASTDDS_UTILS_COLLECTIONS_RESOURCELIMITEDVECTOR_HPP_ */ diff --git a/include/fastdds/utils/fixed_size_bitmap.hpp b/include/fastdds/utils/fixed_size_bitmap.hpp index abd4d5ed1d7..d6577e80f6c 100644 --- a/include/fastdds/utils/fixed_size_bitmap.hpp +++ b/include/fastdds/utils/fixed_size_bitmap.hpp @@ -17,8 +17,8 @@ * */ -#ifndef FASTRTPS_UTILS_FIXED_SIZE_BITMAP_HPP_ -#define FASTRTPS_UTILS_FIXED_SIZE_BITMAP_HPP_ +#ifndef FASTDDS_UTILS_FIXED_SIZE_BITMAP_HPP_ +#define FASTDDS_UTILS_FIXED_SIZE_BITMAP_HPP_ #include #include @@ -44,7 +44,7 @@ #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC namespace eprosima { -namespace fastrtps { +namespace fastdds { using std::uint32_t; @@ -615,7 +615,7 @@ class BitmapRange }; -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC @@ -634,4 +634,4 @@ class BitmapRange #endif // if _MSC_VER -#endif // FASTRTPS_UTILS_FIXED_SIZE_BITMAP_HPP_ +#endif // FASTDDS_UTILS_FIXED_SIZE_BITMAP_HPP_ diff --git a/include/fastrtps/attributes/LibrarySettingsAttributes.h b/include/fastrtps/attributes/LibrarySettingsAttributes.h index a967d73d5a6..bf91704f40e 100644 --- a/include/fastrtps/attributes/LibrarySettingsAttributes.h +++ b/include/fastrtps/attributes/LibrarySettingsAttributes.h @@ -21,7 +21,7 @@ #define LIBRARYSETTINGS_ATTRIBUTES_H_ namespace eprosima { -namespace fastrtps { +namespace fastdds { enum IntraprocessDeliveryType { @@ -31,8 +31,8 @@ enum IntraprocessDeliveryType }; /** - * Class LibraySettingsAttributes, used by the user to define the FastRTPS library behaviour - * @ingroup FASTRTPS_ATTRIBUTES_MODULE + * Class LibraySettingsAttributes, used by the user to define the Fast DDS library behaviour + * @ingroup FASTDDS_ATTRIBUTES_MODULE */ class LibrarySettingsAttributes { @@ -60,7 +60,7 @@ class LibrarySettingsAttributes #endif // if HAVE_STRICT_REALTIME }; -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif /* LIBRARYSETTINGS_ATTRIBUTES_H_ */ diff --git a/include/fastrtps/common/KeyedChanges.h b/include/fastrtps/common/KeyedChanges.h index 31f24851d0c..16ae9161d8f 100644 --- a/include/fastrtps/common/KeyedChanges.h +++ b/include/fastrtps/common/KeyedChanges.h @@ -23,12 +23,12 @@ #include #include -namespace eprosima{ -namespace fastrtps{ +namespace eprosima { +namespace fastdds { /** * @brief A struct storing a vector of cache changes and the next deadline in the group - * @ingroup FASTRTPS_MODULE + * @ingroup FASTDDS_MODULE */ struct KeyedChanges { @@ -40,7 +40,8 @@ struct KeyedChanges } //! Copy constructor - KeyedChanges(const KeyedChanges& other) + KeyedChanges( + const KeyedChanges& other) : cache_changes(other.cache_changes) , next_deadline_us(other.next_deadline_us) { diff --git a/include/fastrtps/config/doxygen_modules.h b/include/fastrtps/config/doxygen_modules.h index de263a30fdc..7eab9ac0c3f 100644 --- a/include/fastrtps/config/doxygen_modules.h +++ b/include/fastrtps/config/doxygen_modules.h @@ -76,13 +76,13 @@ */ /** @defgroup TYPES_MODULE Contains the builtin generated types - * @namespace eprosima::fastrtps::types - * @ingroup FASTRTPS_MODULE + * @namespace eprosima::fastdds::types + * @ingroup FASTDDS_MODULE */ /** @defgroup XMLPARSER_MODULE Contains all the modules related with the XMLParser - * @namespace eprosima::fastrtps::xmlparser - * @ingroup FASTRTPS_MODULE + * @namespace eprosima::fastdds::xmlparser + * @ingroup FASTDDS_MODULE */ #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC @@ -137,7 +137,7 @@ */ /** - * @namespace eprosima::fastrtps::rtps::TimeConv Auxiliary methods to convert to Time_t to more manageable types. + * @namespace eprosima::fastdds::rtps::TimeConv Auxiliary methods to convert to Time_t to more manageable types. * @ingroup UTILITIES_MODULE */ diff --git a/include/fastrtps/qos/ParameterTypes.h b/include/fastrtps/qos/ParameterTypes.h index 6ba7757d3bf..248280f7d4e 100644 --- a/include/fastrtps/qos/ParameterTypes.h +++ b/include/fastrtps/qos/ParameterTypes.h @@ -34,7 +34,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { #if HAVE_SECURITY namespace rtps { diff --git a/include/fastrtps/qos/QosPolicies.h b/include/fastrtps/qos/QosPolicies.h index 5c1348e16b1..c68d2082fe7 100644 --- a/include/fastrtps/qos/QosPolicies.h +++ b/include/fastrtps/qos/QosPolicies.h @@ -28,7 +28,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { using QosPolicy = fastdds::dds::QosPolicy; using DurabilityQosPolicyKind = fastdds::dds::DurabilityQosPolicyKind; @@ -106,7 +106,7 @@ namespace xtypes { using TypeInformationParameter = fastdds::dds::xtypes::TypeInformationParameter; } //namespace xtypes -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif /* QOS_POLICIES_H_ */ diff --git a/include/fastrtps/rtps/common/SerializedPayload.h b/include/fastrtps/rtps/common/SerializedPayload.h deleted file mode 100644 index 002ab18f764..00000000000 --- a/include/fastrtps/rtps/common/SerializedPayload.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file SerializedPayload.h - */ - -#ifndef SERIALIZEDPAYLOAD_H_ -#define SERIALIZEDPAYLOAD_H_ - -#include - -#endif /* SERIALIZEDPAYLOAD_H_ */ diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp index c2d3d6b8765..c1060e248bc 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp +++ b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp @@ -44,8 +44,7 @@ namespace eprosima { -using namespace fastrtps::rtps; -using eprosima::fastdds::dds::Log; +using namespace fastdds::rtps; namespace fastdds { namespace dds { @@ -53,21 +52,21 @@ namespace builtin { inline SequenceNumber_t sequence_number_rtps_2_dds( - const fastrtps::rtps::SequenceNumber_t& seq_number) + const fastdds::rtps::SequenceNumber_t& seq_number) { return *reinterpret_cast(&seq_number); } inline GUID_t guid_rtps_2_dds( - const fastrtps::rtps::GUID_t& rtps_guid) + const fastdds::rtps::GUID_t& rtps_guid) { return *reinterpret_cast(&rtps_guid); } -inline fastrtps::rtps::GUID_t guid_dds_2_rtps( +inline fastdds::rtps::GUID_t guid_dds_2_rtps( const GUID_t& guid) { - return *reinterpret_cast(&guid); + return *reinterpret_cast(&guid); } TypeLookupManager::TypeLookupManager() @@ -105,17 +104,17 @@ TypeLookupManager::~TypeLookupManager() } bool TypeLookupManager::init( - fastrtps::rtps::BuiltinProtocols* protocols) + fastdds::rtps::BuiltinProtocols* protocols) { participant_ = protocols->mp_participantImpl; builtin_protocols_ = protocols; local_instance_name_ = get_instance_name(participant_->getGuid()); - temp_reader_proxy_data_ = new fastrtps::rtps::ReaderProxyData( + temp_reader_proxy_data_ = new fastdds::rtps::ReaderProxyData( protocols->mp_participantImpl->getRTPSParticipantAttributes().allocation.locators.max_unicast_locators, protocols->mp_participantImpl->getRTPSParticipantAttributes().allocation.locators.max_multicast_locators); - temp_writer_proxy_data_ = new fastrtps::rtps::WriterProxyData( + temp_writer_proxy_data_ = new fastdds::rtps::WriterProxyData( protocols->mp_participantImpl->getRTPSParticipantAttributes().allocation.locators.max_unicast_locators, protocols->mp_participantImpl->getRTPSParticipantAttributes().allocation.locators.max_multicast_locators); @@ -147,16 +146,16 @@ bool TypeLookupManager::assign_remote_endpoints( temp_writer_proxy_data_->persistence_guid().guidPrefix = pdata.m_guid.guidPrefix; temp_writer_proxy_data_->set_remote_locators(pdata.metatraffic_locators, network, true); temp_writer_proxy_data_->topicKind(NO_KEY); - temp_writer_proxy_data_->m_qos.m_durability.kind = fastrtps::VOLATILE_DURABILITY_QOS; - temp_writer_proxy_data_->m_qos.m_reliability.kind = fastrtps::RELIABLE_RELIABILITY_QOS; + temp_writer_proxy_data_->m_qos.m_durability.kind = fastdds::VOLATILE_DURABILITY_QOS; + temp_writer_proxy_data_->m_qos.m_reliability.kind = fastdds::RELIABLE_RELIABILITY_QOS; temp_reader_proxy_data_->clear(); temp_reader_proxy_data_->m_expectsInlineQos = false; temp_reader_proxy_data_->guid().guidPrefix = pdata.m_guid.guidPrefix; temp_reader_proxy_data_->set_remote_locators(pdata.metatraffic_locators, network, true); temp_reader_proxy_data_->topicKind(NO_KEY); - temp_reader_proxy_data_->m_qos.m_durability.kind = fastrtps::VOLATILE_DURABILITY_QOS; - temp_reader_proxy_data_->m_qos.m_reliability.kind = fastrtps::RELIABLE_RELIABILITY_QOS; + temp_reader_proxy_data_->m_qos.m_durability.kind = fastdds::VOLATILE_DURABILITY_QOS; + temp_reader_proxy_data_->m_qos.m_reliability.kind = fastdds::RELIABLE_RELIABILITY_QOS; EPROSIMA_LOG_INFO(TYPELOOKUP_SERVICE, "for RTPSParticipant: " << pdata.m_guid); @@ -165,8 +164,8 @@ bool TypeLookupManager::assign_remote_endpoints( if (auxendp != 0 && builtin_request_reader_ != nullptr) { EPROSIMA_LOG_INFO(TYPELOOKUP_SERVICE, "Adding remote writer to the local Builtin Request Reader"); - temp_writer_proxy_data_->guid().entityId = fastrtps::rtps::c_EntityId_TypeLookup_request_writer; - temp_writer_proxy_data_->persistence_guid().entityId = fastrtps::rtps::c_EntityId_TypeLookup_request_writer; + temp_writer_proxy_data_->guid().entityId = fastdds::rtps::c_EntityId_TypeLookup_request_writer; + temp_writer_proxy_data_->persistence_guid().entityId = fastdds::rtps::c_EntityId_TypeLookup_request_writer; builtin_request_reader_->matched_writer_add(*temp_writer_proxy_data_); } @@ -176,8 +175,8 @@ bool TypeLookupManager::assign_remote_endpoints( if (auxendp != 0 && builtin_reply_reader_ != nullptr) { EPROSIMA_LOG_INFO(TYPELOOKUP_SERVICE, "Adding remote writer to the local Builtin Reply Reader"); - temp_writer_proxy_data_->guid().entityId = fastrtps::rtps::c_EntityId_TypeLookup_reply_writer; - temp_writer_proxy_data_->persistence_guid().entityId = fastrtps::rtps::c_EntityId_TypeLookup_reply_writer; + temp_writer_proxy_data_->guid().entityId = fastdds::rtps::c_EntityId_TypeLookup_reply_writer; + temp_writer_proxy_data_->persistence_guid().entityId = fastdds::rtps::c_EntityId_TypeLookup_reply_writer; builtin_reply_reader_->matched_writer_add(*temp_writer_proxy_data_); } @@ -187,7 +186,7 @@ bool TypeLookupManager::assign_remote_endpoints( if (auxendp != 0 && builtin_request_writer_ != nullptr) { EPROSIMA_LOG_INFO(TYPELOOKUP_SERVICE, "Adding remote reader to the local Builtin Request Writer"); - temp_reader_proxy_data_->guid().entityId = fastrtps::rtps::c_EntityId_TypeLookup_request_reader; + temp_reader_proxy_data_->guid().entityId = fastdds::rtps::c_EntityId_TypeLookup_request_reader; builtin_request_writer_->matched_reader_add(*temp_reader_proxy_data_); } @@ -197,7 +196,7 @@ bool TypeLookupManager::assign_remote_endpoints( if (auxendp != 0 && builtin_reply_writer_ != nullptr) { EPROSIMA_LOG_INFO(TYPELOOKUP_SERVICE, "Adding remote reader to the local Builtin Reply Writer"); - temp_reader_proxy_data_->guid().entityId = fastrtps::rtps::c_EntityId_TypeLookup_reply_reader; + temp_reader_proxy_data_->guid().entityId = fastdds::rtps::c_EntityId_TypeLookup_reply_reader; builtin_reply_writer_->matched_reader_add(*temp_reader_proxy_data_); } @@ -205,9 +204,9 @@ bool TypeLookupManager::assign_remote_endpoints( } void TypeLookupManager::remove_remote_endpoints( - fastrtps::rtps::ParticipantProxyData* pdata) + fastdds::rtps::ParticipantProxyData* pdata) { - fastrtps::rtps::GUID_t tmp_guid; + fastdds::rtps::GUID_t tmp_guid; tmp_guid.guidPrefix = pdata->m_guid.guidPrefix; EPROSIMA_LOG_INFO(TYPELOOKUP_SERVICE, "for RTPSParticipant: " << pdata->m_guid); @@ -220,7 +219,7 @@ void TypeLookupManager::remove_remote_endpoints( if ((auxendp != 0 || partdet != 0) && builtin_request_reader_ != nullptr) { EPROSIMA_LOG_INFO(TYPELOOKUP_SERVICE, "Removing remote writer from the local Builtin Request Reader"); - tmp_guid.entityId = fastrtps::rtps::c_EntityId_TypeLookup_request_writer; + tmp_guid.entityId = fastdds::rtps::c_EntityId_TypeLookup_request_writer; builtin_request_reader_->matched_writer_remove(tmp_guid); } @@ -230,7 +229,7 @@ void TypeLookupManager::remove_remote_endpoints( if ((auxendp != 0 || partdet != 0) && builtin_reply_reader_ != nullptr) { EPROSIMA_LOG_INFO(TYPELOOKUP_SERVICE, "Removing remote writer from the local Builtin Reply Reader"); - tmp_guid.entityId = fastrtps::rtps::c_EntityId_TypeLookup_reply_writer; + tmp_guid.entityId = fastdds::rtps::c_EntityId_TypeLookup_reply_writer; builtin_reply_reader_->matched_writer_remove(tmp_guid); } @@ -240,7 +239,7 @@ void TypeLookupManager::remove_remote_endpoints( if ((auxendp != 0 || partdet != 0) && builtin_request_writer_ != nullptr) { EPROSIMA_LOG_INFO(TYPELOOKUP_SERVICE, "Removing remote reader from the local Builtin Request Writer"); - tmp_guid.entityId = fastrtps::rtps::c_EntityId_TypeLookup_request_reader; + tmp_guid.entityId = fastdds::rtps::c_EntityId_TypeLookup_request_reader; builtin_request_writer_->matched_reader_remove(tmp_guid); } @@ -250,14 +249,14 @@ void TypeLookupManager::remove_remote_endpoints( if ((auxendp != 0 || partdet != 0) && builtin_reply_writer_ != nullptr) { EPROSIMA_LOG_INFO(TYPELOOKUP_SERVICE, "Removing remote reader from the local Builtin Reply Writer"); - tmp_guid.entityId = fastrtps::rtps::c_EntityId_TypeLookup_reply_reader; + tmp_guid.entityId = fastdds::rtps::c_EntityId_TypeLookup_reply_reader; builtin_reply_writer_->matched_reader_remove(tmp_guid); } } SampleIdentity TypeLookupManager::get_type_dependencies( const xtypes::TypeIdentifierSeq& id_seq, - const fastrtps::rtps::GUID_t& type_server, + const fastdds::rtps::GUID_t& type_server, const std::vector& continuation_point) const { TypeLookup_getTypeDependencies_In in; @@ -286,7 +285,7 @@ SampleIdentity TypeLookupManager::get_type_dependencies( SampleIdentity TypeLookupManager::get_types( const xtypes::TypeIdentifierSeq& id_seq, - const fastrtps::rtps::GUID_t& type_server) const + const fastdds::rtps::GUID_t& type_server) const { TypeLookup_getTypes_In in; in.type_ids(id_seq); @@ -309,18 +308,18 @@ SampleIdentity TypeLookupManager::get_types( } ReturnCode_t TypeLookupManager::async_get_type( - eprosima::ProxyPool::smart_ptr& temp_writer_data, + eprosima::ProxyPool::smart_ptr& temp_writer_data, const AsyncGetTypeWriterCallback& callback) { - return check_type_identifier_received( + return check_type_identifier_received( temp_writer_data, callback, async_get_type_writer_callbacks_); } ReturnCode_t TypeLookupManager::async_get_type( - eprosima::ProxyPool::smart_ptr& temp_reader_data, + eprosima::ProxyPool::smart_ptr& temp_reader_data, const AsyncGetTypeReaderCallback& callback) { - return check_type_identifier_received( + return check_type_identifier_received( temp_reader_data, callback, async_get_type_reader_callbacks_); } @@ -334,10 +333,10 @@ ReturnCode_t TypeLookupManager::check_type_identifier_received( { xtypes::TypeIdentfierWithSize type_identifier_with_size = temp_proxy_data->type_information().type_information.complete().typeid_with_size(); - fastrtps::rtps::GUID_t type_server = temp_proxy_data->guid(); + fastdds::rtps::GUID_t type_server = temp_proxy_data->guid(); // Check if the type is known - if (fastrtps::rtps::RTPSDomainImpl::get_instance()->type_object_registry_observer(). + if (fastdds::rtps::RTPSDomainImpl::get_instance()->type_object_registry_observer(). is_type_identifier_known(type_identifier_with_size)) { // The type is already known, invoke the callback @@ -521,10 +520,10 @@ bool TypeLookupManager::create_endpoints() watt.endpoint.ignore_non_matching_locators = pattr.ignore_non_matching_locators; watt.endpoint.remoteLocatorList = builtin_protocols_->m_initialPeersList; watt.matched_readers_allocation = pattr.allocation.participants; - watt.endpoint.topicKind = fastrtps::rtps::NO_KEY; - watt.endpoint.reliabilityKind = fastrtps::rtps::RELIABLE; - watt.endpoint.durabilityKind = fastrtps::rtps::VOLATILE; - watt.mode = fastrtps::rtps::ASYNCHRONOUS_WRITER; + watt.endpoint.topicKind = fastdds::rtps::NO_KEY; + watt.endpoint.reliabilityKind = fastdds::rtps::RELIABLE; + watt.endpoint.durabilityKind = fastdds::rtps::VOLATILE; + watt.mode = fastdds::rtps::ASYNCHRONOUS_WRITER; ReaderAttributes ratt; ratt.endpoint.unicastLocatorList = builtin_protocols_->m_metatrafficUnicastLocatorList; @@ -534,9 +533,9 @@ bool TypeLookupManager::create_endpoints() ratt.endpoint.remoteLocatorList = builtin_protocols_->m_initialPeersList; ratt.matched_writers_allocation = pattr.allocation.participants; ratt.expects_inline_qos = true; - ratt.endpoint.topicKind = fastrtps::rtps::NO_KEY; - ratt.endpoint.reliabilityKind = fastrtps::rtps::RELIABLE; - ratt.endpoint.durabilityKind = fastrtps::rtps::VOLATILE; + ratt.endpoint.topicKind = fastdds::rtps::NO_KEY; + ratt.endpoint.reliabilityKind = fastdds::rtps::RELIABLE; + ratt.endpoint.durabilityKind = fastdds::rtps::VOLATILE; // Built-in request writer request_listener_ = new TypeLookupRequestListener(this); @@ -548,7 +547,7 @@ bool TypeLookupManager::create_endpoints() watt, builtin_request_writer_history_, request_listener_, - fastrtps::rtps::c_EntityId_TypeLookup_request_writer, + fastdds::rtps::c_EntityId_TypeLookup_request_writer, true)) { builtin_request_writer_ = dynamic_cast(req_writer); @@ -569,7 +568,7 @@ bool TypeLookupManager::create_endpoints() ratt, builtin_request_reader_history_, request_listener_, - fastrtps::rtps::c_EntityId_TypeLookup_request_reader, + fastdds::rtps::c_EntityId_TypeLookup_request_reader, true)) { builtin_request_reader_ = dynamic_cast(req_reader); @@ -591,7 +590,7 @@ bool TypeLookupManager::create_endpoints() watt, builtin_reply_writer_history_, reply_listener_, - fastrtps::rtps::c_EntityId_TypeLookup_reply_writer, + fastdds::rtps::c_EntityId_TypeLookup_reply_writer, true)) { builtin_reply_writer_ = dynamic_cast(rep_writer); @@ -612,7 +611,7 @@ bool TypeLookupManager::create_endpoints() ratt, builtin_reply_reader_history_, reply_listener_, - fastrtps::rtps::c_EntityId_TypeLookup_reply_reader, + fastdds::rtps::c_EntityId_TypeLookup_reply_reader, true)) { builtin_reply_reader_ = dynamic_cast(rep_reader); @@ -667,7 +666,7 @@ bool TypeLookupManager::create_endpoints() } TypeLookup_Request* TypeLookupManager::create_request( - const fastrtps::rtps::GUID_t& type_server, + const fastdds::rtps::GUID_t& type_server, TypeLookup_RequestPubSubType& pupsubtype) const { TypeLookup_Request* request = static_cast(pupsubtype.createData()); @@ -704,8 +703,8 @@ template bool TypeLookupManager::send_impl( Type& msg, PubSubType* pubsubtype, - fastrtps::rtps::StatefulWriter* writer, - fastrtps::rtps::WriterHistory* writer_history) const + fastdds::rtps::StatefulWriter* writer, + fastdds::rtps::WriterHistory* writer_history) const { // Create a new CacheChange_t using the provided StatefulWriter CacheChange_t* change = writer->new_change( @@ -751,7 +750,7 @@ bool TypeLookupManager::send_impl( } bool TypeLookupManager::prepare_receive_payload( - fastrtps::rtps::CacheChange_t& change, + fastdds::rtps::CacheChange_t& change, SerializedPayload_t& payload) const { CDRMessage_t msg(change.serializedPayload); @@ -764,7 +763,7 @@ bool TypeLookupManager::prepare_receive_payload( } bool TypeLookupManager::receive( - fastrtps::rtps::CacheChange_t& change, + fastdds::rtps::CacheChange_t& change, TypeLookup_Request& request) const { if (!receive_impl(change, request, &request_type_)) @@ -783,7 +782,7 @@ bool TypeLookupManager::receive( } bool TypeLookupManager::receive( - fastrtps::rtps::CacheChange_t& change, + fastdds::rtps::CacheChange_t& change, TypeLookup_Reply& reply) const { if (!receive_impl(change, reply, &reply_type_)) @@ -802,7 +801,7 @@ bool TypeLookupManager::receive( template bool TypeLookupManager::receive_impl( - fastrtps::rtps::CacheChange_t& change, + fastdds::rtps::CacheChange_t& change, Type& msg, PubSubType* pubsubtype) const { @@ -819,7 +818,7 @@ bool TypeLookupManager::receive_impl( } std::string TypeLookupManager::get_instance_name( - const fastrtps::rtps::GUID_t guid) const + const fastdds::rtps::GUID_t guid) const { std::stringstream ss; ss << std::hex; @@ -842,13 +841,13 @@ std::string TypeLookupManager::get_instance_name( } void TypeLookupManager::remove_builtin_request_writer_history_change( - fastrtps::rtps::CacheChange_t* change) + fastdds::rtps::CacheChange_t* change) { builtin_request_writer_history_->remove_change(change); } void TypeLookupManager::remove_builtin_reply_writer_history_change( - fastrtps::rtps::CacheChange_t* change) + fastdds::rtps::CacheChange_t* change) { builtin_reply_writer_history_->remove_change(change); } diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.hpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.hpp index fda0dd71f2a..981d796c018 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.hpp +++ b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.hpp @@ -84,7 +84,7 @@ struct hash } // std namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class BuiltinProtocols; @@ -96,18 +96,16 @@ class ParticipantProxyData; class WriterHistory; } // namespace rtps -} // namespace fastrtps -namespace fastdds { namespace dds { namespace builtin { const SampleIdentity INVALID_SAMPLE_IDENTITY; using AsyncGetTypeWriterCallback = std::function< - void (eprosima::fastrtps::rtps::WriterProxyData*)>; + void (eprosima::fastdds::rtps::WriterProxyData*)>; using AsyncGetTypeReaderCallback = std::function< - void (eprosima::fastrtps::rtps::ReaderProxyData*)>; + void (eprosima::fastdds::rtps::ReaderProxyData*)>; /** * Class TypeLookupManager that implements the TypeLookup Service described in the DDS-XTYPES 1.3 specification. @@ -136,21 +134,21 @@ class TypeLookupManager * @return true if members and endpoints are created, false otherwise. */ bool init( - fastrtps::rtps::BuiltinProtocols* protocols); + fastdds::rtps::BuiltinProtocols* protocols); /** * Assign the remote endpoints for a newly discovered RTPSParticipant. * @param pdata Pointer to the RTPSParticipantProxyData object. * @return True if correct. */ bool assign_remote_endpoints( - const fastrtps::rtps::ParticipantProxyData& pdata); + const fastdds::rtps::ParticipantProxyData& pdata); /** * Remove remote endpoints from the typelookup service. * @param pdata Pointer to the ParticipantProxyData to remove. */ void remove_remote_endpoints( - fastrtps::rtps::ParticipantProxyData* pdata); + fastdds::rtps::ParticipantProxyData* pdata); /** * Create and send a request using the builtin TypeLookup Service to retrieve all the type dependencies @@ -162,7 +160,7 @@ class TypeLookupManager */ SampleIdentity get_type_dependencies( const xtypes::TypeIdentifierSeq& id_seq, - const fastrtps::rtps::GUID_t& type_server, + const fastdds::rtps::GUID_t& type_server, const std::vector& continuation_point = std::vector()) const; /** @@ -174,7 +172,7 @@ class TypeLookupManager */ SampleIdentity get_types( const xtypes::TypeIdentifierSeq& id_seq, - const fastrtps::rtps::GUID_t& type_server) const; + const fastdds::rtps::GUID_t& type_server) const; /** * Use builtin TypeLookup service to solve the type and dependencies of a given TypeInformation. @@ -186,10 +184,10 @@ class TypeLookupManager * RETCODE_ERROR if any request was not sent correctly. */ ReturnCode_t async_get_type( - eprosima::ProxyPool::smart_ptr& temp_proxy_data, + eprosima::ProxyPool::smart_ptr& temp_proxy_data, const AsyncGetTypeWriterCallback& callback); ReturnCode_t async_get_type( - eprosima::ProxyPool::smart_ptr& temp_proxy_data, + eprosima::ProxyPool::smart_ptr& temp_proxy_data, const AsyncGetTypeReaderCallback& callback); protected: @@ -255,7 +253,7 @@ class TypeLookupManager * @return the TypeLookup_Request created. */ TypeLookup_Request* create_request( - const fastrtps::rtps::GUID_t& type_server, + const fastdds::rtps::GUID_t& type_server, TypeLookup_RequestPubSubType& pupsubtype) const; /** @@ -286,8 +284,8 @@ class TypeLookupManager bool send_impl( Type& msg, PubSubType* pubsubtype, - fastrtps::rtps::StatefulWriter* writer, - fastrtps::rtps::WriterHistory* writer_history) const; + fastdds::rtps::StatefulWriter* writer, + fastdds::rtps::WriterHistory* writer_history) const; /** * Prepares the received payload of a CacheChange before deserializing. @@ -296,8 +294,8 @@ class TypeLookupManager * @return true if received payload is prepared, false otherwise. */ bool prepare_receive_payload( - fastrtps::rtps::CacheChange_t& change, - fastrtps::rtps::SerializedPayload_t& payload) const; + fastdds::rtps::CacheChange_t& change, + fastdds::rtps::SerializedPayload_t& payload) const; /** * Uses the receive_impl with the appropriate parameters and checks if it is directed to the local DomainParticipant. @@ -306,7 +304,7 @@ class TypeLookupManager * @return true if the request is deserialized and directed to the local participant, false otherwise. */ bool receive( - fastrtps::rtps::CacheChange_t& change, + fastdds::rtps::CacheChange_t& change, TypeLookup_Request& request) const; /** @@ -316,7 +314,7 @@ class TypeLookupManager * @return true if the request is deserialized and the reply's recipient is us, false otherwise. */ bool receive( - fastrtps::rtps::CacheChange_t& change, + fastdds::rtps::CacheChange_t& change, TypeLookup_Reply& reply) const; /** @@ -329,7 +327,7 @@ class TypeLookupManager */ template bool receive_impl( - fastrtps::rtps::CacheChange_t& change, + fastdds::rtps::CacheChange_t& change, Type& msg, PubSubType* pubsubtype) const; @@ -337,7 +335,7 @@ class TypeLookupManager * Get the RTPS participant * @return RTPS participant */ - inline fastrtps::rtps::RTPSParticipantImpl* get_RTPS_participant() + inline fastdds::rtps::RTPSParticipantImpl* get_RTPS_participant() { return participant_; } @@ -348,7 +346,7 @@ class TypeLookupManager * @return The instance name. */ std::string get_instance_name( - const fastrtps::rtps::GUID_t guid) const; + const fastdds::rtps::GUID_t guid) const; /** * Create the builtin endpoints used in the TypeLookupManager. @@ -361,47 +359,47 @@ class TypeLookupManager * @param change[in] CacheChange_t to be removed. */ void remove_builtin_request_writer_history_change( - fastrtps::rtps::CacheChange_t* change); + fastdds::rtps::CacheChange_t* change); /** * Removes a change from the builtin_reply_writer_history_. * @param change[in] CacheChange_t to be removed. */ void remove_builtin_reply_writer_history_change( - fastrtps::rtps::CacheChange_t* change); + fastdds::rtps::CacheChange_t* change); //! Pointer to the local RTPSParticipant. - fastrtps::rtps::RTPSParticipantImpl* participant_ = nullptr; + fastdds::rtps::RTPSParticipantImpl* participant_ = nullptr; //! Own instance name. std::string local_instance_name_; //! Pointer to the BuiltinProtocols class. - fastrtps::rtps::BuiltinProtocols* builtin_protocols_ = nullptr; + fastdds::rtps::BuiltinProtocols* builtin_protocols_ = nullptr; //! Pointer to the RTPSWriter for the TypeLookup_Request. - fastrtps::rtps::StatefulWriter* builtin_request_writer_ = nullptr; + fastdds::rtps::StatefulWriter* builtin_request_writer_ = nullptr; //! Pointer to the RTPSReader for the TypeLookup_Request. - fastrtps::rtps::StatefulReader* builtin_request_reader_ = nullptr; + fastdds::rtps::StatefulReader* builtin_request_reader_ = nullptr; //! Pointer to the RTPSWriter for the TypeLookup_Reply. - fastrtps::rtps::StatefulWriter* builtin_reply_writer_ = nullptr; + fastdds::rtps::StatefulWriter* builtin_reply_writer_ = nullptr; //! Pointer to the RTPSReader for the TypeLookup_Reply. - fastrtps::rtps::StatefulReader* builtin_reply_reader_ = nullptr; + fastdds::rtps::StatefulReader* builtin_reply_reader_ = nullptr; //! Pointer to the Writer History of TypeLookup_Request. - fastrtps::rtps::WriterHistory* builtin_request_writer_history_ = nullptr; + fastdds::rtps::WriterHistory* builtin_request_writer_history_ = nullptr; //! Pointer to the Writer History of TypeLookup_Reply. - fastrtps::rtps::WriterHistory* builtin_reply_writer_history_ = nullptr; + fastdds::rtps::WriterHistory* builtin_reply_writer_history_ = nullptr; //! Pointer to the Reader History of TypeLookup_Request. - fastrtps::rtps::ReaderHistory* builtin_request_reader_history_ = nullptr; + fastdds::rtps::ReaderHistory* builtin_request_reader_history_ = nullptr; //! Pointer to the Reader History of TypeLookup_Reply. - fastrtps::rtps::ReaderHistory* builtin_reply_reader_history_ = nullptr; + fastdds::rtps::ReaderHistory* builtin_reply_reader_history_ = nullptr; //! Request Listener object. TypeLookupRequestListener* request_listener_ = nullptr; @@ -413,12 +411,12 @@ class TypeLookupManager std::mutex temp_data_lock_; //! Pointer to the temp ReaderProxyData used for assigments. - fastrtps::rtps::ReaderProxyData* temp_reader_proxy_data_ = nullptr; + fastdds::rtps::ReaderProxyData* temp_reader_proxy_data_ = nullptr; //! Pointer to the temp WriterProxyData used for assigments. - fastrtps::rtps::WriterProxyData* temp_writer_proxy_data_ = nullptr; + fastdds::rtps::WriterProxyData* temp_writer_proxy_data_ = nullptr; - mutable fastrtps::rtps::SequenceNumber_t request_seq_number_; + mutable fastdds::rtps::SequenceNumber_t request_seq_number_; mutable TypeLookup_RequestPubSubType request_type_; mutable TypeLookup_ReplyPubSubType reply_type_; @@ -427,12 +425,12 @@ class TypeLookupManager //! Collection of all the WriterProxyData and their callbacks related to a TypeIdentfierWithSize, hashed by its TypeIdentfierWithSize. std::unordered_map < xtypes::TypeIdentfierWithSize, - std::vector>> async_get_type_writer_callbacks_; //! Collection of all the ReaderProxyData and their callbacks related to a TypeIdentfierWithSize, hashed by its TypeIdentfierWithSize. std::unordered_map < xtypes::TypeIdentfierWithSize, - std::vector>> async_get_type_reader_callbacks_; //! Collection of all SampleIdentity and the TypeIdentfierWithSize it originated from, hashed by its SampleIdentity. diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupReplyListener.cpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupReplyListener.cpp index b4005172a74..9ec0a9c104e 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupReplyListener.cpp +++ b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupReplyListener.cpp @@ -25,10 +25,9 @@ #include #include -using eprosima::fastrtps::rtps::RTPSReader; -using eprosima::fastrtps::rtps::CacheChange_t; -using eprosima::fastdds::dds::Log; -using eprosima::fastrtps::rtps::c_EntityId_TypeLookup_reply_writer; +using eprosima::fastdds::rtps::RTPSReader; +using eprosima::fastdds::rtps::CacheChange_t; +using eprosima::fastdds::rtps::c_EntityId_TypeLookup_reply_writer; namespace eprosima { namespace fastdds { @@ -146,7 +145,7 @@ void TypeLookupReplyListener::check_get_types_reply( { xtypes::TypeIdentifierPair type_ids; type_ids.type_identifier1(pair.type_identifier()); - if (RETCODE_OK != fastrtps::rtps::RTPSDomainImpl::get_instance()->type_object_registry_observer(). + if (RETCODE_OK != fastdds::rtps::RTPSDomainImpl::get_instance()->type_object_registry_observer(). register_type_object(pair.type_object(), type_ids, false)) { // If any of the types is not registered, log error @@ -173,7 +172,7 @@ void TypeLookupReplyListener::check_get_types_reply( try { xtypes::TypeObject type_object; - fastrtps::rtps::RTPSDomainImpl::get_instance()->type_object_registry_observer().get_type_object( + fastdds::rtps::RTPSDomainImpl::get_instance()->type_object_registry_observer().get_type_object( requests_it->second.type_id(), type_object); xtypes::TypeObjectUtils::type_object_consistency(type_object); @@ -194,7 +193,7 @@ void TypeLookupReplyListener::check_get_types_reply( void TypeLookupReplyListener::check_get_type_dependencies_reply( const SampleIdentity& request_id, - const fastrtps::rtps::GUID_t type_server, + const fastdds::rtps::GUID_t type_server, const TypeLookup_getTypeDependencies_Out& reply) { // Check if the received reply SampleIdentity corresponds to an outstanding request @@ -212,7 +211,7 @@ void TypeLookupReplyListener::check_get_type_dependencies_reply( for (xtypes::TypeIdentfierWithSize type : reply.dependent_typeids()) { // Check if the type is known - if (!fastrtps::rtps::RTPSDomainImpl::get_instance()->type_object_registry_observer(). + if (!fastdds::rtps::RTPSDomainImpl::get_instance()->type_object_registry_observer(). is_type_identifier_known(type)) { // Insert the type into the unordered_set and check if the insertion was successful @@ -316,8 +315,8 @@ void TypeLookupReplyListener::on_new_cache_change_added( } void TypeLookupReplyListener::onWriterChangeReceivedByAll( - fastrtps::rtps::RTPSWriter*, - fastrtps::rtps::CacheChange_t* change) + fastdds::rtps::RTPSWriter*, + fastdds::rtps::CacheChange_t* change) { typelookup_manager_->remove_builtin_reply_writer_history_change(change); } diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupReplyListener.hpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupReplyListener.hpp index 8ce5813232d..7ff65fad1b8 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupReplyListener.hpp +++ b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupReplyListener.hpp @@ -35,16 +35,14 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSReader; struct CacheChange_t; } // namespace rtps -} // namespace fastrtp -namespace fastdds { namespace dds { namespace builtin { @@ -53,14 +51,14 @@ class TypeLookupManager; struct ReplyWithServerGUID { TypeLookup_Reply reply; - fastrtps::rtps::GUID_t type_server; + fastdds::rtps::GUID_t type_server; }; /** * Class TypeLookupReplyListener that receives the typelookup request messages of remote endpoints. * @ingroup TYPES_MODULE */ -class TypeLookupReplyListener : public fastrtps::rtps::ReaderListener, public fastrtps::rtps::WriterListener +class TypeLookupReplyListener : public fastdds::rtps::ReaderListener, public fastdds::rtps::WriterListener { public: @@ -116,7 +114,7 @@ class TypeLookupReplyListener : public fastrtps::rtps::ReaderListener, public fa */ void check_get_type_dependencies_reply( const SampleIdentity& request_id, - const fastrtps::rtps::GUID_t type_server, + const fastdds::rtps::GUID_t type_server, const TypeLookup_getTypeDependencies_Out& reply); /** @@ -125,12 +123,12 @@ class TypeLookupReplyListener : public fastrtps::rtps::ReaderListener, public fa * @param change The cache change. */ void on_new_cache_change_added( - fastrtps::rtps::RTPSReader* reader, - const fastrtps::rtps::CacheChange_t* const change) override; + fastdds::rtps::RTPSReader* reader, + const fastdds::rtps::CacheChange_t* const change) override; void onWriterChangeReceivedByAll( - fastrtps::rtps::RTPSWriter*, - fastrtps::rtps::CacheChange_t* change) override; + fastdds::rtps::RTPSWriter*, + fastdds::rtps::CacheChange_t* change) override; //! A pointer to the typelookup manager. TypeLookupManager* typelookup_manager_; diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.cpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.cpp index dd7251f8f90..139fd1c0cc7 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.cpp +++ b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.cpp @@ -26,11 +26,11 @@ #include #include -using eprosima::fastrtps::rtps::RTPSReader; -using eprosima::fastrtps::rtps::CacheChange_t; +using eprosima::fastdds::rtps::RTPSReader; +using eprosima::fastdds::rtps::CacheChange_t; using eprosima::fastdds::dds::Log; -using eprosima::fastrtps::rtps::c_EntityId_TypeLookup_request_writer; +using eprosima::fastdds::rtps::c_EntityId_TypeLookup_request_writer; namespace eprosima { namespace fastdds { @@ -202,7 +202,7 @@ void TypeLookupRequestListener::check_get_types_request( { minimal_id = type_id; // Get complete TypeIdentifier from registry - complete_id = fastrtps::rtps::RTPSDomainImpl::get_instance()->type_object_registry_observer(). + complete_id = fastdds::rtps::RTPSDomainImpl::get_instance()->type_object_registry_observer(). get_complementary_type_identifier(minimal_id); xtypes::TypeIdentifierPair id_pair; @@ -216,7 +216,7 @@ void TypeLookupRequestListener::check_get_types_request( complete_id = type_id; } - type_result = fastrtps::rtps::RTPSDomainImpl::get_instance()->type_object_registry_observer(). + type_result = fastdds::rtps::RTPSDomainImpl::get_instance()->type_object_registry_observer(). get_type_object(complete_id, obj); if (RETCODE_OK != type_result) { @@ -284,7 +284,7 @@ void TypeLookupRequestListener::check_get_type_dependencies_request( { // Get the dependencies from the registry type_dependencies_result = - fastrtps::rtps::RTPSDomainImpl::get_instance()->type_object_registry_observer(). + fastdds::rtps::RTPSDomainImpl::get_instance()->type_object_registry_observer(). get_type_dependencies(request.type_ids(), type_dependencies); // If there are too many dependent types, store the type dependencies for future requests @@ -449,8 +449,8 @@ void TypeLookupRequestListener::on_new_cache_change_added( } void TypeLookupRequestListener::onWriterChangeReceivedByAll( - fastrtps::rtps::RTPSWriter*, - fastrtps::rtps::CacheChange_t* change) + fastdds::rtps::RTPSWriter*, + fastdds::rtps::CacheChange_t* change) { typelookup_manager_->remove_builtin_request_writer_history_change(change); } diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.hpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.hpp index ccc87753a7d..a635da2be0b 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.hpp +++ b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.hpp @@ -57,16 +57,14 @@ struct hash } // std namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSReader; struct CacheChange_t; } // namespace rtps -} // namespace fastrtp -namespace fastdds { namespace dds { namespace builtin { @@ -76,7 +74,7 @@ class TypeLookupManager; * Class TypeLookupRequestListener that receives the typelookup request messages of remote endpoints. * @ingroup TYPES_MODULE */ -class TypeLookupRequestListener : public fastrtps::rtps::ReaderListener, public fastrtps::rtps::WriterListener +class TypeLookupRequestListener : public fastdds::rtps::ReaderListener, public fastdds::rtps::WriterListener { public: @@ -163,12 +161,12 @@ class TypeLookupRequestListener : public fastrtps::rtps::ReaderListener, public * @param change The cache change. */ void on_new_cache_change_added( - fastrtps::rtps::RTPSReader* reader, - const fastrtps::rtps::CacheChange_t* const change) override; + fastdds::rtps::RTPSReader* reader, + const fastdds::rtps::CacheChange_t* const change) override; void onWriterChangeReceivedByAll( - fastrtps::rtps::RTPSWriter*, - fastrtps::rtps::CacheChange_t* change) override; + fastdds::rtps::RTPSWriter*, + fastdds::rtps::CacheChange_t* change) override; //! A pointer to the typelookup manager. TypeLookupManager* typelookup_manager_; diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.cxx b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.cxx index e46bb9c1207..9facecc289e 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.cxx +++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.cxx @@ -25,8 +25,8 @@ #include #include "TypeLookupTypesCdrAux.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; namespace eprosima { diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.h b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.h index 53a673eab0e..2ce00bc62ab 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.h +++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.h @@ -66,18 +66,18 @@ namespace builtin eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -92,7 +92,7 @@ namespace builtin eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -157,18 +157,18 @@ namespace builtin eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -183,7 +183,7 @@ namespace builtin eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -249,18 +249,18 @@ namespace builtin eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -275,7 +275,7 @@ namespace builtin eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -340,18 +340,18 @@ namespace builtin eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -366,7 +366,7 @@ namespace builtin eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -433,18 +433,18 @@ namespace builtin eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -459,7 +459,7 @@ namespace builtin eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -525,18 +525,18 @@ namespace builtin eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -551,7 +551,7 @@ namespace builtin eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.cxx b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.cxx index 1e220b26b9d..0e633637841 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.cxx +++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.cxx @@ -25,8 +25,8 @@ #include #include "rpc_typesCdrAux.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; namespace eprosima { diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.h b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.h index 640cb6a7bfd..b1ce95e983c 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.h +++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.h @@ -62,18 +62,18 @@ class EntityId_tPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -88,7 +88,7 @@ class EntityId_tPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -153,18 +153,18 @@ class GUID_tPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -179,7 +179,7 @@ class GUID_tPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -244,18 +244,18 @@ class SequenceNumber_tPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -270,7 +270,7 @@ class SequenceNumber_tPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -335,18 +335,18 @@ class SampleIdentityPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -361,7 +361,7 @@ class SampleIdentityPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -433,18 +433,18 @@ namespace rpc eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -459,7 +459,7 @@ namespace rpc eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -524,18 +524,18 @@ namespace rpc eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -550,7 +550,7 @@ namespace rpc eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/src/cpp/fastdds/core/condition/WaitSet.cpp b/src/cpp/fastdds/core/condition/WaitSet.cpp index 16b755eaeef..c182317f9f2 100644 --- a/src/cpp/fastdds/core/condition/WaitSet.cpp +++ b/src/cpp/fastdds/core/condition/WaitSet.cpp @@ -48,7 +48,7 @@ ReturnCode_t WaitSet::detach_condition( ReturnCode_t WaitSet::wait( ConditionSeq& active_conditions, - const fastrtps::Duration_t timeout) const + const fastdds::Duration_t timeout) const { return impl_->wait(active_conditions, timeout); } diff --git a/src/cpp/fastdds/core/condition/WaitSetImpl.cpp b/src/cpp/fastdds/core/condition/WaitSetImpl.cpp index 5c4e43600a7..9535fc10994 100644 --- a/src/cpp/fastdds/core/condition/WaitSetImpl.cpp +++ b/src/cpp/fastdds/core/condition/WaitSetImpl.cpp @@ -106,7 +106,7 @@ ReturnCode_t WaitSetImpl::detach_condition( ReturnCode_t WaitSetImpl::wait( ConditionSeq& active_conditions, - const fastrtps::Duration_t& timeout) + const fastdds::Duration_t& timeout) { std::unique_lock lock(mutex_); @@ -132,7 +132,7 @@ ReturnCode_t WaitSetImpl::wait( bool condition_value = false; is_waiting_ = true; - if (fastrtps::c_TimeInfinite == timeout) + if (fastdds::c_TimeInfinite == timeout) { cond_.wait(lock, fill_active_conditions); condition_value = true; diff --git a/src/cpp/fastdds/core/condition/WaitSetImpl.hpp b/src/cpp/fastdds/core/condition/WaitSetImpl.hpp index 93374d17aac..1120d765569 100644 --- a/src/cpp/fastdds/core/condition/WaitSetImpl.hpp +++ b/src/cpp/fastdds/core/condition/WaitSetImpl.hpp @@ -83,7 +83,7 @@ struct WaitSetImpl */ ReturnCode_t wait( ConditionSeq& active_conditions, - const fastrtps::Duration_t& timeout); + const fastdds::Duration_t& timeout); /** * @brief Retrieve the list of attached conditions diff --git a/src/cpp/fastdds/core/policy/ParameterList.cpp b/src/cpp/fastdds/core/policy/ParameterList.cpp index 8090868f2d6..5d71916bbbc 100644 --- a/src/cpp/fastdds/core/policy/ParameterList.cpp +++ b/src/cpp/fastdds/core/policy/ParameterList.cpp @@ -31,21 +31,21 @@ namespace dds { bool ParameterList::writeEncapsulationToCDRMsg( - fastrtps::rtps::CDRMessage_t* msg) + rtps::CDRMessage_t* msg) { - bool valid = fastrtps::rtps::CDRMessage::addOctet(msg, 0); - valid &= fastrtps::rtps::CDRMessage::addOctet(msg, static_cast(PL_CDR_LE - msg->msg_endian)); - valid &= fastrtps::rtps::CDRMessage::addUInt16(msg, 0); + bool valid = rtps::CDRMessage::addOctet(msg, 0); + valid &= rtps::CDRMessage::addOctet(msg, static_cast(PL_CDR_LE - msg->msg_endian)); + valid &= rtps::CDRMessage::addUInt16(msg, 0); return valid; } bool ParameterList::updateCacheChangeFromInlineQos( - fastrtps::rtps::CacheChange_t& change, - fastrtps::rtps::CDRMessage_t* msg, + rtps::CacheChange_t& change, + rtps::CDRMessage_t* msg, uint32_t& qos_size) { auto parameter_process = [&]( - fastrtps::rtps::CDRMessage_t* msg, + rtps::CDRMessage_t* msg, const ParameterId_t pid, uint16_t plength) { @@ -54,7 +54,7 @@ bool ParameterList::updateCacheChangeFromInlineQos( case PID_KEY_HASH: { ParameterKey_t p(pid, plength); - if (!fastdds::dds::ParameterSerializer::read_from_cdr_message(p, msg, plength)) + if (!dds::ParameterSerializer::read_from_cdr_message(p, msg, plength)) { return false; } @@ -81,7 +81,7 @@ bool ParameterList::updateCacheChangeFromInlineQos( if (plength >= 24) { ParameterSampleIdentity_t p(pid, plength); - if (!fastdds::dds::ParameterSerializer::read_from_cdr_message(p, + if (!dds::ParameterSerializer::read_from_cdr_message(p, msg, plength)) { return false; @@ -102,7 +102,7 @@ bool ParameterList::updateCacheChangeFromInlineQos( case PID_STATUS_INFO: { ParameterStatusInfo_t p(pid, plength); - if (!fastdds::dds::ParameterSerializer::read_from_cdr_message(p, msg, + if (!dds::ParameterSerializer::read_from_cdr_message(p, msg, plength)) { return false; @@ -110,15 +110,15 @@ bool ParameterList::updateCacheChangeFromInlineQos( if (p.status == 1) { - change.kind = fastrtps::rtps::ChangeKind_t::NOT_ALIVE_DISPOSED; + change.kind = rtps::ChangeKind_t::NOT_ALIVE_DISPOSED; } else if (p.status == 2) { - change.kind = fastrtps::rtps::ChangeKind_t::NOT_ALIVE_UNREGISTERED; + change.kind = rtps::ChangeKind_t::NOT_ALIVE_UNREGISTERED; } else if (p.status == 3) { - change.kind = fastrtps::rtps::ChangeKind_t::NOT_ALIVE_DISPOSED_UNREGISTERED; + change.kind = rtps::ChangeKind_t::NOT_ALIVE_DISPOSED_UNREGISTERED; } break; } @@ -134,9 +134,9 @@ bool ParameterList::updateCacheChangeFromInlineQos( } bool ParameterList::read_guid_from_cdr_msg( - fastrtps::rtps::CDRMessage_t& msg, + rtps::CDRMessage_t& msg, uint16_t search_pid, - fastrtps::rtps::GUID_t& guid) + rtps::GUID_t& guid) { bool valid = false; uint16_t pid = 0; @@ -144,17 +144,17 @@ bool ParameterList::read_guid_from_cdr_msg( while (msg.pos < msg.length) { valid = true; - valid &= fastrtps::rtps::CDRMessage::readUInt16(&msg, &pid); - valid &= fastrtps::rtps::CDRMessage::readUInt16(&msg, &plength); + valid &= rtps::CDRMessage::readUInt16(&msg, &pid); + valid &= rtps::CDRMessage::readUInt16(&msg, &plength); if (!valid || (pid == PID_SENTINEL)) { break; } if (pid == search_pid) { - valid &= fastrtps::rtps::CDRMessage::readData(&msg, guid.guidPrefix.value, - fastrtps::rtps::GuidPrefix_t::size); - valid &= fastrtps::rtps::CDRMessage::readData(&msg, guid.entityId.value, fastrtps::rtps::EntityId_t::size); + valid &= rtps::CDRMessage::readData(&msg, guid.guidPrefix.value, + rtps::GuidPrefix_t::size); + valid &= rtps::CDRMessage::readData(&msg, guid.entityId.value, rtps::EntityId_t::size); return valid; } msg.pos += (plength + 3) & ~3; @@ -163,7 +163,7 @@ bool ParameterList::read_guid_from_cdr_msg( } bool ParameterList::readInstanceHandleFromCDRMsg( - fastrtps::rtps::CacheChange_t* change, + rtps::CacheChange_t* change, const uint16_t search_pid) { assert(change != nullptr); @@ -175,19 +175,19 @@ bool ParameterList::readInstanceHandleFromCDRMsg( } // Use a temporary wraping message - fastrtps::rtps::CDRMessage_t msg(change->serializedPayload); + rtps::CDRMessage_t msg(change->serializedPayload); // Read encapsulation msg.pos += 1; - fastrtps::rtps::octet encapsulation = 0; - fastrtps::rtps::CDRMessage::readOctet(&msg, &encapsulation); + rtps::octet encapsulation = 0; + rtps::CDRMessage::readOctet(&msg, &encapsulation); if (encapsulation == PL_CDR_BE) { - msg.msg_endian = fastrtps::rtps::Endianness_t::BIGEND; + msg.msg_endian = rtps::Endianness_t::BIGEND; } else if (encapsulation == PL_CDR_LE) { - msg.msg_endian = fastrtps::rtps::Endianness_t::LITTLEEND; + msg.msg_endian = rtps::Endianness_t::LITTLEEND; } else { @@ -205,20 +205,20 @@ bool ParameterList::readInstanceHandleFromCDRMsg( while (msg.pos < msg.length) { valid = true; - valid &= fastrtps::rtps::CDRMessage::readUInt16(&msg, (uint16_t*)&pid); - valid &= fastrtps::rtps::CDRMessage::readUInt16(&msg, &plength); + valid &= rtps::CDRMessage::readUInt16(&msg, (uint16_t*)&pid); + valid &= rtps::CDRMessage::readUInt16(&msg, &plength); if ((pid == PID_SENTINEL) || !valid) { break; } if (pid == PID_KEY_HASH) { - valid &= fastrtps::rtps::CDRMessage::readData(&msg, change->instanceHandle.value, 16); + valid &= rtps::CDRMessage::readData(&msg, change->instanceHandle.value, 16); return valid; } if (pid == search_pid) { - valid &= fastrtps::rtps::CDRMessage::readData(&msg, change->instanceHandle.value, 16); + valid &= rtps::CDRMessage::readData(&msg, change->instanceHandle.value, 16); return valid; } msg.pos += (plength + 3) & ~3; diff --git a/src/cpp/fastdds/core/policy/ParameterList.hpp b/src/cpp/fastdds/core/policy/ParameterList.hpp index c42f78746d5..aa8934538c5 100644 --- a/src/cpp/fastdds/core/policy/ParameterList.hpp +++ b/src/cpp/fastdds/core/policy/ParameterList.hpp @@ -47,7 +47,7 @@ class ParameterList * @return True if correct. */ static bool writeEncapsulationToCDRMsg( - fastrtps::rtps::CDRMessage_t* msg); + rtps::CDRMessage_t* msg); /** * Update the information of a cache change parsing the inline qos from a CDRMessage @@ -57,8 +57,8 @@ class ParameterList * @return true if parsing was correct, false otherwise. */ static bool updateCacheChangeFromInlineQos( - fastrtps::rtps::CacheChange_t& change, - fastrtps::rtps::CDRMessage_t* msg, + rtps::CacheChange_t& change, + rtps::CDRMessage_t* msg, uint32_t& qos_size); /** @@ -71,7 +71,7 @@ class ParameterList */ template static bool readParameterListfromCDRMsg( - fastrtps::rtps::CDRMessage_t& msg, + rtps::CDRMessage_t& msg, Pred processor, bool use_encapsulation, uint32_t& qos_size) @@ -82,15 +82,15 @@ class ParameterList { // Read encapsulation msg.pos += 1; - fastrtps::rtps::octet encapsulation = 0; - fastrtps::rtps::CDRMessage::readOctet(&msg, &encapsulation); + rtps::octet encapsulation = 0; + rtps::CDRMessage::readOctet(&msg, &encapsulation); if (encapsulation == PL_CDR_BE) { - msg.msg_endian = fastrtps::rtps::Endianness_t::BIGEND; + msg.msg_endian = rtps::Endianness_t::BIGEND; } else if (encapsulation == PL_CDR_LE) { - msg.msg_endian = fastrtps::rtps::Endianness_t::LITTLEEND; + msg.msg_endian = rtps::Endianness_t::LITTLEEND; } else { @@ -109,8 +109,8 @@ class ParameterList ParameterId_t pid{PID_SENTINEL}; uint16_t plength = 0; bool valid = true; - valid &= fastrtps::rtps::CDRMessage::readUInt16(&msg, (uint16_t*)&pid); - valid &= fastrtps::rtps::CDRMessage::readUInt16(&msg, &plength); + valid &= rtps::CDRMessage::readUInt16(&msg, (uint16_t*)&pid); + valid &= rtps::CDRMessage::readUInt16(&msg, &plength); if (pid == PID_SENTINEL) { @@ -147,9 +147,9 @@ class ParameterList * @return true if a guid is returned, false otherwise. */ static bool read_guid_from_cdr_msg( - fastrtps::rtps::CDRMessage_t& msg, + rtps::CDRMessage_t& msg, uint16_t search_pid, - fastrtps::rtps::GUID_t& guid); + rtps::GUID_t& guid); /** * Read change instanceHandle from the KEY_HASH or another specific PID parameter of a CDRMessage @@ -158,7 +158,7 @@ class ParameterList * @return True when instanceHandle is updated. */ static bool readInstanceHandleFromCDRMsg( - fastrtps::rtps::CacheChange_t* change, + rtps::CacheChange_t* change, const uint16_t search_pid); }; diff --git a/src/cpp/fastdds/core/policy/ParameterSerializer.hpp b/src/cpp/fastdds/core/policy/ParameterSerializer.hpp index 6d9cff6e72a..34e7d58d5c2 100644 --- a/src/cpp/fastdds/core/policy/ParameterSerializer.hpp +++ b/src/cpp/fastdds/core/policy/ParameterSerializer.hpp @@ -37,16 +37,16 @@ class ParameterSerializer static inline bool add_common_to_cdr_message( const Parameter& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addUInt16(cdr_message, parameter.Pid); - valid &= fastrtps::rtps::CDRMessage::addUInt16(cdr_message, parameter.length); + bool valid = rtps::CDRMessage::addUInt16(cdr_message, parameter.Pid); + valid &= rtps::CDRMessage::addUInt16(cdr_message, parameter.length); return valid; } static bool add_to_cdr_message( const Parameter& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { bool valid = add_common_to_cdr_message(parameter, cdr_message); valid &= add_content_to_cdr_message(parameter, cdr_message); @@ -55,7 +55,7 @@ class ParameterSerializer static bool read_from_cdr_message( Parameter& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { bool valid = true; @@ -73,7 +73,7 @@ class ParameterSerializer static bool add_content_to_cdr_message( const Parameter&, - fastrtps::rtps::CDRMessage_t*) + rtps::CDRMessage_t*) { static_assert(sizeof(Parameter) == 0, "Not implemented"); return false; @@ -81,7 +81,7 @@ class ParameterSerializer static bool read_content_from_cdr_message( Parameter&, - fastrtps::rtps::CDRMessage_t*, + rtps::CDRMessage_t*, const uint16_t) { static_assert(sizeof(Parameter) == 0, "Not implemented"); @@ -101,45 +101,45 @@ class ParameterSerializer static constexpr uint32_t PARAMETER_SAMPLE_IDENTITY_SIZE = 28u; static bool add_parameter_status( - fastrtps::rtps::CDRMessage_t* cdr_message, - fastrtps::rtps::octet status) + rtps::CDRMessage_t* cdr_message, + rtps::octet status) { if (cdr_message->pos + 8 >= cdr_message->max_size) { return false; } - fastrtps::rtps::CDRMessage::addUInt16(cdr_message, fastdds::dds::PID_STATUS_INFO); - fastrtps::rtps::CDRMessage::addUInt16(cdr_message, 4); - fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); - fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); - fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); - fastrtps::rtps::CDRMessage::addOctet(cdr_message, status); + rtps::CDRMessage::addUInt16(cdr_message, dds::PID_STATUS_INFO); + rtps::CDRMessage::addUInt16(cdr_message, 4); + rtps::CDRMessage::addOctet(cdr_message, 0); + rtps::CDRMessage::addOctet(cdr_message, 0); + rtps::CDRMessage::addOctet(cdr_message, 0); + rtps::CDRMessage::addOctet(cdr_message, status); return true; } static bool add_parameter_key( - fastrtps::rtps::CDRMessage_t* cdr_message, - const fastrtps::rtps::InstanceHandle_t& iHandle) + rtps::CDRMessage_t* cdr_message, + const rtps::InstanceHandle_t& iHandle) { if (cdr_message->pos + 20 >= cdr_message->max_size) { return false; } - fastrtps::rtps::CDRMessage::addUInt16(cdr_message, fastdds::dds::PID_KEY_HASH); - fastrtps::rtps::CDRMessage::addUInt16(cdr_message, 16); - fastrtps::rtps::CDRMessage::addData(cdr_message, iHandle.value, 16); + rtps::CDRMessage::addUInt16(cdr_message, dds::PID_KEY_HASH); + rtps::CDRMessage::addUInt16(cdr_message, 16); + rtps::CDRMessage::addData(cdr_message, iHandle.value, 16); return true; } static bool add_parameter_sentinel( - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { if (cdr_message->pos + 4 > cdr_message->max_size) { return false; } - fastrtps::rtps::CDRMessage::addUInt16(cdr_message, static_cast(fastdds::dds::PID_SENTINEL)); - fastrtps::rtps::CDRMessage::addUInt16(cdr_message, 0); + rtps::CDRMessage::addUInt16(cdr_message, static_cast(dds::PID_SENTINEL)); + rtps::CDRMessage::addUInt16(cdr_message, 0); return true; } @@ -152,22 +152,22 @@ class ParameterSerializer * @return true if operation is successful, false if the operation would overflow the maximum size of the message. */ static bool add_parameter_sample_identity( - fastrtps::rtps::CDRMessage_t* cdr_message, - const fastrtps::rtps::SampleIdentity& sample_id) + rtps::CDRMessage_t* cdr_message, + const rtps::SampleIdentity& sample_id) { if (cdr_message->pos + 28 > cdr_message->max_size) { return false; } - fastrtps::rtps::CDRMessage::addUInt16(cdr_message, fastdds::dds::PID_RELATED_SAMPLE_IDENTITY); - fastrtps::rtps::CDRMessage::addUInt16(cdr_message, 24); - fastrtps::rtps::CDRMessage::addData(cdr_message, - sample_id.writer_guid().guidPrefix.value, fastrtps::rtps::GuidPrefix_t::size); - fastrtps::rtps::CDRMessage::addData(cdr_message, - sample_id.writer_guid().entityId.value, fastrtps::rtps::EntityId_t::size); - fastrtps::rtps::CDRMessage::addInt32(cdr_message, sample_id.sequence_number().high); - fastrtps::rtps::CDRMessage::addUInt32(cdr_message, sample_id.sequence_number().low); + rtps::CDRMessage::addUInt16(cdr_message, dds::PID_RELATED_SAMPLE_IDENTITY); + rtps::CDRMessage::addUInt16(cdr_message, 24); + rtps::CDRMessage::addData(cdr_message, + sample_id.writer_guid().guidPrefix.value, rtps::GuidPrefix_t::size); + rtps::CDRMessage::addData(cdr_message, + sample_id.writer_guid().entityId.value, rtps::EntityId_t::size); + rtps::CDRMessage::addInt32(cdr_message, sample_id.sequence_number().high); + rtps::CDRMessage::addUInt32(cdr_message, sample_id.sequence_number().low); return true; } @@ -179,22 +179,22 @@ class ParameterSerializer * @return true if operation is successful, false if the operation would overflow the maximum size of the message. */ static bool add_parameter_custom_related_sample_identity( - fastrtps::rtps::CDRMessage_t* cdr_message, - const fastrtps::rtps::SampleIdentity& sample_id) + rtps::CDRMessage_t* cdr_message, + const rtps::SampleIdentity& sample_id) { if (cdr_message->pos + 28 > cdr_message->max_size) { return false; } - fastrtps::rtps::CDRMessage::addUInt16(cdr_message, fastdds::dds::PID_CUSTOM_RELATED_SAMPLE_IDENTITY); - fastrtps::rtps::CDRMessage::addUInt16(cdr_message, 24); - fastrtps::rtps::CDRMessage::addData(cdr_message, - sample_id.writer_guid().guidPrefix.value, fastrtps::rtps::GuidPrefix_t::size); - fastrtps::rtps::CDRMessage::addData(cdr_message, - sample_id.writer_guid().entityId.value, fastrtps::rtps::EntityId_t::size); - fastrtps::rtps::CDRMessage::addInt32(cdr_message, sample_id.sequence_number().high); - fastrtps::rtps::CDRMessage::addUInt32(cdr_message, sample_id.sequence_number().low); + rtps::CDRMessage::addUInt16(cdr_message, dds::PID_CUSTOM_RELATED_SAMPLE_IDENTITY); + rtps::CDRMessage::addUInt16(cdr_message, 24); + rtps::CDRMessage::addData(cdr_message, + sample_id.writer_guid().guidPrefix.value, rtps::GuidPrefix_t::size); + rtps::CDRMessage::addData(cdr_message, + sample_id.writer_guid().entityId.value, rtps::EntityId_t::size); + rtps::CDRMessage::addInt32(cdr_message, sample_id.sequence_number().high); + rtps::CDRMessage::addUInt32(cdr_message, sample_id.sequence_number().low); return true; } @@ -210,7 +210,7 @@ class ParameterSerializer } static inline uint32_t cdr_serialized_size( - const fastrtps::rtps::Token& token) + const rtps::Token& token) { // p_id + p_length uint32_t ret_val = 2 + 2; @@ -221,13 +221,13 @@ class ParameterSerializer ret_val = (ret_val + 3) & ~3; // properties - ret_val += static_cast(fastrtps::rtps::PropertyHelper::serialized_size(token.properties())); + ret_val += static_cast(rtps::PropertyHelper::serialized_size(token.properties())); // align ret_val = (ret_val + 3) & ~3; // binary_properties ret_val += - static_cast(fastrtps::rtps::BinaryPropertyHelper::serialized_size( + static_cast(rtps::BinaryPropertyHelper::serialized_size( token.binary_properties())); // align ret_val = (ret_val + 3) & ~3; @@ -240,15 +240,15 @@ class ParameterSerializer template<> inline bool ParameterSerializer::add_content_to_cdr_message( const ParameterLocator_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - return fastrtps::rtps::CDRMessage::addLocator(cdr_message, parameter.locator); + return rtps::CDRMessage::addLocator(cdr_message, parameter.locator); } template<> inline bool ParameterSerializer::read_content_from_cdr_message( ParameterLocator_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_LOCATOR_LENGTH) @@ -256,13 +256,13 @@ inline bool ParameterSerializer::read_content_from_cdr_messa return false; } parameter.length = parameter_length; - return fastrtps::rtps::CDRMessage::readLocator(cdr_message, ¶meter.locator); + return rtps::CDRMessage::readLocator(cdr_message, ¶meter.locator); } template<> inline bool ParameterSerializer::add_to_cdr_message( const ParameterKey_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { return ParameterSerializer::add_parameter_key(cdr_message, parameter.key); } @@ -270,7 +270,7 @@ inline bool ParameterSerializer::add_to_cdr_message( template<> inline bool ParameterSerializer::read_content_from_cdr_message( ParameterKey_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_KEY_HASH_LENGTH) @@ -278,7 +278,7 @@ inline bool ParameterSerializer::read_content_from_cdr_message( return false; } parameter.length = parameter_length; - return fastrtps::rtps::CDRMessage::readData(cdr_message, parameter.key.value, PARAMETER_KEY_HASH_LENGTH); + return rtps::CDRMessage::readData(cdr_message, parameter.key.value, PARAMETER_KEY_HASH_LENGTH); } template<> @@ -296,25 +296,25 @@ inline uint32_t ParameterSerializer::cdr_serialized_size( template<> inline bool ParameterSerializer::add_to_cdr_message( const ParameterString_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { if (parameter.size() == 0) { return false; } - bool valid = fastrtps::rtps::CDRMessage::addUInt16(cdr_message, parameter.Pid); + bool valid = rtps::CDRMessage::addUInt16(cdr_message, parameter.Pid); //Str size uint32_t str_siz = static_cast(parameter.size() + 1); uint16_t len = static_cast(str_siz + 4 + 3) & ~3; - valid &= fastrtps::rtps::CDRMessage::addUInt16(cdr_message, len); - valid &= fastrtps::rtps::CDRMessage::add_string(cdr_message, parameter.getName()); + valid &= rtps::CDRMessage::addUInt16(cdr_message, len); + valid &= rtps::CDRMessage::add_string(cdr_message, parameter.getName()); return valid; } template<> inline bool ParameterSerializer::read_content_from_cdr_message( ParameterString_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length > 256) @@ -324,7 +324,7 @@ inline bool ParameterSerializer::read_content_from_cdr_messag parameter.length = parameter_length; fastcdr::string_255 aux; - bool valid = fastrtps::rtps::CDRMessage::readString(cdr_message, &aux); + bool valid = rtps::CDRMessage::readString(cdr_message, &aux); parameter.setName(aux.c_str()); return valid; } @@ -332,15 +332,15 @@ inline bool ParameterSerializer::read_content_from_cdr_messag template<> inline bool ParameterSerializer::add_content_to_cdr_message( const ParameterPort_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - return fastrtps::rtps::CDRMessage::addUInt32(cdr_message, parameter.port); + return rtps::CDRMessage::addUInt32(cdr_message, parameter.port); } template<> inline bool ParameterSerializer::read_content_from_cdr_message( ParameterPort_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_PORT_LENGTH) @@ -348,23 +348,23 @@ inline bool ParameterSerializer::read_content_from_cdr_message( return false; } parameter.length = parameter_length; - return fastrtps::rtps::CDRMessage::readUInt32(cdr_message, ¶meter.port); + return rtps::CDRMessage::readUInt32(cdr_message, ¶meter.port); } template<> inline bool ParameterSerializer::add_content_to_cdr_message( const ParameterGuid_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addData(cdr_message, parameter.guid.guidPrefix.value, 12); - valid &= fastrtps::rtps::CDRMessage::addData(cdr_message, parameter.guid.entityId.value, 4); + bool valid = rtps::CDRMessage::addData(cdr_message, parameter.guid.guidPrefix.value, 12); + valid &= rtps::CDRMessage::addData(cdr_message, parameter.guid.entityId.value, 4); return valid; } template<> inline bool ParameterSerializer::read_content_from_cdr_message( ParameterGuid_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_GUID_LENGTH) @@ -372,26 +372,26 @@ inline bool ParameterSerializer::read_content_from_cdr_message( return false; } parameter.length = parameter_length; - bool valid = fastrtps::rtps::CDRMessage::readData(cdr_message, parameter.guid.guidPrefix.value, 12); - valid &= fastrtps::rtps::CDRMessage::readData(cdr_message, parameter.guid.entityId.value, 4); + bool valid = rtps::CDRMessage::readData(cdr_message, parameter.guid.guidPrefix.value, 12); + valid &= rtps::CDRMessage::readData(cdr_message, parameter.guid.entityId.value, 4); return valid; } template<> inline bool ParameterSerializer::add_content_to_cdr_message( const ParameterProtocolVersion_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addOctet(cdr_message, parameter.protocolVersion.m_major); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, parameter.protocolVersion.m_minor); - valid &= fastrtps::rtps::CDRMessage::addUInt16(cdr_message, 0); + bool valid = rtps::CDRMessage::addOctet(cdr_message, parameter.protocolVersion.m_major); + valid &= rtps::CDRMessage::addOctet(cdr_message, parameter.protocolVersion.m_minor); + valid &= rtps::CDRMessage::addUInt16(cdr_message, 0); return valid; } template<> inline bool ParameterSerializer::read_content_from_cdr_message( ParameterProtocolVersion_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_PROTOCOL_LENGTH) @@ -399,8 +399,8 @@ inline bool ParameterSerializer::read_content_from_c return false; } parameter.length = parameter_length; - bool valid = fastrtps::rtps::CDRMessage::readOctet(cdr_message, ¶meter.protocolVersion.m_major); - valid &= fastrtps::rtps::CDRMessage::readOctet(cdr_message, ¶meter.protocolVersion.m_minor); + bool valid = rtps::CDRMessage::readOctet(cdr_message, ¶meter.protocolVersion.m_major); + valid &= rtps::CDRMessage::readOctet(cdr_message, ¶meter.protocolVersion.m_minor); cdr_message->pos += 2; //padding return valid; } @@ -408,18 +408,18 @@ inline bool ParameterSerializer::read_content_from_c template<> inline bool ParameterSerializer::add_content_to_cdr_message( const ParameterVendorId_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addOctet(cdr_message, parameter.vendorId[0]); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, parameter.vendorId[1]); - valid &= fastrtps::rtps::CDRMessage::addUInt16(cdr_message, 0); + bool valid = rtps::CDRMessage::addOctet(cdr_message, parameter.vendorId[0]); + valid &= rtps::CDRMessage::addOctet(cdr_message, parameter.vendorId[1]); + valid &= rtps::CDRMessage::addUInt16(cdr_message, 0); return valid; } template<> inline bool ParameterSerializer::read_content_from_cdr_message( ParameterVendorId_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_VENDOR_LENGTH) @@ -427,8 +427,8 @@ inline bool ParameterSerializer::read_content_from_cdr_mess return false; } parameter.length = parameter_length; - bool valid = fastrtps::rtps::CDRMessage::readOctet(cdr_message, ¶meter.vendorId[0]); - valid &= fastrtps::rtps::CDRMessage::readOctet(cdr_message, ¶meter.vendorId[1]); + bool valid = rtps::CDRMessage::readOctet(cdr_message, ¶meter.vendorId[0]); + valid &= rtps::CDRMessage::readOctet(cdr_message, ¶meter.vendorId[1]); cdr_message->pos += 2; //padding return valid; } @@ -436,15 +436,15 @@ inline bool ParameterSerializer::read_content_from_cdr_mess template<> inline bool ParameterSerializer::add_content_to_cdr_message( const ParameterDomainId_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message) + fastdds::rtps::CDRMessage_t* cdr_message) { - return fastrtps::rtps::CDRMessage::addUInt32(cdr_message, parameter.domain_id); + return fastdds::rtps::CDRMessage::addUInt32(cdr_message, parameter.domain_id); } template<> inline bool ParameterSerializer::read_content_from_cdr_message( ParameterDomainId_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message, + fastdds::rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_DOMAINID_LENGTH) @@ -452,21 +452,21 @@ inline bool ParameterSerializer::read_content_from_cdr_mess return false; } parameter.length = parameter_length; - return fastrtps::rtps::CDRMessage::readUInt32(cdr_message, ¶meter.domain_id); + return fastdds::rtps::CDRMessage::readUInt32(cdr_message, ¶meter.domain_id); } template<> inline bool ParameterSerializer::add_content_to_cdr_message( const ParameterIP4Address_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - return fastrtps::rtps::CDRMessage::addData(cdr_message, parameter.address, 4); + return rtps::CDRMessage::addData(cdr_message, parameter.address, 4); } template<> inline bool ParameterSerializer::read_content_from_cdr_message( ParameterIP4Address_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_IP4_LENGTH) @@ -474,25 +474,25 @@ inline bool ParameterSerializer::read_content_from_cdr_me return false; } parameter.length = parameter_length; - return fastrtps::rtps::CDRMessage::readData(cdr_message, parameter.address, 4); + return rtps::CDRMessage::readData(cdr_message, parameter.address, 4); } template<> inline bool ParameterSerializer::add_content_to_cdr_message( const ParameterBool_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - fastrtps::rtps::octet val = parameter.value ? 1 : 0; - bool valid = fastrtps::rtps::CDRMessage::addOctet(cdr_message, val); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); - valid &= fastrtps::rtps::CDRMessage::addUInt16(cdr_message, 0); + rtps::octet val = parameter.value ? 1 : 0; + bool valid = rtps::CDRMessage::addOctet(cdr_message, val); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); + valid &= rtps::CDRMessage::addUInt16(cdr_message, 0); return valid; } template<> inline bool ParameterSerializer::read_content_from_cdr_message( ParameterBool_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_BOOL_LENGTH) @@ -501,7 +501,7 @@ inline bool ParameterSerializer::read_content_from_cdr_message( } parameter.length = parameter_length; - bool valid = fastrtps::rtps::CDRMessage::readOctet(cdr_message, (fastrtps::rtps::octet*)¶meter.value); + bool valid = rtps::CDRMessage::readOctet(cdr_message, (rtps::octet*)¶meter.value); cdr_message->pos += 3; //padding return valid; } @@ -509,18 +509,18 @@ inline bool ParameterSerializer::read_content_from_cdr_message( template<> inline bool ParameterSerializer::add_content_to_cdr_message( const ParameterStatusInfo_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addUInt16(cdr_message, 0); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, parameter.status); + bool valid = rtps::CDRMessage::addUInt16(cdr_message, 0); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); + valid &= rtps::CDRMessage::addOctet(cdr_message, parameter.status); return valid; } template<> inline bool ParameterSerializer::read_content_from_cdr_message( ParameterStatusInfo_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_STATUS_INFO_LENGTH) @@ -529,27 +529,27 @@ inline bool ParameterSerializer::read_content_from_cdr_me } parameter.length = parameter_length; //octet status = msg.buffer[msg.pos + 3]; - fastrtps::rtps::octet tmp; + rtps::octet tmp; //Remove the front three octets, take the fourth - bool valid = fastrtps::rtps::CDRMessage::readOctet(cdr_message, &tmp); - valid &= fastrtps::rtps::CDRMessage::readOctet(cdr_message, &tmp); - valid &= fastrtps::rtps::CDRMessage::readOctet(cdr_message, &tmp); - valid &= fastrtps::rtps::CDRMessage::readOctet(cdr_message, ¶meter.status); + bool valid = rtps::CDRMessage::readOctet(cdr_message, &tmp); + valid &= rtps::CDRMessage::readOctet(cdr_message, &tmp); + valid &= rtps::CDRMessage::readOctet(cdr_message, &tmp); + valid &= rtps::CDRMessage::readOctet(cdr_message, ¶meter.status); return valid; } template<> inline bool ParameterSerializer::add_content_to_cdr_message( const ParameterCount_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - return fastrtps::rtps::CDRMessage::addUInt32(cdr_message, parameter.count); + return rtps::CDRMessage::addUInt32(cdr_message, parameter.count); } template<> inline bool ParameterSerializer::read_content_from_cdr_message( ParameterCount_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_COUNT_LENGTH) @@ -557,21 +557,21 @@ inline bool ParameterSerializer::read_content_from_cdr_message return false; } parameter.length = parameter_length; - return fastrtps::rtps::CDRMessage::readUInt32(cdr_message, ¶meter.count); + return rtps::CDRMessage::readUInt32(cdr_message, ¶meter.count); } template<> inline bool ParameterSerializer::add_content_to_cdr_message( const ParameterEntityId_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - return fastrtps::rtps::CDRMessage::addEntityId(cdr_message, ¶meter.entityId); + return rtps::CDRMessage::addEntityId(cdr_message, ¶meter.entityId); } template<> inline bool ParameterSerializer::read_content_from_cdr_message( ParameterEntityId_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_ENTITYID_LENGTH) @@ -579,23 +579,23 @@ inline bool ParameterSerializer::read_content_from_cdr_mess return false; } parameter.length = parameter_length; - return fastrtps::rtps::CDRMessage::readEntityId(cdr_message, ¶meter.entityId); + return rtps::CDRMessage::readEntityId(cdr_message, ¶meter.entityId); } template<> inline bool ParameterSerializer::add_content_to_cdr_message( const ParameterTime_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addInt32(cdr_message, parameter.time.seconds()); - valid &= fastrtps::rtps::CDRMessage::addInt32(cdr_message, parameter.time.fraction()); + bool valid = rtps::CDRMessage::addInt32(cdr_message, parameter.time.seconds()); + valid &= rtps::CDRMessage::addInt32(cdr_message, parameter.time.fraction()); return valid; } template<> inline bool ParameterSerializer::read_content_from_cdr_message( ParameterTime_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_TIME_LENGTH) @@ -604,10 +604,10 @@ inline bool ParameterSerializer::read_content_from_cdr_message( } parameter.length = parameter_length; int32_t sec(0); - bool valid = fastrtps::rtps::CDRMessage::readInt32(cdr_message, &sec); + bool valid = rtps::CDRMessage::readInt32(cdr_message, &sec); parameter.time.seconds(sec); uint32_t frac(0); - valid &= fastrtps::rtps::CDRMessage::readUInt32(cdr_message, &frac); + valid &= rtps::CDRMessage::readUInt32(cdr_message, &frac); parameter.time.fraction(frac); return valid; } @@ -615,15 +615,15 @@ inline bool ParameterSerializer::read_content_from_cdr_message( template<> inline bool ParameterSerializer::add_content_to_cdr_message( const ParameterBuiltinEndpointSet_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - return fastrtps::rtps::CDRMessage::addUInt32(cdr_message, parameter.endpointSet); + return rtps::CDRMessage::addUInt32(cdr_message, parameter.endpointSet); } template<> inline bool ParameterSerializer::read_content_from_cdr_message( ParameterBuiltinEndpointSet_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_BUILTINENDPOINTSET_LENGTH) @@ -631,21 +631,21 @@ inline bool ParameterSerializer::read_content_fro return false; } parameter.length = parameter_length; - return fastrtps::rtps::CDRMessage::readUInt32(cdr_message, ¶meter.endpointSet); + return rtps::CDRMessage::readUInt32(cdr_message, ¶meter.endpointSet); } template<> inline bool ParameterSerializer::add_content_to_cdr_message( const ParameterNetworkConfigSet_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - return fastrtps::rtps::CDRMessage::addUInt32(cdr_message, parameter.netconfigSet); + return rtps::CDRMessage::addUInt32(cdr_message, parameter.netconfigSet); } template<> inline bool ParameterSerializer::read_content_from_cdr_message( ParameterNetworkConfigSet_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_NETWORKCONFIGSET_LENGTH) @@ -653,7 +653,7 @@ inline bool ParameterSerializer::read_content_from_ return false; } parameter.length = parameter_length; - return fastrtps::rtps::CDRMessage::readUInt32(cdr_message, ¶meter.netconfigSet); + return rtps::CDRMessage::readUInt32(cdr_message, ¶meter.netconfigSet); } template<> @@ -681,22 +681,22 @@ inline uint32_t ParameterSerializer::cdr_serialized_siz template<> inline bool ParameterSerializer::add_to_cdr_message( const ParameterPropertyList_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addUInt16(cdr_message, parameter.Pid); + bool valid = rtps::CDRMessage::addUInt16(cdr_message, parameter.Pid); uint16_t pos_str = (uint16_t)cdr_message->pos; - valid &= fastrtps::rtps::CDRMessage::addUInt16(cdr_message, parameter.length); - valid &= fastrtps::rtps::CDRMessage::addUInt32(cdr_message, (uint32_t)parameter.size()); + valid &= rtps::CDRMessage::addUInt16(cdr_message, parameter.length); + valid &= rtps::CDRMessage::addUInt32(cdr_message, (uint32_t)parameter.size()); for (ParameterPropertyList_t::const_iterator it = parameter.begin(); it != parameter.end(); ++it) { - valid &= fastrtps::rtps::CDRMessage::add_string(cdr_message, it->first()); - valid &= fastrtps::rtps::CDRMessage::add_string(cdr_message, it->second()); + valid &= rtps::CDRMessage::add_string(cdr_message, it->first()); + valid &= rtps::CDRMessage::add_string(cdr_message, it->second()); } uint16_t pos_param_end = (uint16_t)cdr_message->pos; uint16_t len = pos_param_end - pos_str - 2; cdr_message->pos = pos_str; - valid &= fastrtps::rtps::CDRMessage::addUInt16(cdr_message, len); + valid &= rtps::CDRMessage::addUInt16(cdr_message, len); cdr_message->pos = pos_param_end; cdr_message->length -= 2; return valid; @@ -705,7 +705,7 @@ inline bool ParameterSerializer::add_to_cdr_message( template<> inline bool ParameterSerializer::read_content_from_cdr_message( ParameterPropertyList_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter.max_size() != 0 && parameter_length > parameter.max_size() + 4) @@ -723,7 +723,7 @@ inline bool ParameterSerializer::read_content_from_cdr_ } uint32_t num_properties = 0; - bool valid = fastrtps::rtps::CDRMessage::readUInt32(cdr_message, &num_properties); + bool valid = rtps::CDRMessage::readUInt32(cdr_message, &num_properties); remain -= sizeof(uint32_t); if (!valid) { @@ -736,7 +736,7 @@ inline bool ParameterSerializer::read_content_from_cdr_ // Read and validate size of property name remain = max_pos - cdr_message->pos; - valid &= (remain >= sizeof(uint32_t)) && fastrtps::rtps::CDRMessage::readUInt32(cdr_message, &property1_size); + valid &= (remain >= sizeof(uint32_t)) && rtps::CDRMessage::readUInt32(cdr_message, &property1_size); remain -= sizeof(uint32_t); valid = valid && (remain >= property1_size); if (!valid) @@ -756,7 +756,7 @@ inline bool ParameterSerializer::read_content_from_cdr_ remain -= alignment1; // Read and validate size of property value - valid &= (remain >= sizeof(uint32_t)) && fastrtps::rtps::CDRMessage::readUInt32(cdr_message, &property2_size); + valid &= (remain >= sizeof(uint32_t)) && rtps::CDRMessage::readUInt32(cdr_message, &property2_size); remain -= sizeof(uint32_t); valid = valid && (remain >= property2_size); if (!valid) @@ -788,21 +788,21 @@ inline bool ParameterSerializer::read_content_from_cdr_ template<> inline bool ParameterSerializer::add_content_to_cdr_message( const ParameterSampleIdentity_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addData(cdr_message, - parameter.sample_id.writer_guid().guidPrefix.value, fastrtps::rtps::GuidPrefix_t::size); - valid &= fastrtps::rtps::CDRMessage::addData(cdr_message, - parameter.sample_id.writer_guid().entityId.value, fastrtps::rtps::EntityId_t::size); - valid &= fastrtps::rtps::CDRMessage::addInt32(cdr_message, parameter.sample_id.sequence_number().high); - valid &= fastrtps::rtps::CDRMessage::addUInt32(cdr_message, parameter.sample_id.sequence_number().low); + bool valid = rtps::CDRMessage::addData(cdr_message, + parameter.sample_id.writer_guid().guidPrefix.value, rtps::GuidPrefix_t::size); + valid &= rtps::CDRMessage::addData(cdr_message, + parameter.sample_id.writer_guid().entityId.value, rtps::EntityId_t::size); + valid &= rtps::CDRMessage::addInt32(cdr_message, parameter.sample_id.sequence_number().high); + valid &= rtps::CDRMessage::addUInt32(cdr_message, parameter.sample_id.sequence_number().low); return valid; } template<> inline bool ParameterSerializer::read_content_from_cdr_message( ParameterSampleIdentity_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_SAMPLEIDENTITY_LENGTH) @@ -810,22 +810,22 @@ inline bool ParameterSerializer::read_content_from_cd return false; } parameter.length = parameter_length; - bool valid = fastrtps::rtps::CDRMessage::readData(cdr_message, - parameter.sample_id.writer_guid().guidPrefix.value, fastrtps::rtps::GuidPrefix_t::size); - valid &= fastrtps::rtps::CDRMessage::readData(cdr_message, - parameter.sample_id.writer_guid().entityId.value, fastrtps::rtps::EntityId_t::size); - valid &= fastrtps::rtps::CDRMessage::readInt32(cdr_message, ¶meter.sample_id.sequence_number().high); - valid &= fastrtps::rtps::CDRMessage::readUInt32(cdr_message, ¶meter.sample_id.sequence_number().low); + bool valid = rtps::CDRMessage::readData(cdr_message, + parameter.sample_id.writer_guid().guidPrefix.value, rtps::GuidPrefix_t::size); + valid &= rtps::CDRMessage::readData(cdr_message, + parameter.sample_id.writer_guid().entityId.value, rtps::EntityId_t::size); + valid &= rtps::CDRMessage::readInt32(cdr_message, ¶meter.sample_id.sequence_number().high); + valid &= rtps::CDRMessage::readUInt32(cdr_message, ¶meter.sample_id.sequence_number().low); return valid; } template<> -class ParameterSerializer +class ParameterSerializer { public: static uint32_t cdr_serialized_size( - const fastdds::rtps::ContentFilterProperty& parameter) + const rtps::ContentFilterProperty& parameter) { uint32_t ret_val = 0; @@ -863,8 +863,8 @@ class ParameterSerializer } static bool add_to_cdr_message( - const fastdds::rtps::ContentFilterProperty& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message) + const rtps::ContentFilterProperty& parameter, + rtps::CDRMessage_t* cdr_message) { bool valid = false; @@ -876,25 +876,25 @@ class ParameterSerializer // p_id + p_length uint32_t len = cdr_serialized_size(parameter); assert(4 < len && 0xFFFF >= (len - 4)); - valid = fastrtps::rtps::CDRMessage::addUInt16(cdr_message, PID_CONTENT_FILTER_PROPERTY); - valid &= fastrtps::rtps::CDRMessage::addUInt16(cdr_message, static_cast(len - 4)); + valid = rtps::CDRMessage::addUInt16(cdr_message, PID_CONTENT_FILTER_PROPERTY); + valid &= rtps::CDRMessage::addUInt16(cdr_message, static_cast(len - 4)); // content_filtered_topic_name - valid &= fastrtps::rtps::CDRMessage::add_string(cdr_message, parameter.content_filtered_topic_name); + valid &= rtps::CDRMessage::add_string(cdr_message, parameter.content_filtered_topic_name); // related_topic_name - valid &= fastrtps::rtps::CDRMessage::add_string(cdr_message, parameter.related_topic_name); + valid &= rtps::CDRMessage::add_string(cdr_message, parameter.related_topic_name); // filter_class_name - valid &= fastrtps::rtps::CDRMessage::add_string(cdr_message, parameter.filter_class_name); + valid &= rtps::CDRMessage::add_string(cdr_message, parameter.filter_class_name); // filter_expression - valid &= fastrtps::rtps::CDRMessage::add_string(cdr_message, parameter.filter_expression); + valid &= rtps::CDRMessage::add_string(cdr_message, parameter.filter_expression); // expression_parameters // sequence length uint32_t num_params = static_cast(parameter.expression_parameters.size()); - valid &= fastrtps::rtps::CDRMessage::addUInt32(cdr_message, num_params); + valid &= rtps::CDRMessage::addUInt32(cdr_message, num_params); // Add all parameters for (const fastcdr::string_255& param : parameter.expression_parameters) { - valid &= fastrtps::rtps::CDRMessage::add_string(cdr_message, param); + valid &= rtps::CDRMessage::add_string(cdr_message, param); } } @@ -902,8 +902,8 @@ class ParameterSerializer } static bool read_from_cdr_message( - fastdds::rtps::ContentFilterProperty& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::ContentFilterProperty& parameter, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { // Ensure incorrect length will result in parameter being cleared @@ -933,7 +933,7 @@ class ParameterSerializer } if (valid) { - valid = fastrtps::rtps::CDRMessage::readString(cdr_message, ¶meter.filter_expression) && + valid = rtps::CDRMessage::readString(cdr_message, ¶meter.filter_expression) && (0 < parameter.filter_expression.size()); } @@ -941,7 +941,7 @@ class ParameterSerializer if (valid) { uint32_t num_parameters = 0; - valid = fastrtps::rtps::CDRMessage::readUInt32(cdr_message, &num_parameters); + valid = rtps::CDRMessage::readUInt32(cdr_message, &num_parameters); if (valid) { valid = (num_parameters <= 100) && (num_parameters <= parameter.expression_parameters.max_size()); @@ -983,7 +983,7 @@ class ParameterSerializer } static inline void clear( - fastdds::rtps::ContentFilterProperty& parameter) + rtps::ContentFilterProperty& parameter) { parameter.filter_class_name = ""; parameter.content_filtered_topic_name = ""; @@ -993,12 +993,12 @@ class ParameterSerializer } static inline bool read_string( - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, fastcdr::string_255& str) { uint32_t str_size = 0; bool valid; - valid = fastrtps::rtps::CDRMessage::readUInt32(cdr_message, &str_size); + valid = rtps::CDRMessage::readUInt32(cdr_message, &str_size); if (!valid || cdr_message->pos + str_size > cdr_message->length || str_size > str.max_size + 1) @@ -1032,21 +1032,21 @@ inline uint32_t ParameterSerializer::cdr_serialized_size( template<> inline bool ParameterSerializer::add_to_cdr_message( const ParameterToken_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addUInt16(cdr_message, parameter.Pid); + bool valid = rtps::CDRMessage::addUInt16(cdr_message, parameter.Pid); uint16_t pos_str = (uint16_t)cdr_message->pos; - valid &= fastrtps::rtps::CDRMessage::addUInt16(cdr_message, parameter.length); - valid &= fastrtps::rtps::CDRMessage::addDataHolder(cdr_message, parameter.token); + valid &= rtps::CDRMessage::addUInt16(cdr_message, parameter.length); + valid &= rtps::CDRMessage::addDataHolder(cdr_message, parameter.token); uint32_t align = (4 - cdr_message->pos % 4) & 3; //align for (uint32_t count = 0; count < align; ++count) { - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); } uint16_t pos_param_end = (uint16_t)cdr_message->pos; uint16_t len = pos_param_end - pos_str - 2; cdr_message->pos = pos_str; - valid &= fastrtps::rtps::CDRMessage::addUInt16(cdr_message, len); + valid &= rtps::CDRMessage::addUInt16(cdr_message, len); cdr_message->pos = pos_param_end; cdr_message->length -= 2; return valid; @@ -1055,13 +1055,13 @@ inline bool ParameterSerializer::add_to_cdr_message( template<> inline bool ParameterSerializer::read_content_from_cdr_message( ParameterToken_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { parameter.length = parameter_length; uint32_t pos_ref = cdr_message->pos; - bool valid = fastrtps::rtps::CDRMessage::readDataHolder(cdr_message, parameter.token, parameter_length); + bool valid = rtps::CDRMessage::readDataHolder(cdr_message, parameter.token, parameter_length); uint32_t length_diff = cdr_message->pos - pos_ref; valid &= (parameter_length == length_diff); return valid; @@ -1070,17 +1070,17 @@ inline bool ParameterSerializer::read_content_from_cdr_message template<> inline bool ParameterSerializer::add_content_to_cdr_message( const ParameterParticipantSecurityInfo_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addUInt32(cdr_message, parameter.security_attributes); - valid &= fastrtps::rtps::CDRMessage::addUInt32(cdr_message, parameter.plugin_security_attributes); + bool valid = rtps::CDRMessage::addUInt32(cdr_message, parameter.security_attributes); + valid &= rtps::CDRMessage::addUInt32(cdr_message, parameter.plugin_security_attributes); return valid; } template<> inline bool ParameterSerializer::read_content_from_cdr_message( ParameterParticipantSecurityInfo_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_PARTICIPANT_SECURITY_INFO_LENGTH) @@ -1088,25 +1088,25 @@ inline bool ParameterSerializer::read_conten return false; } parameter.length = parameter_length; - bool valid = fastrtps::rtps::CDRMessage::readUInt32(cdr_message, ¶meter.security_attributes); - valid &= fastrtps::rtps::CDRMessage::readUInt32(cdr_message, ¶meter.plugin_security_attributes); + bool valid = rtps::CDRMessage::readUInt32(cdr_message, ¶meter.security_attributes); + valid &= rtps::CDRMessage::readUInt32(cdr_message, ¶meter.plugin_security_attributes); return valid; } template<> inline bool ParameterSerializer::add_content_to_cdr_message( const ParameterEndpointSecurityInfo_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addUInt32(cdr_message, parameter.security_attributes); - valid &= fastrtps::rtps::CDRMessage::addUInt32(cdr_message, parameter.plugin_security_attributes); + bool valid = rtps::CDRMessage::addUInt32(cdr_message, parameter.security_attributes); + valid &= rtps::CDRMessage::addUInt32(cdr_message, parameter.plugin_security_attributes); return valid; } template<> inline bool ParameterSerializer::read_content_from_cdr_message( ParameterEndpointSecurityInfo_t& parameter, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_ENDPOINT_SECURITY_INFO_LENGTH) @@ -1114,8 +1114,8 @@ inline bool ParameterSerializer::read_content_f return false; } parameter.length = parameter_length; - bool valid = fastrtps::rtps::CDRMessage::readUInt32(cdr_message, ¶meter.security_attributes); - valid &= fastrtps::rtps::CDRMessage::readUInt32(cdr_message, ¶meter.plugin_security_attributes); + bool valid = rtps::CDRMessage::readUInt32(cdr_message, ¶meter.security_attributes); + valid &= rtps::CDRMessage::readUInt32(cdr_message, ¶meter.plugin_security_attributes); return valid; } diff --git a/src/cpp/fastdds/core/policy/QosPoliciesSerializer.hpp b/src/cpp/fastdds/core/policy/QosPoliciesSerializer.hpp index f2ed86275c3..70c63d0e085 100644 --- a/src/cpp/fastdds/core/policy/QosPoliciesSerializer.hpp +++ b/src/cpp/fastdds/core/policy/QosPoliciesSerializer.hpp @@ -35,7 +35,7 @@ class QosPoliciesSerializer static bool add_to_cdr_message( const QosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { bool valid = ParameterSerializer::add_common_to_cdr_message(qos_policy, cdr_message); valid &= add_content_to_cdr_message(qos_policy, cdr_message); @@ -44,7 +44,7 @@ class QosPoliciesSerializer static bool read_from_cdr_message( QosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { bool valid = true; @@ -62,7 +62,7 @@ class QosPoliciesSerializer static bool add_content_to_cdr_message( const QosPolicy&, - fastrtps::rtps::CDRMessage_t*) + rtps::CDRMessage_t*) { static_assert(sizeof(QosPolicy) == 0, "Not implemented"); return false; @@ -70,7 +70,7 @@ class QosPoliciesSerializer static bool read_content_from_cdr_message( QosPolicy&, - fastrtps::rtps::CDRMessage_t*, + rtps::CDRMessage_t*, const uint16_t) { static_assert(sizeof(QosPolicy) == 0, "Not implemented"); @@ -82,19 +82,19 @@ class QosPoliciesSerializer template<> inline bool QosPoliciesSerializer::add_content_to_cdr_message( const DurabilityQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addOctet(cdr_message, qos_policy.kind); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); + bool valid = rtps::CDRMessage::addOctet(cdr_message, qos_policy.kind); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); return valid; } template<> inline bool QosPoliciesSerializer::read_content_from_cdr_message( DurabilityQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_KIND_LENGTH) @@ -102,8 +102,8 @@ inline bool QosPoliciesSerializer::read_content_from_cdr_me return false; } qos_policy.length = parameter_length; - bool valid = fastrtps::rtps::CDRMessage::readOctet(cdr_message, - (fastrtps::rtps::octet*)&qos_policy.kind); + bool valid = rtps::CDRMessage::readOctet(cdr_message, + (fastdds::rtps::octet*)&qos_policy.kind); cdr_message->pos += 3; //padding return valid; } @@ -111,11 +111,11 @@ inline bool QosPoliciesSerializer::read_content_from_cdr_me template<> inline bool QosPoliciesSerializer::add_content_to_cdr_message( const DeadlineQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addInt32(cdr_message, + bool valid = rtps::CDRMessage::addInt32(cdr_message, qos_policy.period.seconds); - valid &= fastrtps::rtps::CDRMessage::addUInt32(cdr_message, + valid &= rtps::CDRMessage::addUInt32(cdr_message, qos_policy.period.fraction()); return valid; } @@ -123,7 +123,7 @@ inline bool QosPoliciesSerializer::add_content_to_cdr_message template<> inline bool QosPoliciesSerializer::read_content_from_cdr_message( DeadlineQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_TIME_LENGTH) @@ -131,10 +131,10 @@ inline bool QosPoliciesSerializer::read_content_from_cdr_mess return false; } qos_policy.length = parameter_length; - bool valid = fastrtps::rtps::CDRMessage::readInt32(cdr_message, + bool valid = rtps::CDRMessage::readInt32(cdr_message, &qos_policy.period.seconds); uint32_t frac(0); - valid &= fastrtps::rtps::CDRMessage::readUInt32(cdr_message, &frac); + valid &= rtps::CDRMessage::readUInt32(cdr_message, &frac); qos_policy.period.fraction(frac); return valid; } @@ -142,17 +142,17 @@ inline bool QosPoliciesSerializer::read_content_from_cdr_mess template <> inline bool QosPoliciesSerializer::add_content_to_cdr_message( const LatencyBudgetQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addInt32(cdr_message, qos_policy.duration.seconds); - valid &= fastrtps::rtps::CDRMessage::addUInt32(cdr_message, qos_policy.duration.fraction()); + bool valid = rtps::CDRMessage::addInt32(cdr_message, qos_policy.duration.seconds); + valid &= rtps::CDRMessage::addUInt32(cdr_message, qos_policy.duration.fraction()); return valid; } template<> inline bool QosPoliciesSerializer::read_content_from_cdr_message( LatencyBudgetQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_TIME_LENGTH) @@ -160,10 +160,10 @@ inline bool QosPoliciesSerializer::read_content_from_cdr return false; } qos_policy.length = parameter_length; - bool valid = fastrtps::rtps::CDRMessage::readInt32(cdr_message, + bool valid = rtps::CDRMessage::readInt32(cdr_message, &qos_policy.duration.seconds); uint32_t frac(0); - valid &= fastrtps::rtps::CDRMessage::readUInt32(cdr_message, &frac); + valid &= rtps::CDRMessage::readUInt32(cdr_message, &frac); qos_policy.duration.fraction(frac); return valid; } @@ -171,15 +171,15 @@ inline bool QosPoliciesSerializer::read_content_from_cdr template<> inline bool QosPoliciesSerializer::add_content_to_cdr_message( const LivelinessQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addOctet(cdr_message, qos_policy.kind); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); - valid &= fastrtps::rtps::CDRMessage::addInt32(cdr_message, + bool valid = rtps::CDRMessage::addOctet(cdr_message, qos_policy.kind); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); + valid &= rtps::CDRMessage::addInt32(cdr_message, qos_policy.lease_duration.seconds); - valid &= fastrtps::rtps::CDRMessage::addUInt32(cdr_message, + valid &= rtps::CDRMessage::addUInt32(cdr_message, qos_policy.lease_duration.fraction()); return valid; } @@ -187,7 +187,7 @@ inline bool QosPoliciesSerializer::add_content_to_cdr_messa template<> inline bool QosPoliciesSerializer::read_content_from_cdr_message( LivelinessQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_KIND_LENGTH + PARAMETER_TIME_LENGTH) @@ -195,13 +195,13 @@ inline bool QosPoliciesSerializer::read_content_from_cdr_me return false; } qos_policy.length = parameter_length; - bool valid = fastrtps::rtps::CDRMessage::readOctet(cdr_message, - (fastrtps::rtps::octet*)&qos_policy.kind); + bool valid = rtps::CDRMessage::readOctet(cdr_message, + (fastdds::rtps::octet*)&qos_policy.kind); cdr_message->pos += 3; //padding - valid &= fastrtps::rtps::CDRMessage::readInt32(cdr_message, + valid &= rtps::CDRMessage::readInt32(cdr_message, &qos_policy.lease_duration.seconds); uint32_t frac(0); - valid &= fastrtps::rtps::CDRMessage::readUInt32(cdr_message, &frac); + valid &= rtps::CDRMessage::readUInt32(cdr_message, &frac); qos_policy.lease_duration.fraction(frac); return valid; } @@ -209,16 +209,16 @@ inline bool QosPoliciesSerializer::read_content_from_cdr_me template<> inline bool QosPoliciesSerializer::add_content_to_cdr_message( const ReliabilityQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addOctet(cdr_message, qos_policy.kind); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); - valid &= fastrtps::rtps::CDRMessage::addInt32(cdr_message, + bool valid = rtps::CDRMessage::addOctet(cdr_message, qos_policy.kind); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); + valid &= rtps::CDRMessage::addInt32(cdr_message, qos_policy.max_blocking_time.seconds); valid &= - fastrtps::rtps::CDRMessage::addUInt32(cdr_message, + rtps::CDRMessage::addUInt32(cdr_message, qos_policy.max_blocking_time.fraction()); return valid; } @@ -226,7 +226,7 @@ inline bool QosPoliciesSerializer::add_content_to_cdr_mess template<> inline bool QosPoliciesSerializer::read_content_from_cdr_message( ReliabilityQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_KIND_LENGTH + PARAMETER_TIME_LENGTH) @@ -234,13 +234,13 @@ inline bool QosPoliciesSerializer::read_content_from_cdr_m return false; } qos_policy.length = parameter_length; - bool valid = fastrtps::rtps::CDRMessage::readOctet(cdr_message, - (fastrtps::rtps::octet*)&qos_policy.kind); + bool valid = rtps::CDRMessage::readOctet(cdr_message, + (fastdds::rtps::octet*)&qos_policy.kind); cdr_message->pos += 3; //padding - valid &= fastrtps::rtps::CDRMessage::readInt32(cdr_message, + valid &= rtps::CDRMessage::readInt32(cdr_message, &qos_policy.max_blocking_time.seconds); uint32_t frac(0); - valid &= fastrtps::rtps::CDRMessage::readUInt32(cdr_message, &frac); + valid &= rtps::CDRMessage::readUInt32(cdr_message, &frac); qos_policy.max_blocking_time.fraction(frac); return valid; } @@ -248,19 +248,19 @@ inline bool QosPoliciesSerializer::read_content_from_cdr_m template<> inline bool QosPoliciesSerializer::add_content_to_cdr_message( const OwnershipQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addOctet(cdr_message, qos_policy.kind); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); + bool valid = rtps::CDRMessage::addOctet(cdr_message, qos_policy.kind); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); return valid; } template<> inline bool QosPoliciesSerializer::read_content_from_cdr_message( OwnershipQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_KIND_LENGTH) @@ -268,8 +268,8 @@ inline bool QosPoliciesSerializer::read_content_from_cdr_mes return false; } qos_policy.length = parameter_length; - bool valid = fastrtps::rtps::CDRMessage::readOctet(cdr_message, - (fastrtps::rtps::octet*)&qos_policy.kind); + bool valid = rtps::CDRMessage::readOctet(cdr_message, + (fastdds::rtps::octet*)&qos_policy.kind); cdr_message->pos += 3; //padding return valid; } @@ -277,19 +277,19 @@ inline bool QosPoliciesSerializer::read_content_from_cdr_mes template<> inline bool QosPoliciesSerializer::add_content_to_cdr_message( const DestinationOrderQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addOctet(cdr_message, qos_policy.kind); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); + bool valid = rtps::CDRMessage::addOctet(cdr_message, qos_policy.kind); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); return valid; } template<> inline bool QosPoliciesSerializer::read_content_from_cdr_message( DestinationOrderQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_KIND_LENGTH) @@ -297,8 +297,8 @@ inline bool QosPoliciesSerializer::read_content_from_ return false; } qos_policy.length = parameter_length; - bool valid = fastrtps::rtps::CDRMessage::readOctet(cdr_message, - (fastrtps::rtps::octet*)&qos_policy.kind); + bool valid = rtps::CDRMessage::readOctet(cdr_message, + (fastdds::rtps::octet*)&qos_policy.kind); cdr_message->pos += 3; //padding return valid; } @@ -306,13 +306,13 @@ inline bool QosPoliciesSerializer::read_content_from_ template<> inline bool QosPoliciesSerializer::add_content_to_cdr_message( const ResourceLimitsQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addInt32(cdr_message, + bool valid = rtps::CDRMessage::addInt32(cdr_message, qos_policy.max_samples); valid &= - fastrtps::rtps::CDRMessage::addInt32(cdr_message, qos_policy.max_instances); - valid &= fastrtps::rtps::CDRMessage::addInt32(cdr_message, + rtps::CDRMessage::addInt32(cdr_message, qos_policy.max_instances); + valid &= rtps::CDRMessage::addInt32(cdr_message, qos_policy.max_samples_per_instance); return valid; } @@ -320,7 +320,7 @@ inline bool QosPoliciesSerializer::add_content_to_cdr_m template<> inline bool QosPoliciesSerializer::read_content_from_cdr_message( ResourceLimitsQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != 12) @@ -328,11 +328,11 @@ inline bool QosPoliciesSerializer::read_content_from_cd return false; } qos_policy.length = parameter_length; - bool valid = fastrtps::rtps::CDRMessage::readInt32(cdr_message, + bool valid = rtps::CDRMessage::readInt32(cdr_message, &qos_policy.max_samples); - valid &= fastrtps::rtps::CDRMessage::readInt32(cdr_message, + valid &= rtps::CDRMessage::readInt32(cdr_message, &qos_policy.max_instances); - valid &= fastrtps::rtps::CDRMessage::readInt32(cdr_message, + valid &= rtps::CDRMessage::readInt32(cdr_message, &qos_policy.max_samples_per_instance); return valid; } @@ -340,13 +340,13 @@ inline bool QosPoliciesSerializer::read_content_from_cd template<> inline bool QosPoliciesSerializer::add_content_to_cdr_message( const TimeBasedFilterQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { bool valid = - fastrtps::rtps::CDRMessage::addInt32(cdr_message, + rtps::CDRMessage::addInt32(cdr_message, qos_policy.minimum_separation.seconds); valid &= - fastrtps::rtps::CDRMessage::addUInt32(cdr_message, + rtps::CDRMessage::addUInt32(cdr_message, qos_policy.minimum_separation.fraction()); return valid; } @@ -354,7 +354,7 @@ inline bool QosPoliciesSerializer::add_content_to_cdr_ template<> inline bool QosPoliciesSerializer::read_content_from_cdr_message( TimeBasedFilterQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_TIME_LENGTH) @@ -362,10 +362,10 @@ inline bool QosPoliciesSerializer::read_content_from_c return false; } qos_policy.length = parameter_length; - bool valid = fastrtps::rtps::CDRMessage::readInt32(cdr_message, + bool valid = rtps::CDRMessage::readInt32(cdr_message, &qos_policy.minimum_separation.seconds); uint32_t frac(0); - valid &= fastrtps::rtps::CDRMessage::readUInt32(cdr_message, &frac); + valid &= rtps::CDRMessage::readUInt32(cdr_message, &frac); qos_policy.minimum_separation.fraction(frac); return valid; } @@ -373,20 +373,20 @@ inline bool QosPoliciesSerializer::read_content_from_c template<> inline bool QosPoliciesSerializer::add_content_to_cdr_message( const PresentationQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addOctet(cdr_message, + bool valid = rtps::CDRMessage::addOctet(cdr_message, qos_policy.access_scope); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, - (fastrtps::rtps::octet)qos_policy.coherent_access); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, - (fastrtps::rtps::octet)qos_policy.ordered_access); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); + valid &= rtps::CDRMessage::addOctet(cdr_message, + (fastdds::rtps::octet)qos_policy.coherent_access); + valid &= rtps::CDRMessage::addOctet(cdr_message, + (fastdds::rtps::octet)qos_policy.ordered_access); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); return valid; } @@ -394,7 +394,7 @@ inline bool QosPoliciesSerializer::add_content_to_cdr_mes template<> inline bool QosPoliciesSerializer::read_content_from_cdr_message( PresentationQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_PRESENTATION_LENGTH) @@ -402,13 +402,13 @@ inline bool QosPoliciesSerializer::read_content_from_cdr_ return false; } qos_policy.length = parameter_length; - bool valid = fastrtps::rtps::CDRMessage::readOctet(cdr_message, - (fastrtps::rtps::octet*)&qos_policy.access_scope); + bool valid = rtps::CDRMessage::readOctet(cdr_message, + (fastdds::rtps::octet*)&qos_policy.access_scope); cdr_message->pos += 3; //padding - valid &= fastrtps::rtps::CDRMessage::readOctet(cdr_message, - (fastrtps::rtps::octet*)&qos_policy.coherent_access); - valid &= fastrtps::rtps::CDRMessage::readOctet(cdr_message, - (fastrtps::rtps::octet*)&qos_policy.ordered_access); + valid &= rtps::CDRMessage::readOctet(cdr_message, + (fastdds::rtps::octet*)&qos_policy.coherent_access); + valid &= rtps::CDRMessage::readOctet(cdr_message, + (fastdds::rtps::octet*)&qos_policy.ordered_access); cdr_message->pos += 2; //padding return valid; } @@ -435,9 +435,9 @@ inline uint32_t QosPoliciesSerializer::cdr_serialized_size( template<> inline bool QosPoliciesSerializer::add_to_cdr_message( const PartitionQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addUInt16(cdr_message, qos_policy.Pid); + bool valid = rtps::CDRMessage::addUInt16(cdr_message, qos_policy.Pid); //Obtain qos_policy.length: uint16_t len = 4; @@ -447,13 +447,13 @@ inline bool QosPoliciesSerializer::add_to_cdr_message( len += static_cast(it->size()); //Already accounts for null char len = (len + 3) & ~3; } - valid &= fastrtps::rtps::CDRMessage::addUInt16(cdr_message, len); + valid &= rtps::CDRMessage::addUInt16(cdr_message, len); - valid &= fastrtps::rtps::CDRMessage::addUInt32(cdr_message, + valid &= rtps::CDRMessage::addUInt32(cdr_message, static_cast(qos_policy.size())); for (PartitionQosPolicy::const_iterator it = qos_policy.begin(); it != qos_policy.end(); ++it) { - valid &= fastrtps::rtps::CDRMessage::add_string(cdr_message, it->name()); + valid &= rtps::CDRMessage::add_string(cdr_message, it->name()); } return valid; @@ -462,7 +462,7 @@ inline bool QosPoliciesSerializer::add_to_cdr_message( template<> inline bool QosPoliciesSerializer::read_content_from_cdr_message( PartitionQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (qos_policy.max_size() != 0 && parameter_length > qos_policy.max_size() + 4) @@ -473,14 +473,14 @@ inline bool QosPoliciesSerializer::read_content_from_cdr_mes uint32_t pos_ref = cdr_message->pos; uint32_t num_partitions = 0; - bool valid = fastrtps::rtps::CDRMessage::readUInt32(cdr_message, &num_partitions); + bool valid = rtps::CDRMessage::readUInt32(cdr_message, &num_partitions); //partitions_.reserve(parameter_length - 4); for (size_t i = 0; i < num_partitions; ++i) { uint32_t partition_size, alignment; - valid &= fastrtps::rtps::CDRMessage::readUInt32(cdr_message, &partition_size); + valid &= rtps::CDRMessage::readUInt32(cdr_message, &partition_size); if (!valid) { return false; @@ -500,20 +500,20 @@ inline bool QosPoliciesSerializer::read_content_from_cdr_mes template<> inline bool QosPoliciesSerializer::add_content_to_cdr_message( const HistoryQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addOctet(cdr_message, qos_policy.kind); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); - valid &= fastrtps::rtps::CDRMessage::addInt32(cdr_message, qos_policy.depth); + bool valid = rtps::CDRMessage::addOctet(cdr_message, qos_policy.kind); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); + valid &= rtps::CDRMessage::addInt32(cdr_message, qos_policy.depth); return valid; } template<> inline bool QosPoliciesSerializer::read_content_from_cdr_message( HistoryQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_KIND_LENGTH + 4) @@ -521,36 +521,36 @@ inline bool QosPoliciesSerializer::read_content_from_cdr_messa return false; } qos_policy.length = parameter_length; - bool valid = fastrtps::rtps::CDRMessage::readOctet(cdr_message, (fastrtps::rtps::octet*)&qos_policy.kind); + bool valid = rtps::CDRMessage::readOctet(cdr_message, (fastdds::rtps::octet*)&qos_policy.kind); cdr_message->pos += 3; //padding - valid &= fastrtps::rtps::CDRMessage::readInt32(cdr_message, &qos_policy.depth); + valid &= rtps::CDRMessage::readInt32(cdr_message, &qos_policy.depth); return valid; } template<> inline bool QosPoliciesSerializer::add_content_to_cdr_message( const DurabilityServiceQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addInt32(cdr_message, + bool valid = rtps::CDRMessage::addInt32(cdr_message, qos_policy.service_cleanup_delay.seconds); - valid &= fastrtps::rtps::CDRMessage::addUInt32(cdr_message, + valid &= rtps::CDRMessage::addUInt32(cdr_message, qos_policy.service_cleanup_delay.fraction()); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, qos_policy.history_kind); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); - valid &= fastrtps::rtps::CDRMessage::addInt32(cdr_message, qos_policy.history_depth); - valid &= fastrtps::rtps::CDRMessage::addInt32(cdr_message, qos_policy.max_samples); - valid &= fastrtps::rtps::CDRMessage::addInt32(cdr_message, qos_policy.max_instances); - valid &= fastrtps::rtps::CDRMessage::addInt32(cdr_message, qos_policy.max_samples_per_instance); + valid &= rtps::CDRMessage::addOctet(cdr_message, qos_policy.history_kind); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); + valid &= rtps::CDRMessage::addInt32(cdr_message, qos_policy.history_depth); + valid &= rtps::CDRMessage::addInt32(cdr_message, qos_policy.max_samples); + valid &= rtps::CDRMessage::addInt32(cdr_message, qos_policy.max_instances); + valid &= rtps::CDRMessage::addInt32(cdr_message, qos_policy.max_samples_per_instance); return valid; } template<> inline bool QosPoliciesSerializer::read_content_from_cdr_message( DurabilityServiceQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_TIME_LENGTH + PARAMETER_KIND_LENGTH + 16) @@ -558,34 +558,34 @@ inline bool QosPoliciesSerializer::read_content_from return false; } qos_policy.length = parameter_length; - bool valid = fastrtps::rtps::CDRMessage::readInt32(cdr_message, + bool valid = rtps::CDRMessage::readInt32(cdr_message, &qos_policy.service_cleanup_delay.seconds); uint32_t frac(0); - valid &= fastrtps::rtps::CDRMessage::readUInt32(cdr_message, &frac); + valid &= rtps::CDRMessage::readUInt32(cdr_message, &frac); qos_policy.service_cleanup_delay.fraction(frac); - valid &= fastrtps::rtps::CDRMessage::readOctet(cdr_message, (fastrtps::rtps::octet*)&qos_policy.history_kind); + valid &= rtps::CDRMessage::readOctet(cdr_message, (fastdds::rtps::octet*)&qos_policy.history_kind); cdr_message->pos += 3; //padding - valid &= fastrtps::rtps::CDRMessage::readInt32(cdr_message, &qos_policy.history_depth); - valid &= fastrtps::rtps::CDRMessage::readInt32(cdr_message, &qos_policy.max_samples); - valid &= fastrtps::rtps::CDRMessage::readInt32(cdr_message, &qos_policy.max_instances); - valid &= fastrtps::rtps::CDRMessage::readInt32(cdr_message, &qos_policy.max_samples_per_instance); + valid &= rtps::CDRMessage::readInt32(cdr_message, &qos_policy.history_depth); + valid &= rtps::CDRMessage::readInt32(cdr_message, &qos_policy.max_samples); + valid &= rtps::CDRMessage::readInt32(cdr_message, &qos_policy.max_instances); + valid &= rtps::CDRMessage::readInt32(cdr_message, &qos_policy.max_samples_per_instance); return valid; } template<> inline bool QosPoliciesSerializer::add_content_to_cdr_message( const LifespanQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addInt32(cdr_message, qos_policy.duration.seconds); - valid &= fastrtps::rtps::CDRMessage::addUInt32(cdr_message, qos_policy.duration.fraction()); + bool valid = rtps::CDRMessage::addInt32(cdr_message, qos_policy.duration.seconds); + valid &= rtps::CDRMessage::addUInt32(cdr_message, qos_policy.duration.fraction()); return valid; } template<> inline bool QosPoliciesSerializer::read_content_from_cdr_message( LifespanQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_TIME_LENGTH) @@ -593,9 +593,9 @@ inline bool QosPoliciesSerializer::read_content_from_cdr_mess return false; } qos_policy.length = parameter_length; - bool valid = fastrtps::rtps::CDRMessage::readInt32(cdr_message, &qos_policy.duration.seconds); + bool valid = rtps::CDRMessage::readInt32(cdr_message, &qos_policy.duration.seconds); uint32_t frac(0); - valid &= fastrtps::rtps::CDRMessage::readUInt32(cdr_message, &frac); + valid &= rtps::CDRMessage::readUInt32(cdr_message, &frac); qos_policy.duration.fraction(frac); return valid; } @@ -603,16 +603,16 @@ inline bool QosPoliciesSerializer::read_content_from_cdr_mess template<> inline bool QosPoliciesSerializer::add_content_to_cdr_message( const OwnershipStrengthQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addUInt32(cdr_message, qos_policy.value); + bool valid = rtps::CDRMessage::addUInt32(cdr_message, qos_policy.value); return valid; } template<> inline bool QosPoliciesSerializer::read_content_from_cdr_message( OwnershipStrengthQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != 4) @@ -620,22 +620,22 @@ inline bool QosPoliciesSerializer::read_content_from return false; } qos_policy.length = parameter_length; - return fastrtps::rtps::CDRMessage::readUInt32(cdr_message, &qos_policy.value); + return rtps::CDRMessage::readUInt32(cdr_message, &qos_policy.value); } template<> inline bool QosPoliciesSerializer::add_content_to_cdr_message( const TransportPriorityQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addUInt32(cdr_message, qos_policy.value); + bool valid = rtps::CDRMessage::addUInt32(cdr_message, qos_policy.value); return valid; } template<> inline bool QosPoliciesSerializer::read_content_from_cdr_message( TransportPriorityQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != 4) @@ -643,7 +643,7 @@ inline bool QosPoliciesSerializer::read_content_from return false; } qos_policy.length = parameter_length; - return fastrtps::rtps::CDRMessage::readUInt32(cdr_message, &qos_policy.value); + return rtps::CDRMessage::readUInt32(cdr_message, &qos_policy.value); } template<> @@ -661,24 +661,24 @@ inline uint32_t QosPoliciesSerializer::cdr_serializ template<> inline bool QosPoliciesSerializer::add_to_cdr_message( const DataRepresentationQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addUInt16(cdr_message, qos_policy.Pid); + bool valid = rtps::CDRMessage::addUInt16(cdr_message, qos_policy.Pid); uint16_t len = static_cast(qos_policy.m_value.size() * sizeof(uint16_t)) + 4; len = (len + 3) & ~3; - valid &= fastrtps::rtps::CDRMessage::addUInt16(cdr_message, len); + valid &= rtps::CDRMessage::addUInt16(cdr_message, len); valid &= - fastrtps::rtps::CDRMessage::addUInt32(cdr_message, + rtps::CDRMessage::addUInt32(cdr_message, static_cast(qos_policy.m_value.size())); for (const DataRepresentationId_t& id : qos_policy.m_value) { - valid &= fastrtps::rtps::CDRMessage::addUInt16(cdr_message, static_cast(id)); + valid &= rtps::CDRMessage::addUInt16(cdr_message, static_cast(id)); } if (qos_policy.m_value.size() % 2 == 1) // Odd, we must align { - valid &= fastrtps::rtps::CDRMessage::addUInt16(cdr_message, uint16_t(0)); + valid &= rtps::CDRMessage::addUInt16(cdr_message, uint16_t(0)); } return valid; } @@ -686,17 +686,17 @@ inline bool QosPoliciesSerializer::add_to_cdr_messa template<> inline bool QosPoliciesSerializer::read_content_from_cdr_message( DataRepresentationQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { qos_policy.length = parameter_length; int16_t temp(0); uint32_t datasize(0); - bool valid = fastrtps::rtps::CDRMessage::readUInt32(cdr_message, &datasize); + bool valid = rtps::CDRMessage::readUInt32(cdr_message, &datasize); for (uint32_t i = 0; i < datasize; ++i) { - valid &= fastrtps::rtps::CDRMessage::readInt16(cdr_message, &temp); + valid &= rtps::CDRMessage::readInt16(cdr_message, &temp); qos_policy.m_value.push_back(static_cast(temp)); } return valid; @@ -705,32 +705,32 @@ inline bool QosPoliciesSerializer::read_content_fro template<> inline bool QosPoliciesSerializer::add_content_to_cdr_message( const TypeConsistencyEnforcementQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addUInt16(cdr_message, qos_policy.m_kind); + bool valid = rtps::CDRMessage::addUInt16(cdr_message, qos_policy.m_kind); valid &= - fastrtps::rtps::CDRMessage::addOctet(cdr_message, - static_cast(qos_policy.m_ignore_sequence_bounds)); + rtps::CDRMessage::addOctet(cdr_message, + static_cast(qos_policy.m_ignore_sequence_bounds)); valid &= - fastrtps::rtps::CDRMessage::addOctet(cdr_message, - static_cast(qos_policy.m_ignore_string_bounds)); + rtps::CDRMessage::addOctet(cdr_message, + static_cast(qos_policy.m_ignore_string_bounds)); valid &= - fastrtps::rtps::CDRMessage::addOctet(cdr_message, - static_cast(qos_policy.m_ignore_member_names)); + rtps::CDRMessage::addOctet(cdr_message, + static_cast(qos_policy.m_ignore_member_names)); valid &= - fastrtps::rtps::CDRMessage::addOctet(cdr_message, - static_cast(qos_policy.m_prevent_type_widening)); + rtps::CDRMessage::addOctet(cdr_message, + static_cast(qos_policy.m_prevent_type_widening)); valid &= - fastrtps::rtps::CDRMessage::addOctet(cdr_message, - static_cast(qos_policy.m_force_type_validation)); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, fastrtps::rtps::octet(0x00)); // 8th byte + rtps::CDRMessage::addOctet(cdr_message, + static_cast(qos_policy.m_force_type_validation)); + valid &= rtps::CDRMessage::addOctet(cdr_message, rtps::octet(0x00)); // 8th byte return valid; } template<> inline bool QosPoliciesSerializer::read_content_from_cdr_message( TypeConsistencyEnforcementQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length < 2) @@ -739,43 +739,43 @@ inline bool QosPoliciesSerializer::read_con } uint16_t uKind(0); - fastrtps::rtps::octet temp(0); + rtps::octet temp(0); qos_policy.m_ignore_sequence_bounds = false; qos_policy.m_ignore_string_bounds = false; qos_policy.m_ignore_member_names = false; qos_policy.m_prevent_type_widening = false; qos_policy.m_force_type_validation = false; - bool valid = fastrtps::rtps::CDRMessage::readUInt16(cdr_message, &uKind); + bool valid = rtps::CDRMessage::readUInt16(cdr_message, &uKind); qos_policy.m_kind = static_cast(uKind); if (parameter_length >= 3) { - valid &= fastrtps::rtps::CDRMessage::readOctet(cdr_message, &temp); + valid &= rtps::CDRMessage::readOctet(cdr_message, &temp); qos_policy.m_ignore_sequence_bounds = temp == 0 ? false : true; } if (valid && parameter_length >= 4) { - valid &= fastrtps::rtps::CDRMessage::readOctet(cdr_message, &temp); + valid &= rtps::CDRMessage::readOctet(cdr_message, &temp); qos_policy.m_ignore_string_bounds = temp == 0 ? false : true; } if (valid && parameter_length >= 5) { - valid &= fastrtps::rtps::CDRMessage::readOctet(cdr_message, &temp); + valid &= rtps::CDRMessage::readOctet(cdr_message, &temp); qos_policy.m_ignore_member_names = temp == 0 ? false : true; } if (valid && parameter_length >= 6) { - valid &= fastrtps::rtps::CDRMessage::readOctet(cdr_message, &temp); + valid &= rtps::CDRMessage::readOctet(cdr_message, &temp); qos_policy.m_prevent_type_widening = temp == 0 ? false : true; } if (valid && parameter_length >= 7) { - valid &= fastrtps::rtps::CDRMessage::readOctet(cdr_message, &temp); + valid &= rtps::CDRMessage::readOctet(cdr_message, &temp); qos_policy.m_force_type_validation = temp == 0 ? false : true; } @@ -785,19 +785,19 @@ inline bool QosPoliciesSerializer::read_con template<> inline bool QosPoliciesSerializer::add_content_to_cdr_message( const DisablePositiveACKsQosPolicy&, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addOctet(cdr_message, (fastrtps::rtps::octet)0x01); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, (fastrtps::rtps::octet)0x00); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, (fastrtps::rtps::octet)0x00); - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, (fastrtps::rtps::octet)0x00); + bool valid = rtps::CDRMessage::addOctet(cdr_message, (fastdds::rtps::octet)0x01); + valid &= rtps::CDRMessage::addOctet(cdr_message, (fastdds::rtps::octet)0x00); + valid &= rtps::CDRMessage::addOctet(cdr_message, (fastdds::rtps::octet)0x00); + valid &= rtps::CDRMessage::addOctet(cdr_message, (fastdds::rtps::octet)0x00); return valid; } template<> inline bool QosPoliciesSerializer::read_content_from_cdr_message( DisablePositiveACKsQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { if (parameter_length != PARAMETER_BOOL_LENGTH) @@ -805,8 +805,8 @@ inline bool QosPoliciesSerializer::read_content_fr return false; } qos_policy.length = parameter_length; - fastrtps::rtps::octet value(0); - bool valid = fastrtps::rtps::CDRMessage::readOctet(cdr_message, &value); + rtps::octet value(0); + bool valid = rtps::CDRMessage::readOctet(cdr_message, &value); qos_policy.enabled = (value == 0) ? false : true; cdr_message->pos += 3; //padding return valid; @@ -825,21 +825,21 @@ inline uint32_t QosPoliciesSerializer::cdr_serialized_size template<> inline bool QosPoliciesSerializer::add_to_cdr_message( const DataSharingQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addUInt16(cdr_message, qos_policy.Pid); + bool valid = rtps::CDRMessage::addUInt16(cdr_message, qos_policy.Pid); //Obtain qos_policy.length: str_length + str_data uint16_t len = 4 + static_cast(qos_policy.domain_ids().size()) * 8; - valid &= fastrtps::rtps::CDRMessage::addUInt16(cdr_message, len); + valid &= rtps::CDRMessage::addUInt16(cdr_message, len); //Add the values: - valid &= fastrtps::rtps::CDRMessage::addUInt32(cdr_message, + valid &= rtps::CDRMessage::addUInt32(cdr_message, static_cast(qos_policy.domain_ids().size())); for (uint64_t id : qos_policy.domain_ids()) { - valid &= fastrtps::rtps::CDRMessage::addUInt64(cdr_message, id); + valid &= rtps::CDRMessage::addUInt64(cdr_message, id); } return valid; @@ -848,7 +848,7 @@ inline bool QosPoliciesSerializer::add_to_cdr_message( template<> inline bool QosPoliciesSerializer::read_content_from_cdr_message( DataSharingQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { qos_policy.length = parameter_length; @@ -858,7 +858,7 @@ inline bool QosPoliciesSerializer::read_content_from_cdr_m qos_policy.on("."); uint32_t num_domains = 0; - bool valid = fastrtps::rtps::CDRMessage::readUInt32(cdr_message, &num_domains); + bool valid = rtps::CDRMessage::readUInt32(cdr_message, &num_domains); if (!valid || (qos_policy.max_domains() != 0 && num_domains > qos_policy.max_domains())) { @@ -868,7 +868,7 @@ inline bool QosPoliciesSerializer::read_content_from_cdr_m for (size_t i = 0; i < num_domains; ++i) { uint64_t domain {0}; - valid &= fastrtps::rtps::CDRMessage::readUInt64(cdr_message, &domain); + valid &= rtps::CDRMessage::readUInt64(cdr_message, &domain); qos_policy.add_domain_id(domain); } @@ -890,13 +890,13 @@ inline uint32_t QosPoliciesSerializer::cdr_serialized_size( template<> inline bool QosPoliciesSerializer::add_to_cdr_message( const TypeIdV1& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { eprosima::fastcdr::CdrSizeCalculator calculator(eprosima::fastcdr::CdrVersion::XCDRv1); size_t current_alignment {0}; size_t size = calculator.calculate_serialized_size(qos_policy.m_type_identifier, current_alignment) - + eprosima::fastrtps::rtps::SerializedPayload_t::representation_header_size; - fastrtps::rtps::SerializedPayload_t payload(static_cast(size)); + + eprosima::fastdds::rtps::SerializedPayload_t::representation_header_size; + rtps::SerializedPayload_t payload(static_cast(size)); eprosima::fastcdr::FastBuffer fastbuffer((char*) payload.data, payload.max_size); eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, @@ -914,13 +914,13 @@ inline bool QosPoliciesSerializer::add_to_cdr_message( size = (ser.get_serialized_data_length() + 3) & ~3; #endif // FASTCDR_VERSION_MAJOR == 1 - bool valid = fastrtps::rtps::CDRMessage::addUInt16(cdr_message, qos_policy.Pid); - valid &= fastrtps::rtps::CDRMessage::addUInt16(cdr_message, static_cast(size)); - valid &= fastrtps::rtps::CDRMessage::addData(cdr_message, payload.data, payload.length); + bool valid = rtps::CDRMessage::addUInt16(cdr_message, qos_policy.Pid); + valid &= rtps::CDRMessage::addUInt16(cdr_message, static_cast(size)); + valid &= rtps::CDRMessage::addData(cdr_message, payload.data, payload.length); for (uint32_t count = payload.length; count < size; ++count) { - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); } return valid; @@ -929,13 +929,13 @@ inline bool QosPoliciesSerializer::add_to_cdr_message( template<> inline bool QosPoliciesSerializer::read_content_from_cdr_message( TypeIdV1& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { - fastrtps::rtps::SerializedPayload_t payload(parameter_length); + rtps::SerializedPayload_t payload(parameter_length); eprosima::fastcdr::FastBuffer fastbuffer((char*)payload.data, parameter_length); - fastrtps::rtps::CDRMessage::readData(cdr_message, payload.data, parameter_length); // Object that manages the raw buffer. + rtps::CDRMessage::readData(cdr_message, payload.data, parameter_length); // Object that manages the raw buffer. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN #if FASTCDR_VERSION_MAJOR == 1 @@ -972,13 +972,13 @@ inline uint32_t QosPoliciesSerializer::cdr_serialized_size( template<> inline bool QosPoliciesSerializer::add_to_cdr_message( const TypeObjectV1& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { eprosima::fastcdr::CdrSizeCalculator calculator(eprosima::fastcdr::CdrVersion::XCDRv1); size_t current_alignment {0}; size_t size = calculator.calculate_serialized_size(qos_policy.m_type_object, current_alignment) - + eprosima::fastrtps::rtps::SerializedPayload_t::representation_header_size; - fastrtps::rtps::SerializedPayload_t payload(static_cast(size)); + + eprosima::fastdds::rtps::SerializedPayload_t::representation_header_size; + rtps::SerializedPayload_t payload(static_cast(size)); eprosima::fastcdr::FastBuffer fastbuffer((char*) payload.data, payload.max_size); eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, @@ -996,13 +996,13 @@ inline bool QosPoliciesSerializer::add_to_cdr_message( size = (ser.get_serialized_data_length() + 3) & ~3; #endif // FASTCDR_VERSION_MAJOR == 1 - bool valid = fastrtps::rtps::CDRMessage::addUInt16(cdr_message, qos_policy.Pid); - valid &= fastrtps::rtps::CDRMessage::addUInt16(cdr_message, static_cast(size)); - valid &= fastrtps::rtps::CDRMessage::addData(cdr_message, payload.data, payload.length); + bool valid = rtps::CDRMessage::addUInt16(cdr_message, qos_policy.Pid); + valid &= rtps::CDRMessage::addUInt16(cdr_message, static_cast(size)); + valid &= rtps::CDRMessage::addData(cdr_message, payload.data, payload.length); for (uint32_t count = payload.length; count < size; ++count) { - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); } return valid; @@ -1011,13 +1011,13 @@ inline bool QosPoliciesSerializer::add_to_cdr_message( template<> inline bool QosPoliciesSerializer::read_content_from_cdr_message( TypeObjectV1& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { - fastrtps::rtps::SerializedPayload_t payload(parameter_length); + rtps::SerializedPayload_t payload(parameter_length); eprosima::fastcdr::FastBuffer fastbuffer((char*)payload.data, parameter_length); - fastrtps::rtps::CDRMessage::readData(cdr_message, payload.data, parameter_length); // Object that manages the raw buffer. + rtps::CDRMessage::readData(cdr_message, payload.data, parameter_length); // Object that manages the raw buffer. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN #if FASTCDR_VERSION_MAJOR == 1 @@ -1054,14 +1054,14 @@ inline uint32_t QosPoliciesSerializer::cdr_ser template<> inline bool QosPoliciesSerializer::add_to_cdr_message( const xtypes::TypeInformationParameter& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { eprosima::fastcdr::CdrSizeCalculator calculator(eprosima::fastcdr::CdrVersion::XCDRv2); size_t current_alignment {0}; size_t size = calculator.calculate_serialized_size(qos_policy.type_information, - current_alignment) + eprosima::fastrtps::rtps::SerializedPayload_t::representation_header_size; - fastrtps::rtps::SerializedPayload_t payload(static_cast(size)); + current_alignment) + eprosima::fastdds::rtps::SerializedPayload_t::representation_header_size; + rtps::SerializedPayload_t payload(static_cast(size)); eprosima::fastcdr::FastBuffer fastbuffer((char*) payload.data, payload.max_size); eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, @@ -1079,13 +1079,13 @@ inline bool QosPoliciesSerializer::add_to_cdr_ size = (ser.get_serialized_data_length() + 3) & ~3; #endif // FASTCDR_VERSION_MAJOR == 1 - bool valid = fastrtps::rtps::CDRMessage::addUInt16(cdr_message, qos_policy.Pid); - valid &= fastrtps::rtps::CDRMessage::addUInt16(cdr_message, static_cast(size)); - valid &= fastrtps::rtps::CDRMessage::addData(cdr_message, payload.data, payload.length); + bool valid = rtps::CDRMessage::addUInt16(cdr_message, qos_policy.Pid); + valid &= rtps::CDRMessage::addUInt16(cdr_message, static_cast(size)); + valid &= rtps::CDRMessage::addData(cdr_message, payload.data, payload.length); for (uint32_t count = payload.length; count < size; ++count) { - valid &= fastrtps::rtps::CDRMessage::addOctet(cdr_message, 0); + valid &= rtps::CDRMessage::addOctet(cdr_message, 0); } return valid; @@ -1094,13 +1094,13 @@ inline bool QosPoliciesSerializer::add_to_cdr_ template<> inline bool QosPoliciesSerializer::read_content_from_cdr_message( xtypes::TypeInformationParameter& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { - fastrtps::rtps::SerializedPayload_t payload(parameter_length); + rtps::SerializedPayload_t payload(parameter_length); eprosima::fastcdr::FastBuffer fastbuffer((char*)payload.data, parameter_length); - fastrtps::rtps::CDRMessage::readData(cdr_message, payload.data, parameter_length); // Object that manages the raw buffer. + rtps::CDRMessage::readData(cdr_message, payload.data, parameter_length); // Object that manages the raw buffer. eprosima::fastcdr::Cdr deser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, eprosima::fastcdr::CdrVersion::XCDRv2); @@ -1132,27 +1132,27 @@ inline uint32_t QosPoliciesSerializer::cdr_serialized_size template<> inline bool QosPoliciesSerializer::add_to_cdr_message( const GenericDataQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { - bool valid = fastrtps::rtps::CDRMessage::addUInt16(cdr_message, qos_policy.Pid); + bool valid = rtps::CDRMessage::addUInt16(cdr_message, qos_policy.Pid); uint16_t siz = static_cast(qos_policy.size()); siz = (siz + 3) & ~3; - valid &= fastrtps::rtps::CDRMessage::addUInt16(cdr_message, static_cast(4 + siz)); - valid &= fastrtps::rtps::CDRMessage::addOctetVector(cdr_message, &qos_policy.data_vec(), true); + valid &= rtps::CDRMessage::addUInt16(cdr_message, static_cast(4 + siz)); + valid &= rtps::CDRMessage::addOctetVector(cdr_message, &qos_policy.data_vec(), true); return valid; } template<> inline bool QosPoliciesSerializer::read_content_from_cdr_message( GenericDataQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { uint32_t pos_ref = cdr_message->pos; // Read size of data uint32_t len; - if (!fastrtps::rtps::CDRMessage::readUInt32(cdr_message, &len)) + if (!fastdds::rtps::CDRMessage::readUInt32(cdr_message, &len)) { return false; } @@ -1166,7 +1166,7 @@ inline bool QosPoliciesSerializer::read_content_from_cdr_m // Either the data is size limited and already has max_size() allocated // or it is not limited and we resize if needed qos_policy.resize(len); - if (!fastrtps::rtps::CDRMessage::readData(cdr_message, qos_policy.data(), len)) + if (!fastdds::rtps::CDRMessage::readData(cdr_message, qos_policy.data(), len)) { return false; } @@ -1196,7 +1196,7 @@ inline uint32_t QosPoliciesSerializer::cdr_serialized_size( template<> inline bool QosPoliciesSerializer::add_to_cdr_message( const UserDataQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { return QosPoliciesSerializer::add_to_cdr_message(qos_policy, cdr_message); } @@ -1204,7 +1204,7 @@ inline bool QosPoliciesSerializer::add_to_cdr_message( template<> inline bool QosPoliciesSerializer::read_from_cdr_message( UserDataQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { return QosPoliciesSerializer::read_from_cdr_message(qos_policy, cdr_message, @@ -1221,7 +1221,7 @@ inline uint32_t QosPoliciesSerializer::cdr_serialized_size( template<> inline bool QosPoliciesSerializer::add_to_cdr_message( const GroupDataQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { return QosPoliciesSerializer::add_to_cdr_message(qos_policy, cdr_message); } @@ -1229,7 +1229,7 @@ inline bool QosPoliciesSerializer::add_to_cdr_message( template<> inline bool QosPoliciesSerializer::read_from_cdr_message( GroupDataQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { return QosPoliciesSerializer::read_from_cdr_message(qos_policy, cdr_message, @@ -1246,7 +1246,7 @@ inline uint32_t QosPoliciesSerializer::cdr_serialized_size( template<> inline bool QosPoliciesSerializer::add_to_cdr_message( const TopicDataQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message) + rtps::CDRMessage_t* cdr_message) { return QosPoliciesSerializer::add_to_cdr_message(qos_policy, cdr_message); } @@ -1254,7 +1254,7 @@ inline bool QosPoliciesSerializer::add_to_cdr_message( template<> inline bool QosPoliciesSerializer::read_from_cdr_message( TopicDataQosPolicy& qos_policy, - fastrtps::rtps::CDRMessage_t* cdr_message, + rtps::CDRMessage_t* cdr_message, const uint16_t parameter_length) { return QosPoliciesSerializer::read_from_cdr_message(qos_policy, cdr_message, diff --git a/src/cpp/fastdds/domain/DomainParticipant.cpp b/src/cpp/fastdds/domain/DomainParticipant.cpp index b07dfeaa04e..df90f9c64bd 100644 --- a/src/cpp/fastdds/domain/DomainParticipant.cpp +++ b/src/cpp/fastdds/domain/DomainParticipant.cpp @@ -22,8 +22,9 @@ #include #include -using namespace eprosima; -using namespace eprosima::fastdds::dds; +namespace eprosima { +namespace fastdds { +namespace dds { DomainParticipant::DomainParticipant( const StatusMask& mask) @@ -251,7 +252,7 @@ ReturnCode_t DomainParticipant::unregister_content_filter_factory( Topic* DomainParticipant::find_topic( const std::string& topic_name, - const fastrtps::Duration_t& timeout) + const fastdds::Duration_t& timeout) { return impl_->find_topic(topic_name, timeout); } @@ -439,7 +440,7 @@ bool DomainParticipant::contains_entity( } ReturnCode_t DomainParticipant::get_current_time( - fastrtps::Time_t& current_time) const + fastdds::Time_t& current_time) const { return impl_->get_current_time(current_time); } @@ -474,7 +475,7 @@ const InstanceHandle_t& DomainParticipant::get_instance_handle() const return impl_->get_instance_handle(); } -const fastrtps::rtps::GUID_t& DomainParticipant::guid() const +const fastdds::rtps::GUID_t& DomainParticipant::guid() const { return impl_->guid(); } @@ -485,9 +486,9 @@ std::vector DomainParticipant::get_participant_names() const } bool DomainParticipant::new_remote_endpoint_discovered( - const fastrtps::rtps::GUID_t& partguid, + const fastdds::rtps::GUID_t& partguid, uint16_t userId, - fastrtps::rtps::EndpointKind_t kind) + fastdds::rtps::EndpointKind_t kind) { return impl_->new_remote_endpoint_discovered(partguid, userId, kind); } @@ -496,3 +497,7 @@ bool DomainParticipant::has_active_entities() { return impl_->has_active_entities(); } + +} // namespace dds +} // namespace fastdds +} // namespace eprosima diff --git a/src/cpp/fastdds/domain/DomainParticipantFactory.cpp b/src/cpp/fastdds/domain/DomainParticipantFactory.cpp index ef3850c4bad..733087f5b9c 100644 --- a/src/cpp/fastdds/domain/DomainParticipantFactory.cpp +++ b/src/cpp/fastdds/domain/DomainParticipantFactory.cpp @@ -40,12 +40,10 @@ #include #include -using namespace eprosima::fastrtps::xmlparser; +using namespace eprosima::fastdds::xmlparser; -using eprosima::fastdds::dds::Log; - -using eprosima::fastrtps::rtps::RTPSDomain; -using eprosima::fastrtps::rtps::RTPSParticipant; +using eprosima::fastdds::rtps::RTPSDomain; +using eprosima::fastdds::rtps::RTPSParticipant; namespace eprosima { namespace fastdds { @@ -55,8 +53,8 @@ DomainParticipantFactory::DomainParticipantFactory() : default_xml_profiles_loaded(false) , default_domain_id_(0) , default_participant_qos_(PARTICIPANT_QOS_DEFAULT) - , topic_pool_(fastrtps::rtps::TopicPayloadPoolRegistry::instance()) - , rtps_domain_(fastrtps::rtps::RTPSDomainImpl::get_instance()) + , topic_pool_(rtps::TopicPayloadPoolRegistry::instance()) + , rtps_domain_(rtps::RTPSDomainImpl::get_instance()) , log_resources_(detail::get_log_resources()) { } @@ -77,11 +75,11 @@ DomainParticipantFactory::~DomainParticipantFactory() } // Deletes DynamicTypes and TypeObject factories - fastdds::dds::DynamicDataFactory::delete_instance(); - fastdds::dds::DynamicTypeBuilderFactory::delete_instance(); + dds::DynamicDataFactory::delete_instance(); + dds::DynamicTypeBuilderFactory::delete_instance(); std::this_thread::sleep_for(std::chrono::milliseconds(100)); - eprosima::fastdds::dds::Log::KillThread(); + Log::KillThread(); } DomainParticipantFactory* DomainParticipantFactory::get_instance() @@ -112,8 +110,8 @@ ReturnCode_t DomainParticipantFactory::delete_participant( std::lock_guard guard(mtx_participants_); #ifdef FASTDDS_STATISTICS // Delete builtin statistics entities - eprosima::fastdds::statistics::dds::DomainParticipantImpl* stat_part_impl = - static_cast(part->impl_); + statistics::dds::DomainParticipantImpl* stat_part_impl = + static_cast(part->impl_); stat_part_impl->delete_statistics_builtin_entities(); #endif // ifdef FASTDDS_STATISTICS if (part->has_active_entities()) @@ -165,11 +163,11 @@ DomainParticipant* DomainParticipantFactory::create_participant( #ifndef FASTDDS_STATISTICS DomainParticipantImpl* dom_part_impl = new DomainParticipantImpl(dom_part, did, pqos, listener); #else - eprosima::fastdds::statistics::dds::DomainParticipantImpl* dom_part_impl = - new eprosima::fastdds::statistics::dds::DomainParticipantImpl(dom_part, did, pqos, listener); + statistics::dds::DomainParticipantImpl* dom_part_impl = + new statistics::dds::DomainParticipantImpl(dom_part, did, pqos, listener); #endif // FASTDDS_STATISTICS - if (fastrtps::rtps::GUID_t::unknown() != dom_part_impl->guid()) + if (fastdds::rtps::GUID_t::unknown() != dom_part_impl->guid()) { { std::lock_guard guard(mtx_participants_); @@ -362,7 +360,7 @@ ReturnCode_t DomainParticipantFactory::load_profiles() reset_default_participant_qos(); } // Take the default domain id from the default participant profile - eprosima::fastdds::ParticipantAttributes attr; + ParticipantAttributes attr; XMLProfileManager::getDefaultParticipantAttributes(attr); default_domain_id_ = attr.domainId; @@ -398,7 +396,7 @@ ReturnCode_t DomainParticipantFactory::load_XML_profiles_string( ReturnCode_t DomainParticipantFactory::check_xml_static_discovery( std::string& xml_file) { - eprosima::fastrtps::xmlparser::XMLEndpointParser parser; + xmlparser::XMLEndpointParser parser; if (XMLP_ret::XML_OK != parser.loadXMLFile(xml_file)) { EPROSIMA_LOG_ERROR(DOMAIN, "Error parsing xml file"); diff --git a/src/cpp/fastdds/domain/DomainParticipantImpl.cpp b/src/cpp/fastdds/domain/DomainParticipantImpl.cpp index 58617cd1705..21e56ba07ca 100644 --- a/src/cpp/fastdds/domain/DomainParticipantImpl.cpp +++ b/src/cpp/fastdds/domain/DomainParticipantImpl.cpp @@ -71,26 +71,23 @@ namespace eprosima { namespace fastdds { namespace dds { -using fastrtps::xmlparser::XMLProfileManager; -using fastrtps::xmlparser::XMLP_ret; -using fastrtps::TopicAttributes; -using fastrtps::rtps::ParticipantDiscoveryInfo; -using fastrtps::rtps::RTPSDomain; -using fastrtps::rtps::RTPSDomainImpl; -using fastrtps::rtps::RTPSParticipant; -using fastrtps::TopicAttributes; -using fastrtps::xmlparser::XMLP_ret; -using fastrtps::xmlparser::XMLProfileManager; +using xmlparser::XMLProfileManager; +using xmlparser::XMLP_ret; +using rtps::ParticipantDiscoveryInfo; +using rtps::RTPSDomain; +using rtps::RTPSDomainImpl; +using rtps::RTPSParticipant; +using xmlparser::XMLP_ret; +using xmlparser::XMLProfileManager; #if HAVE_SECURITY -using fastrtps::rtps::ParticipantAuthenticationInfo; +using rtps::ParticipantAuthenticationInfo; #endif // if HAVE_SECURITY -using eprosima::fastdds::dds::Log; -using fastrtps::rtps::EndpointKind_t; -using fastrtps::rtps::ReaderDiscoveryInfo; -using fastrtps::rtps::ReaderProxyData; -using fastrtps::rtps::ResourceEvent; -using fastrtps::rtps::WriterDiscoveryInfo; -using fastrtps::rtps::WriterProxyData; +using rtps::EndpointKind_t; +using rtps::ReaderDiscoveryInfo; +using rtps::ReaderProxyData; +using rtps::ResourceEvent; +using rtps::WriterDiscoveryInfo; +using rtps::WriterProxyData; DomainParticipantImpl::DomainParticipantImpl( DomainParticipant* dp, @@ -126,20 +123,20 @@ DomainParticipantImpl::DomainParticipantImpl( // Pre calculate participant id and generated guid participant_id_ = qos_.wire_protocol().participant_id; - if (!eprosima::fastrtps::rtps::RTPSDomainImpl::create_participant_guid(participant_id_, guid_)) + if (!eprosima::fastdds::rtps::RTPSDomainImpl::create_participant_guid(participant_id_, guid_)) { EPROSIMA_LOG_ERROR(DOMAIN_PARTICIPANT, "Error generating GUID for participant"); } /* Fill physical data properties if they are found and empty */ - std::string* property_value = fastrtps::rtps::PropertyPolicyHelper::find_property( + std::string* property_value = fastdds::rtps::PropertyPolicyHelper::find_property( qos_.properties(), parameter_policy_physical_data_host); if (nullptr != property_value && property_value->empty()) { property_value->assign(asio::ip::host_name() + ":" + std::to_string(utils::default_domain_id())); } - property_value = fastrtps::rtps::PropertyPolicyHelper::find_property( + property_value = fastdds::rtps::PropertyPolicyHelper::find_property( qos_.properties(), parameter_policy_physical_data_user); if (nullptr != property_value && property_value->empty()) { @@ -150,7 +147,7 @@ DomainParticipantImpl::DomainParticipantImpl( } } - property_value = fastrtps::rtps::PropertyPolicyHelper::find_property( + property_value = fastdds::rtps::PropertyPolicyHelper::find_property( qos_.properties(), parameter_policy_physical_data_process); if (nullptr != property_value && property_value->empty()) { @@ -257,9 +254,9 @@ ReturnCode_t DomainParticipantImpl::enable() // Should not have been previously enabled assert(get_rtps_participant() == nullptr); // Should not have failed assigning the GUID - assert (guid_ != fastrtps::rtps::GUID_t::unknown()); + assert (guid_ != fastdds::rtps::GUID_t::unknown()); - fastrtps::rtps::RTPSParticipantAttributes rtps_attr; + fastdds::rtps::RTPSParticipantAttributes rtps_attr; utils::set_attributes_from_qos(rtps_attr, qos_); rtps_attr.participantID = participant_id_; @@ -340,8 +337,8 @@ ReturnCode_t DomainParticipantImpl::set_qos( { bool enabled = false; bool qos_should_be_updated = false; - fastrtps::rtps::RTPSParticipantAttributes patt; - fastrtps::rtps::RTPSParticipant* rtps_participant = nullptr; + fastdds::rtps::RTPSParticipantAttributes patt; + fastdds::rtps::RTPSParticipant* rtps_participant = nullptr; { std::lock_guard _(mtx_gs_); @@ -461,7 +458,7 @@ ReturnCode_t DomainParticipantImpl::delete_subscriber( Topic* DomainParticipantImpl::find_topic( const std::string& topic_name, - const fastrtps::Duration_t& timeout) + const fastdds::Duration_t& timeout) { auto find_fn = [this, &topic_name]() { @@ -757,7 +754,7 @@ const InstanceHandle_t& DomainParticipantImpl::get_instance_handle() const return static_cast(guid_); } -const fastrtps::rtps::GUID_t& DomainParticipantImpl::guid() const +const fastdds::rtps::GUID_t& DomainParticipantImpl::guid() const { return guid_; } @@ -971,7 +968,7 @@ ReturnCode_t DomainParticipantImpl::delete_contained_entities() ReturnCode_t DomainParticipantImpl::assert_liveliness() { - fastrtps::rtps::RTPSParticipant* rtps_participant = get_rtps_participant(); + fastdds::rtps::RTPSParticipant* rtps_participant = get_rtps_participant(); if (rtps_participant == nullptr) { return RETCODE_NOT_ENABLED; @@ -1246,7 +1243,7 @@ bool DomainParticipantImpl::contains_entity( } ReturnCode_t DomainParticipantImpl::get_current_time( - fastrtps::Time_t& current_time) const + fastdds::Time_t& current_time) const { auto now = std::chrono::system_clock::now(); auto duration = now.time_since_epoch(); @@ -1593,13 +1590,13 @@ void DomainParticipantImpl::MyRTPSParticipantListener::onWriterDiscovery( } bool DomainParticipantImpl::new_remote_endpoint_discovered( - const fastrtps::rtps::GUID_t& partguid, + const fastdds::rtps::GUID_t& partguid, uint16_t endpointId, EndpointKind_t kind) { if (get_rtps_participant() != nullptr) { - if (kind == fastrtps::rtps::WRITER) + if (kind == fastdds::rtps::WRITER) { return get_rtps_participant()->newRemoteWriterDiscovered(partguid, static_cast(endpointId)); } @@ -1858,7 +1855,7 @@ bool DomainParticipantImpl::can_qos_be_updated( void DomainParticipantImpl::create_instance_handle( InstanceHandle_t& handle) { - using eprosima::fastrtps::rtps::octet; + using rtps::octet; uint32_t id = ++next_instance_id_; handle = guid_; diff --git a/src/cpp/fastdds/domain/DomainParticipantImpl.hpp b/src/cpp/fastdds/domain/DomainParticipantImpl.hpp index bf93ed1338b..1516a4e14eb 100644 --- a/src/cpp/fastdds/domain/DomainParticipantImpl.hpp +++ b/src/cpp/fastdds/domain/DomainParticipantImpl.hpp @@ -44,7 +44,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { @@ -57,9 +57,6 @@ class ReaderProxyData; class PublisherAttributes; class SubscriberAttributes; -} // namespace fastrtps - -namespace fastdds { namespace dds { class DomainParticipant; @@ -251,7 +248,7 @@ class DomainParticipantImpl */ Topic* find_topic( const std::string& topic_name, - const fastrtps::Duration_t& timeout); + const fastdds::Duration_t& timeout); /** * Implementation of Topic::set_listener that propagates the listener and mask to all the TopicProxy @@ -434,7 +431,7 @@ class DomainParticipantImpl bool recursive = true) const; ReturnCode_t get_current_time( - fastrtps::Time_t& current_time) const; + fastdds::Time_t& current_time) const; const DomainParticipant* get_participant() const { @@ -448,13 +445,13 @@ class DomainParticipantImpl return participant_; } - const fastrtps::rtps::RTPSParticipant* get_rtps_participant() const + const fastdds::rtps::RTPSParticipant* get_rtps_participant() const { std::lock_guard _(mtx_gs_); return rtps_participant_; } - fastrtps::rtps::RTPSParticipant* get_rtps_participant() + fastdds::rtps::RTPSParticipant* get_rtps_participant() { std::lock_guard _(mtx_gs_); return rtps_participant_; @@ -467,7 +464,7 @@ class DomainParticipantImpl // From here legacy RTPS methods. - const fastrtps::rtps::GUID_t& guid() const; + const fastdds::rtps::GUID_t& guid() const; std::vector get_participant_names() const; @@ -482,11 +479,11 @@ class DomainParticipantImpl * @return True if correctly found and activated. */ bool new_remote_endpoint_discovered( - const fastrtps::rtps::GUID_t& partguid, + const fastdds::rtps::GUID_t& partguid, uint16_t userId, - fastrtps::rtps::EndpointKind_t kind); + fastdds::rtps::EndpointKind_t kind); - fastrtps::rtps::ResourceEvent& get_resource_event() const; + fastdds::rtps::ResourceEvent& get_resource_event() const; //! Remove all listeners in the hierarchy to allow a quiet destruction virtual void disable(); @@ -519,7 +516,7 @@ class DomainParticipantImpl int32_t participant_id_ = -1; //!Pre-calculated guid - fastrtps::rtps::GUID_t guid_; + fastdds::rtps::GUID_t guid_; //!For instance handle creation std::atomic next_instance_id_; @@ -528,7 +525,7 @@ class DomainParticipantImpl DomainParticipantQos qos_; //!RTPSParticipant - fastrtps::rtps::RTPSParticipant* rtps_participant_; + fastdds::rtps::RTPSParticipant* rtps_participant_; //!Participant* DomainParticipant* participant_; @@ -573,7 +570,7 @@ class DomainParticipantImpl std::atomic id_counter_; - class MyRTPSParticipantListener : public fastrtps::rtps::RTPSParticipantListener + class MyRTPSParticipantListener : public fastdds::rtps::RTPSParticipantListener { struct Sentry { @@ -638,24 +635,24 @@ class DomainParticipantImpl } void onParticipantDiscovery( - fastrtps::rtps::RTPSParticipant* participant, - fastrtps::rtps::ParticipantDiscoveryInfo&& info, + fastdds::rtps::RTPSParticipant* participant, + fastdds::rtps::ParticipantDiscoveryInfo&& info, bool& should_be_ignored) override; #if HAVE_SECURITY void onParticipantAuthentication( - fastrtps::rtps::RTPSParticipant* participant, - fastrtps::rtps::ParticipantAuthenticationInfo&& info) override; + fastdds::rtps::RTPSParticipant* participant, + fastdds::rtps::ParticipantAuthenticationInfo&& info) override; #endif // if HAVE_SECURITY void onReaderDiscovery( - fastrtps::rtps::RTPSParticipant* participant, - fastrtps::rtps::ReaderDiscoveryInfo&& info, + fastdds::rtps::RTPSParticipant* participant, + fastdds::rtps::ReaderDiscoveryInfo&& info, bool& should_be_ignored) override; void onWriterDiscovery( - fastrtps::rtps::RTPSParticipant* participant, - fastrtps::rtps::WriterDiscoveryInfo&& info, + fastdds::rtps::RTPSParticipant* participant, + fastdds::rtps::WriterDiscoveryInfo&& info, bool& should_be_ignored) override; DomainParticipantImpl* participant_; diff --git a/src/cpp/fastdds/domain/qos/DomainParticipantQos.cpp b/src/cpp/fastdds/domain/qos/DomainParticipantQos.cpp index a1951aba2bd..48740b90a3c 100644 --- a/src/cpp/fastdds/domain/qos/DomainParticipantQos.cpp +++ b/src/cpp/fastdds/domain/qos/DomainParticipantQos.cpp @@ -33,7 +33,7 @@ void DomainParticipantQos::setup_transports( rtps::BuiltinTransports transports, const rtps::BuiltinTransportsOptions& options) { - fastrtps::rtps::RTPSParticipantAttributes attr; + rtps::RTPSParticipantAttributes attr; utils::set_attributes_from_qos(attr, *this); attr.setup_transports(transports, options); diff --git a/src/cpp/fastdds/publisher/DataWriter.cpp b/src/cpp/fastdds/publisher/DataWriter.cpp index 2b4e1c64e69..3b940adafec 100644 --- a/src/cpp/fastdds/publisher/DataWriter.cpp +++ b/src/cpp/fastdds/publisher/DataWriter.cpp @@ -86,7 +86,7 @@ bool DataWriter::write( bool DataWriter::write( void* data, - fastrtps::rtps::WriteParams& params) + fastdds::rtps::WriteParams& params) { return impl_->write(data, params); } @@ -101,7 +101,7 @@ ReturnCode_t DataWriter::write( ReturnCode_t DataWriter::write_w_timestamp( void* data, const InstanceHandle_t& handle, - const fastrtps::Time_t& timestamp) + const fastdds::Time_t& timestamp) { return impl_->write_w_timestamp(data, handle, timestamp); } @@ -114,7 +114,7 @@ InstanceHandle_t DataWriter::register_instance( InstanceHandle_t DataWriter::register_instance_w_timestamp( void* instance, - const fastrtps::Time_t& timestamp) + const fastdds::Time_t& timestamp) { return impl_->register_instance_w_timestamp(instance, timestamp); } @@ -129,7 +129,7 @@ ReturnCode_t DataWriter::unregister_instance( ReturnCode_t DataWriter::unregister_instance_w_timestamp( void* instance, const InstanceHandle_t& handle, - const fastrtps::Time_t& timestamp) + const fastdds::Time_t& timestamp) { return impl_->unregister_instance_w_timestamp(instance, handle, timestamp); } @@ -159,12 +159,12 @@ ReturnCode_t DataWriter::dispose( ReturnCode_t DataWriter::dispose_w_timestamp( void* instance, const InstanceHandle_t& handle, - const fastrtps::Time_t& timestamp) + const fastdds::Time_t& timestamp) { return impl_->unregister_instance_w_timestamp(instance, handle, timestamp, true); } -const fastrtps::rtps::GUID_t& DataWriter::guid() const +const fastdds::rtps::GUID_t& DataWriter::guid() const { return impl_->guid(); } @@ -232,7 +232,7 @@ const Publisher* DataWriter::get_publisher() const } ReturnCode_t DataWriter::wait_for_acknowledgments( - const fastrtps::Duration_t& max_wait) + const fastdds::Duration_t& max_wait) { return impl_->wait_for_acknowledgments(max_wait); } @@ -303,7 +303,7 @@ ReturnCode_t DataWriter::get_sending_locators( ReturnCode_t DataWriter::wait_for_acknowledgments( void* instance, const InstanceHandle_t& handle, - const fastrtps::Duration_t& max_wait) + const fastdds::Duration_t& max_wait) { return impl_->wait_for_acknowledgments(instance, handle, max_wait); } diff --git a/src/cpp/fastdds/publisher/DataWriterHistory.cpp b/src/cpp/fastdds/publisher/DataWriterHistory.cpp index 19a2ae66483..5cf8f0d4fa7 100644 --- a/src/cpp/fastdds/publisher/DataWriterHistory.cpp +++ b/src/cpp/fastdds/publisher/DataWriterHistory.cpp @@ -30,8 +30,7 @@ namespace eprosima { namespace fastdds { namespace dds { -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; static HistoryAttributes to_history_attributes( const TopicAttributes& topic_att, @@ -60,7 +59,7 @@ DataWriterHistory::DataWriterHistory( const TopicAttributes& topic_att, uint32_t payloadMaxSize, MemoryManagementPolicy_t mempolicy, - std::function unack_sample_remove_functor) + std::function unack_sample_remove_functor) : WriterHistory(to_history_attributes(topic_att, payloadMaxSize, mempolicy)) , history_qos_(topic_att.historyQos) , resource_limited_qos_(topic_att.resourceLimitsQos) @@ -125,8 +124,8 @@ bool DataWriterHistory::register_instance( return result; } -fastrtps::rtps::SerializedPayload_t* DataWriterHistory::get_key_value( - const fastrtps::rtps::InstanceHandle_t& handle) +fastdds::rtps::SerializedPayload_t* DataWriterHistory::get_key_value( + const fastdds::rtps::InstanceHandle_t& handle) { t_m_Inst_Caches::iterator vit = keyed_changes_.find(handle); if (vit != keyed_changes_.end() && vit->second.is_registered()) @@ -584,5 +583,5 @@ bool DataWriterHistory::change_is_acked_or_fully_delivered( } } // namespace dds -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/fastdds/publisher/DataWriterHistory.hpp b/src/cpp/fastdds/publisher/DataWriterHistory.hpp index 8aacc0481a5..8159e09847d 100644 --- a/src/cpp/fastdds/publisher/DataWriterHistory.hpp +++ b/src/cpp/fastdds/publisher/DataWriterHistory.hpp @@ -40,7 +40,7 @@ namespace dds { * This class is created by the PublisherImpl and should not be used by the user directly. * @ingroup FASTDDS_MODULE */ -class DataWriterHistory : public fastrtps::rtps::WriterHistory +class DataWriterHistory : public rtps::WriterHistory { public: @@ -52,10 +52,10 @@ class DataWriterHistory : public fastrtps::rtps::WriterHistory * @param unack_sample_remove_functor Functor to call DDS listener callback on_unacknowledged_sample_removed */ DataWriterHistory( - const fastrtps::TopicAttributes& topic_att, + const TopicAttributes& topic_att, uint32_t payloadMax, - fastrtps::rtps::MemoryManagementPolicy_t mempolicy, - std::function unack_sample_remove_functor); + rtps::MemoryManagementPolicy_t mempolicy, + std::function unack_sample_remove_functor); virtual ~DataWriterHistory(); @@ -76,14 +76,14 @@ class DataWriterHistory : public fastrtps::rtps::WriterHistory * @return True if resources were reserved successfully. */ bool register_instance( - const fastrtps::rtps::InstanceHandle_t& instance_handle, - std::unique_lock& lock, + const rtps::InstanceHandle_t& instance_handle, + std::unique_lock& lock, const std::chrono::time_point& max_blocking_time, - fastrtps::rtps::SerializedPayload_t*& payload); + rtps::SerializedPayload_t*& payload); /** * This operation can be used to retrieve the serialized payload of the instance key that corresponds to an - * @ref eprosima::fastdds::dds::Entity::instance_handle_ "instance_handle". + * @ref eprosima::dds::Entity::instance_handle_ "instance_handle". * * This operation will return @c nullptr if the InstanceHandle_t handle does not correspond to an existing * data-object known to the DataWriterHistory. @@ -92,8 +92,8 @@ class DataWriterHistory : public fastrtps::rtps::WriterHistory * * @return Pointer to the serialized payload of the sample with which the instance was registered. */ - fastrtps::rtps::SerializedPayload_t* get_key_value( - const fastrtps::rtps::InstanceHandle_t& handle); + rtps::SerializedPayload_t* get_key_value( + const rtps::InstanceHandle_t& handle); /** * Add a change comming from the DataWriter. @@ -104,9 +104,9 @@ class DataWriterHistory : public fastrtps::rtps::WriterHistory * @return True if added. */ bool add_pub_change( - fastrtps::rtps::CacheChange_t* change, - fastrtps::rtps::WriteParams& wparams, - std::unique_lock& lock, + rtps::CacheChange_t* change, + rtps::WriteParams& wparams, + std::unique_lock& lock, const std::chrono::time_point& max_blocking_time); /** @@ -123,10 +123,10 @@ class DataWriterHistory : public fastrtps::rtps::WriterHistory */ template bool add_pub_change_with_commit_hook( - fastrtps::rtps::CacheChange_t* change, - fastrtps::rtps::WriteParams& wparams, + rtps::CacheChange_t* change, + rtps::WriteParams& wparams, PreCommitHook pre_commit, - std::unique_lock& lock, + std::unique_lock& lock, const std::chrono::time_point& max_blocking_time) { bool returnedValue = false; @@ -172,7 +172,7 @@ class DataWriterHistory : public fastrtps::rtps::WriterHistory * @return True if removed. */ bool remove_change_pub( - fastrtps::rtps::CacheChange_t* change); + rtps::CacheChange_t* change); /** * Remove a change by the publisher History. @@ -181,19 +181,19 @@ class DataWriterHistory : public fastrtps::rtps::WriterHistory * @return True if removed. */ bool remove_change_pub( - fastrtps::rtps::CacheChange_t* change, + rtps::CacheChange_t* change, const std::chrono::time_point& max_blocking_time); bool remove_change_g( - fastrtps::rtps::CacheChange_t* a_change) override; + rtps::CacheChange_t* a_change) override; bool remove_change_g( - fastrtps::rtps::CacheChange_t* a_change, + rtps::CacheChange_t* a_change, const std::chrono::time_point& max_blocking_time) override; bool remove_instance_changes( - const fastrtps::rtps::InstanceHandle_t& handle, - const fastrtps::rtps::SequenceNumber_t& seq_up_to); + const rtps::InstanceHandle_t& handle, + const rtps::SequenceNumber_t& seq_up_to); /** * @brief Sets the next deadline for the given instance @@ -202,7 +202,7 @@ class DataWriterHistory : public fastrtps::rtps::WriterHistory * @return True if deadline was set successfully */ bool set_next_deadline( - const fastrtps::rtps::InstanceHandle_t& handle, + const rtps::InstanceHandle_t& handle, const std::chrono::steady_clock::time_point& next_deadline_us); /** @@ -212,7 +212,7 @@ class DataWriterHistory : public fastrtps::rtps::WriterHistory * @return True if deadline could be retrieved for the given instance */ bool get_next_deadline( - fastrtps::rtps::InstanceHandle_t& handle, + rtps::InstanceHandle_t& handle, std::chrono::steady_clock::time_point& next_deadline_us); /*! @@ -221,7 +221,7 @@ class DataWriterHistory : public fastrtps::rtps::WriterHistory * return `true` if instance's key is registered in the history. */ bool is_key_registered( - const fastrtps::rtps::InstanceHandle_t& handle); + const rtps::InstanceHandle_t& handle); /** * Waits till the last change in the instance history has been acknowledged. @@ -231,13 +231,13 @@ class DataWriterHistory : public fastrtps::rtps::WriterHistory * @return true when the last change of the instance history is acknowleged, false when timeout is reached. */ bool wait_for_acknowledgement_last_change( - const fastrtps::rtps::InstanceHandle_t& handle, - std::unique_lock& lock, + const rtps::InstanceHandle_t& handle, + std::unique_lock& lock, const std::chrono::time_point& max_blocking_time); private: - typedef std::map t_m_Inst_Caches; + typedef std::map t_m_Inst_Caches; //!Map where keys are instance handles and values are vectors of cache changes associated t_m_Inst_Caches keyed_changes_; @@ -248,10 +248,10 @@ class DataWriterHistory : public fastrtps::rtps::WriterHistory //!ResourceLimitsQosPolicy values. ResourceLimitsQosPolicy resource_limited_qos_; //!Topic Attributes - fastrtps::TopicAttributes topic_att_; + TopicAttributes topic_att_; //! Unacknowledged sample removed functor - std::function unacknowledged_sample_removed_functor_; + std::function unacknowledged_sample_removed_functor_; /** * @brief Method that finds a key in the DataWriterHistory or tries to add it if not found @@ -261,8 +261,8 @@ class DataWriterHistory : public fastrtps::rtps::WriterHistory * @return True if the key was found or could be added to the map */ bool find_or_add_key( - const fastrtps::rtps::InstanceHandle_t& instance_handle, - const fastrtps::rtps::SerializedPayload_t& payload, + const rtps::InstanceHandle_t& instance_handle, + const rtps::SerializedPayload_t& payload, t_m_Inst_Caches::iterator* map_it); /** @@ -273,8 +273,8 @@ class DataWriterHistory : public fastrtps::rtps::WriterHistory * @return True if added. */ bool prepare_change( - fastrtps::rtps::CacheChange_t* change, - std::unique_lock& lock, + rtps::CacheChange_t* change, + std::unique_lock& lock, const std::chrono::time_point& max_blocking_time); /** @@ -285,7 +285,7 @@ class DataWriterHistory : public fastrtps::rtps::WriterHistory * @return true if acknowledged or fully delivered. False otherwise. */ bool change_is_acked_or_fully_delivered( - const fastrtps::rtps::CacheChange_t* change); + const rtps::CacheChange_t* change); }; diff --git a/src/cpp/fastdds/publisher/DataWriterImpl.cpp b/src/cpp/fastdds/publisher/DataWriterImpl.cpp index 7e4a64d557a..b1fa87a0a83 100644 --- a/src/cpp/fastdds/publisher/DataWriterImpl.cpp +++ b/src/cpp/fastdds/publisher/DataWriterImpl.cpp @@ -55,8 +55,8 @@ #include #endif //FASTDDS_STATISTICS -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; using namespace std::chrono; namespace eprosima { @@ -148,7 +148,7 @@ DataWriterImpl::DataWriterImpl( Topic* topic, const DataWriterQos& qos, DataWriterListener* listen, - std::shared_ptr payload_pool) + std::shared_ptr payload_pool) : publisher_(p) , type_(type) , topic_(topic) @@ -173,8 +173,8 @@ DataWriterImpl::DataWriterImpl( endpoint_attributes.topicKind = type_->m_isGetKeyDefined ? WITH_KEY : NO_KEY; endpoint_attributes.setEntityID(qos_.endpoint().entity_id); endpoint_attributes.setUserDefinedID(qos_.endpoint().user_defined_id); - fastrtps::rtps::RTPSParticipantImpl::preprocess_endpoint_attributes( - fastrtps::rtps::EntityId_t::unknown(), + fastdds::rtps::RTPSParticipantImpl::preprocess_endpoint_attributes( + fastdds::rtps::EntityId_t::unknown(), publisher_->get_participant_impl()->id_counter(), endpoint_attributes, guid_.entityId); guid_.guidPrefix = publisher_->get_participant_impl()->guid().guidPrefix; @@ -190,7 +190,7 @@ DataWriterImpl::DataWriterImpl( TypeSupport type, Topic* topic, const DataWriterQos& qos, - const fastrtps::rtps::EntityId_t& entity_id, + const fastdds::rtps::EntityId_t& entity_id, DataWriterListener* listen) : publisher_(p) , type_(type) @@ -617,7 +617,7 @@ bool DataWriterImpl::write( bool DataWriterImpl::write( void* data, - fastrtps::rtps::WriteParams& params) + fastdds::rtps::WriteParams& params) { if (writer_ == nullptr) { @@ -676,7 +676,7 @@ ReturnCode_t DataWriterImpl::write( ReturnCode_t DataWriterImpl::write_w_timestamp( void* data, const InstanceHandle_t& handle, - const fastrtps::Time_t& timestamp) + const fastdds::Time_t& timestamp) { InstanceHandle_t instance_handle; ReturnCode_t ret = RETCODE_OK; @@ -763,7 +763,7 @@ InstanceHandle_t DataWriterImpl::register_instance( InstanceHandle_t DataWriterImpl::register_instance_w_timestamp( void* key, - const fastrtps::Time_t& timestamp) + const fastdds::Time_t& timestamp) { /// Preconditions InstanceHandle_t instance_handle; @@ -814,7 +814,7 @@ InstanceHandle_t DataWriterImpl::do_register_instance( // Serialization of the sample failed. Remove the instance to keep original state. // Note that we will only end-up here if the instance has just been created, so it will be empty // and removing its changes will remove the instance completely. - history_.remove_instance_changes(instance_handle, fastrtps::rtps::SequenceNumber_t()); + history_.remove_instance_changes(instance_handle, fastdds::rtps::SequenceNumber_t()); } } return instance_handle; @@ -851,7 +851,7 @@ ReturnCode_t DataWriterImpl::unregister_instance( ReturnCode_t DataWriterImpl::unregister_instance_w_timestamp( void* instance, const InstanceHandle_t& handle, - const fastrtps::Time_t& timestamp, + const fastdds::Time_t& timestamp, bool dispose) { // Preconditions @@ -1126,7 +1126,7 @@ ReturnCode_t DataWriterImpl::get_sending_locators( return RETCODE_OK; } -const fastrtps::rtps::GUID_t& DataWriterImpl::guid() const +const fastdds::rtps::GUID_t& DataWriterImpl::guid() const { return guid_; } @@ -1191,7 +1191,7 @@ ReturnCode_t DataWriterImpl::set_qos( } //Notify the participant that a Writer has changed its QOS - fastrtps::TopicAttributes topic_att = get_topic_attributes(qos_, *topic_, type_); + fastdds::TopicAttributes topic_att = get_topic_attributes(qos_, *topic_, type_); WriterQos wqos = qos_.get_writerqos(get_publisher()->get_qos(), topic_->get_qos()); publisher_->rtps_participant()->updateWriter(writer_, topic_att, wqos); @@ -1310,7 +1310,7 @@ void DataWriterImpl::InnerDataWriterListener::onWriterChangeReceivedByAll( } void DataWriterImpl::InnerDataWriterListener::on_liveliness_lost( - fastrtps::rtps::RTPSWriter* /*writer*/, + fastdds::rtps::RTPSWriter* /*writer*/, const LivelinessLostStatus& status) { data_writer_->update_liveliness_lost_status(status); @@ -1333,21 +1333,21 @@ void DataWriterImpl::InnerDataWriterListener::on_liveliness_lost( } void DataWriterImpl::InnerDataWriterListener::on_reader_discovery( - fastrtps::rtps::RTPSWriter* writer, - fastrtps::rtps::ReaderDiscoveryInfo::DISCOVERY_STATUS reason, - const fastrtps::rtps::GUID_t& reader_guid, - const fastrtps::rtps::ReaderProxyData* reader_info) + fastdds::rtps::RTPSWriter* writer, + fastdds::rtps::ReaderDiscoveryInfo::DISCOVERY_STATUS reason, + const fastdds::rtps::GUID_t& reader_guid, + const fastdds::rtps::ReaderProxyData* reader_info) { - if (!fastrtps::rtps::RTPSDomainImpl::should_intraprocess_between(writer->getGuid(), reader_guid)) + if (!fastdds::rtps::RTPSDomainImpl::should_intraprocess_between(writer->getGuid(), reader_guid)) { switch (reason) { - case fastrtps::rtps::ReaderDiscoveryInfo::DISCOVERY_STATUS::REMOVED_READER: + case fastdds::rtps::ReaderDiscoveryInfo::DISCOVERY_STATUS::REMOVED_READER: data_writer_->remove_reader_filter(reader_guid); break; - case fastrtps::rtps::ReaderDiscoveryInfo::DISCOVERY_STATUS::DISCOVERED_READER: - case fastrtps::rtps::ReaderDiscoveryInfo::DISCOVERY_STATUS::CHANGED_QOS_READER: + case fastdds::rtps::ReaderDiscoveryInfo::DISCOVERY_STATUS::DISCOVERED_READER: + case fastdds::rtps::ReaderDiscoveryInfo::DISCOVERY_STATUS::CHANGED_QOS_READER: data_writer_->process_reader_filter_info(reader_guid, *reader_info); break; default: @@ -1643,12 +1643,12 @@ ReturnCode_t DataWriterImpl::assert_liveliness() return RETCODE_OK; } -fastrtps::TopicAttributes DataWriterImpl::get_topic_attributes( +fastdds::TopicAttributes DataWriterImpl::get_topic_attributes( const DataWriterQos& qos, const Topic& topic, const TypeSupport& type) { - fastrtps::TopicAttributes topic_att; + fastdds::TopicAttributes topic_att; topic_att.historyQos = qos.history(); topic_att.resourceLimitsQos = qos.resource_limits(); topic_att.topicName = topic.get_name(); @@ -1657,7 +1657,7 @@ fastrtps::TopicAttributes DataWriterImpl::get_topic_attributes( if (type->auto_fill_type_information() && xtypes::TK_NONE != type->type_identifiers().type_identifier1()._d()) { if (RETCODE_OK == - fastrtps::rtps::RTPSDomainImpl::get_instance()->type_object_registry_observer().get_type_information( + fastdds::rtps::RTPSDomainImpl::get_instance()->type_object_registry_observer().get_type_information( type->type_identifiers(), topic_att.type_information.type_information)) { topic_att.type_information.assigned(true); @@ -1873,7 +1873,7 @@ ReturnCode_t DataWriterImpl::check_qos( if (qos.liveliness().kind == AUTOMATIC_LIVELINESS_QOS || qos.liveliness().kind == MANUAL_BY_PARTICIPANT_LIVELINESS_QOS) { - if (qos.liveliness().lease_duration < eprosima::fastrtps::c_TimeInfinite && + if (qos.liveliness().lease_duration < eprosima::fastdds::c_TimeInfinite && qos.liveliness().lease_duration <= qos.liveliness().announcement_period) { EPROSIMA_LOG_ERROR(RTPS_QOS_CHECK, "WRITERQOS: LeaseDuration <= announcement period."); @@ -2022,7 +2022,7 @@ std::shared_ptr DataWriterImpl::get_change_pool() const config, qos_.writer_resource_limits().reader_filters_allocation); } - return std::make_shared(config); + return std::make_shared(config); } std::shared_ptr DataWriterImpl::get_payload_pool() @@ -2116,8 +2116,8 @@ ReturnCode_t DataWriterImpl::check_datasharing_compatible( #endif // HAVE_SECURITY bool has_bound_payload_size = - (qos_.endpoint().history_memory_policy == eprosima::fastrtps::rtps::PREALLOCATED_MEMORY_MODE || - qos_.endpoint().history_memory_policy == eprosima::fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE) && + (qos_.endpoint().history_memory_policy == eprosima::fastdds::rtps::PREALLOCATED_MEMORY_MODE || + qos_.endpoint().history_memory_policy == eprosima::fastdds::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE) && type_.is_bounded(); bool has_key = type_->m_isGetKeyDefined; @@ -2195,7 +2195,7 @@ ReturnCode_t DataWriterImpl::check_datasharing_compatible( } void DataWriterImpl::remove_reader_filter( - const fastrtps::rtps::GUID_t& reader_guid) + const fastdds::rtps::GUID_t& reader_guid) { if (reader_filters_) { @@ -2204,8 +2204,8 @@ void DataWriterImpl::remove_reader_filter( } void DataWriterImpl::process_reader_filter_info( - const fastrtps::rtps::GUID_t& reader_guid, - const fastrtps::rtps::ReaderProxyData& reader_info) + const fastdds::rtps::GUID_t& reader_guid, + const fastdds::rtps::ReaderProxyData& reader_info) { if (reader_filters_ && !writer_->is_datasharing_compatible_with(reader_info) && @@ -2228,8 +2228,8 @@ void DataWriterImpl::filter_is_being_removed( } bool DataWriterImpl::is_relevant( - const fastrtps::rtps::CacheChange_t& change, - const fastrtps::rtps::GUID_t& reader_guid) const + const fastdds::rtps::CacheChange_t& change, + const fastdds::rtps::GUID_t& reader_guid) const { assert(reader_filters_); const DataWriterFilteredChange& writer_change = static_cast(change); diff --git a/src/cpp/fastdds/publisher/DataWriterImpl.hpp b/src/cpp/fastdds/publisher/DataWriterImpl.hpp index 383c5270358..87c2d8522ad 100644 --- a/src/cpp/fastdds/publisher/DataWriterImpl.hpp +++ b/src/cpp/fastdds/publisher/DataWriterImpl.hpp @@ -46,7 +46,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSWriter; @@ -55,10 +55,6 @@ class TimedEvent; } // namespace rtps -} // namespace fastrtps - -namespace fastdds { - #ifdef FASTDDS_STATISTICS namespace statistics { namespace dds { @@ -80,8 +76,8 @@ class Publisher; class DataWriterImpl : protected rtps::IReaderDataFilter { using LoanInitializationKind = DataWriter::LoanInitializationKind; - using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; - using CacheChange_t = eprosima::fastrtps::rtps::CacheChange_t; + using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; + using CacheChange_t = eprosima::fastdds::rtps::CacheChange_t; class LoanCollection; protected: @@ -102,14 +98,14 @@ class DataWriterImpl : protected rtps::IReaderDataFilter Topic* topic, const DataWriterQos& qos, DataWriterListener* listener = nullptr, - std::shared_ptr payload_pool = nullptr); + std::shared_ptr payload_pool = nullptr); DataWriterImpl( PublisherImpl* p, TypeSupport type, Topic* topic, const DataWriterQos& qos, - const fastrtps::rtps::EntityId_t& entity_id, + const fastdds::rtps::EntityId_t& entity_id, DataWriterListener* listener = nullptr); public: @@ -181,7 +177,7 @@ class DataWriterImpl : protected rtps::IReaderDataFilter */ bool write( void* data, - fastrtps::rtps::WriteParams& params); + fastdds::rtps::WriteParams& params); /** * @brief Implementation of the DDS `write` operation. @@ -209,7 +205,7 @@ class DataWriterImpl : protected rtps::IReaderDataFilter ReturnCode_t write_w_timestamp( void* data, const InstanceHandle_t& handle, - const fastrtps::Time_t& timestamp); + const fastdds::Time_t& timestamp); /** * @brief Implementation of the DDS `register_instance` operation. @@ -237,7 +233,7 @@ class DataWriterImpl : protected rtps::IReaderDataFilter */ InstanceHandle_t register_instance_w_timestamp( void* instance, - const fastrtps::Time_t& timestamp); + const fastdds::Time_t& timestamp); /** * @brief Implementation of the DDS `unregister_instance` and `dispose` operations. @@ -278,14 +274,14 @@ class DataWriterImpl : protected rtps::IReaderDataFilter ReturnCode_t unregister_instance_w_timestamp( void* instance, const InstanceHandle_t& handle, - const fastrtps::Time_t& timestamp, + const fastdds::Time_t& timestamp, bool dispose = false); /** * * @return */ - const fastrtps::rtps::GUID_t& guid() const; + const fastdds::rtps::GUID_t& guid() const; InstanceHandle_t get_instance_handle() const; @@ -299,12 +295,12 @@ class DataWriterImpl : protected rtps::IReaderDataFilter } ReturnCode_t wait_for_acknowledgments( - const fastrtps::Duration_t& max_wait); + const fastdds::Duration_t& max_wait); ReturnCode_t wait_for_acknowledgments( void* instance, const InstanceHandle_t& handle, - const fastrtps::Duration_t& max_wait); + const fastdds::Duration_t& max_wait); ReturnCode_t get_publication_matched_status( PublicationMatchedStatus& status); @@ -384,14 +380,14 @@ class DataWriterImpl : protected rtps::IReaderDataFilter protected: - using IChangePool = eprosima::fastrtps::rtps::IChangePool; - using IPayloadPool = eprosima::fastrtps::rtps::IPayloadPool; - using ITopicPayloadPool = eprosima::fastrtps::rtps::ITopicPayloadPool; + using IChangePool = eprosima::fastdds::rtps::IChangePool; + using IPayloadPool = eprosima::fastdds::rtps::IPayloadPool; + using ITopicPayloadPool = eprosima::fastdds::rtps::ITopicPayloadPool; PublisherImpl* publisher_ = nullptr; //! Pointer to the associated Data Writer. - fastrtps::rtps::RTPSWriter* writer_ = nullptr; + fastdds::rtps::RTPSWriter* writer_ = nullptr; //! Pointer to the TopicDataType object. TypeSupport type_; @@ -410,7 +406,7 @@ class DataWriterImpl : protected rtps::IReaderDataFilter DataWriterHistory history_; //!Listener to capture the events of the Writer - class InnerDataWriterListener : public fastrtps::rtps::WriterListener + class InnerDataWriterListener : public fastdds::rtps::WriterListener { public: @@ -425,26 +421,26 @@ class DataWriterImpl : protected rtps::IReaderDataFilter } void onWriterMatched( - fastrtps::rtps::RTPSWriter* writer, + fastdds::rtps::RTPSWriter* writer, const fastdds::dds::PublicationMatchedStatus& info) override; void on_offered_incompatible_qos( - fastrtps::rtps::RTPSWriter* writer, + fastdds::rtps::RTPSWriter* writer, fastdds::dds::PolicyMask qos) override; void onWriterChangeReceivedByAll( - fastrtps::rtps::RTPSWriter* writer, - fastrtps::rtps::CacheChange_t* change) override; + fastdds::rtps::RTPSWriter* writer, + fastdds::rtps::CacheChange_t* change) override; void on_liveliness_lost( - fastrtps::rtps::RTPSWriter* writer, + fastdds::rtps::RTPSWriter* writer, const LivelinessLostStatus& status) override; void on_reader_discovery( - fastrtps::rtps::RTPSWriter* writer, - fastrtps::rtps::ReaderDiscoveryInfo::DISCOVERY_STATUS reason, - const fastrtps::rtps::GUID_t& reader_guid, - const fastrtps::rtps::ReaderProxyData* reader_info) override; + fastdds::rtps::RTPSWriter* writer, + fastdds::rtps::ReaderDiscoveryInfo::DISCOVERY_STATUS reason, + const fastdds::rtps::GUID_t& reader_guid, + const fastdds::rtps::ReaderProxyData* reader_info) override; #ifdef FASTDDS_STATISTICS void notify_status_observer( @@ -455,12 +451,12 @@ class DataWriterImpl : protected rtps::IReaderDataFilter private: - using fastrtps::rtps::WriterListener::onWriterMatched; + using rtps::WriterListener::onWriterMatched; } writer_listener_; //! A timer used to check for deadlines - fastrtps::rtps::TimedEvent* deadline_timer_ = nullptr; + fastdds::rtps::TimedEvent* deadline_timer_ = nullptr; //! Deadline duration in microseconds std::chrono::duration> deadline_duration_us_; @@ -481,7 +477,7 @@ class DataWriterImpl : protected rtps::IReaderDataFilter OfferedIncompatibleQosStatus offered_incompatible_qos_status_; //! A timed callback to remove expired samples for lifespan QoS - fastrtps::rtps::TimedEvent* lifespan_timer_ = nullptr; + fastdds::rtps::TimedEvent* lifespan_timer_ = nullptr; //! The lifespan duration, in microseconds std::chrono::duration> lifespan_duration_us_; @@ -498,7 +494,7 @@ class DataWriterImpl : protected rtps::IReaderDataFilter std::unique_ptr loans_; - fastrtps::rtps::GUID_t guid_; + fastdds::rtps::GUID_t guid_; std::unique_ptr reader_filters_; @@ -517,7 +513,7 @@ class DataWriterImpl : protected rtps::IReaderDataFilter InstanceHandle_t do_register_instance( void* key, const InstanceHandle_t instance_handle, - fastrtps::rtps::WriteParams& wparams); + fastdds::rtps::WriteParams& wparams); /** * @@ -526,7 +522,7 @@ class DataWriterImpl : protected rtps::IReaderDataFilter * @return */ ReturnCode_t create_new_change( - fastrtps::rtps::ChangeKind_t kind, + fastdds::rtps::ChangeKind_t kind, void* data); /** @@ -537,9 +533,9 @@ class DataWriterImpl : protected rtps::IReaderDataFilter * @return */ ReturnCode_t create_new_change_with_params( - fastrtps::rtps::ChangeKind_t kind, + fastdds::rtps::ChangeKind_t kind, void* data, - fastrtps::rtps::WriteParams& wparams); + fastdds::rtps::WriteParams& wparams); /** * @@ -550,9 +546,9 @@ class DataWriterImpl : protected rtps::IReaderDataFilter * @return */ ReturnCode_t create_new_change_with_params( - fastrtps::rtps::ChangeKind_t kind, + fastdds::rtps::ChangeKind_t kind, void* data, - fastrtps::rtps::WriteParams& wparams, + fastdds::rtps::WriteParams& wparams, const InstanceHandle_t& handle); /** @@ -580,16 +576,16 @@ class DataWriterImpl : protected rtps::IReaderDataFilter bool lifespan_expired(); ReturnCode_t check_new_change_preconditions( - fastrtps::rtps::ChangeKind_t change_kind, + fastdds::rtps::ChangeKind_t change_kind, void* data); ReturnCode_t perform_create_new_change( - fastrtps::rtps::ChangeKind_t change_kind, + fastdds::rtps::ChangeKind_t change_kind, void* data, - fastrtps::rtps::WriteParams& wparams, + fastdds::rtps::WriteParams& wparams, const InstanceHandle_t& handle); - static fastrtps::TopicAttributes get_topic_attributes( + static fastdds::TopicAttributes get_topic_attributes( const DataWriterQos& qos, const Topic& topic, const TypeSupport& type); @@ -652,8 +648,8 @@ class DataWriterImpl : protected rtps::IReaderDataFilter const StatusMask& status); void set_fragment_size_on_change( - fastrtps::rtps::WriteParams& wparams, - fastrtps::rtps::CacheChange_t* ch, + fastdds::rtps::WriteParams& wparams, + fastdds::rtps::CacheChange_t* ch, const uint32_t& high_mark_for_frag); std::shared_ptr get_change_pool() const; @@ -663,7 +659,7 @@ class DataWriterImpl : protected rtps::IReaderDataFilter bool release_payload_pool(); ReturnCode_t check_datasharing_compatible( - const fastrtps::rtps::WriterAttributes& writer_attributes, + const fastdds::rtps::WriterAttributes& writer_attributes, bool& is_datasharing_compatible) const; template @@ -700,7 +696,7 @@ class DataWriterImpl : protected rtps::IReaderDataFilter * @param reader_guid GUID of the reader that has been unmatched. */ void remove_reader_filter( - const fastrtps::rtps::GUID_t& reader_guid); + const fastdds::rtps::GUID_t& reader_guid); /** * Process filtering information for a reader. @@ -710,12 +706,12 @@ class DataWriterImpl : protected rtps::IReaderDataFilter * @param reader_info The reader's discovery information. */ void process_reader_filter_info( - const fastrtps::rtps::GUID_t& reader_guid, - const fastrtps::rtps::ReaderProxyData& reader_info); + const fastdds::rtps::GUID_t& reader_guid, + const fastdds::rtps::ReaderProxyData& reader_info); bool is_relevant( - const fastrtps::rtps::CacheChange_t& change, - const fastrtps::rtps::GUID_t& reader_guid) const override; + const fastdds::rtps::CacheChange_t& change, + const fastdds::rtps::GUID_t& reader_guid) const override; private: diff --git a/src/cpp/fastdds/publisher/Publisher.cpp b/src/cpp/fastdds/publisher/Publisher.cpp index babfd8eb8ef..831510fcd59 100644 --- a/src/cpp/fastdds/publisher/Publisher.cpp +++ b/src/cpp/fastdds/publisher/Publisher.cpp @@ -23,8 +23,9 @@ #include -using namespace eprosima; -using namespace eprosima::fastdds::dds; +namespace eprosima { +namespace fastdds { +namespace dds { Publisher::Publisher( PublisherImpl* p, @@ -113,7 +114,7 @@ DataWriter* Publisher::create_datawriter( const DataWriterQos& qos, DataWriterListener* listener, const StatusMask& mask, - std::shared_ptr payload_pool) + std::shared_ptr payload_pool) { return impl_->create_datawriter(topic, qos, listener, mask, payload_pool); } @@ -123,7 +124,7 @@ DataWriter* Publisher::create_datawriter_with_profile( const std::string& profile_name, DataWriterListener* listener, const StatusMask& mask, - std::shared_ptr payload_pool) + std::shared_ptr payload_pool) { return impl_->create_datawriter_with_profile(topic, profile_name, listener, mask, payload_pool); } @@ -173,7 +174,7 @@ ReturnCode_t Publisher::end_coherent_changes() } ReturnCode_t Publisher::wait_for_acknowledgments( - const fastrtps::Duration_t& max_wait) + const fastdds::Duration_t& max_wait) { return impl_->wait_for_acknowledgments(max_wait); } @@ -213,7 +214,7 @@ ReturnCode_t Publisher::copy_from_topic_qos( return PublisherImpl::copy_from_topic_qos(writer_qos, topic_qos); } -const fastrtps::rtps::InstanceHandle_t& Publisher::get_instance_handle() const +const fastdds::rtps::InstanceHandle_t& Publisher::get_instance_handle() const { return impl_->get_instance_handle(); } @@ -235,3 +236,7 @@ ReturnCode_t Publisher::get_datawriter_qos_from_profile( { return impl_->get_datawriter_qos_from_profile(profile_name, qos); } + +} // namespace dds +} // namespace fastdds +} // namespace eprosima diff --git a/src/cpp/fastdds/publisher/PublisherImpl.cpp b/src/cpp/fastdds/publisher/PublisherImpl.cpp index e2f2c896c7a..93718e51c72 100644 --- a/src/cpp/fastdds/publisher/PublisherImpl.cpp +++ b/src/cpp/fastdds/publisher/PublisherImpl.cpp @@ -45,10 +45,9 @@ namespace eprosima { namespace fastdds { namespace dds { -using fastrtps::xmlparser::XMLProfileManager; -using fastrtps::xmlparser::XMLP_ret; -using fastrtps::rtps::InstanceHandle_t; -using fastrtps::Duration_t; +using xmlparser::XMLProfileManager; +using xmlparser::XMLP_ret; +using rtps::InstanceHandle_t; PublisherImpl::PublisherImpl( DomainParticipantImpl* p, @@ -207,7 +206,7 @@ DataWriterImpl* PublisherImpl::create_datawriter_impl( Topic* topic, const DataWriterQos& qos, DataWriterListener* listener, - std::shared_ptr payload_pool) + std::shared_ptr payload_pool) { return new DataWriterImpl(this, type, topic, qos, listener, payload_pool); } @@ -217,7 +216,7 @@ DataWriter* PublisherImpl::create_datawriter( const DataWriterQos& qos, DataWriterListener* listener, const StatusMask& mask, - std::shared_ptr payload_pool) + std::shared_ptr payload_pool) { EPROSIMA_LOG_INFO(PUBLISHER, "CREATING WRITER IN TOPIC: " << topic->get_name()); //Look for the correct type registration @@ -290,7 +289,7 @@ DataWriter* PublisherImpl::create_datawriter_with_profile( const std::string& profile_name, DataWriterListener* listener, const StatusMask& mask, - std::shared_ptr payload_pool) + std::shared_ptr payload_pool) { // TODO (ILG): Change when we have full XML support for DDS QoS profiles PublisherAttributes attr; @@ -378,7 +377,7 @@ bool PublisherImpl::has_datawriters() const } bool PublisherImpl::contains_entity( - const fastrtps::rtps::InstanceHandle_t& handle) const + const fastdds::rtps::InstanceHandle_t& handle) const { std::lock_guard lock(mtx_writers_); for (auto vit : writers_) @@ -513,7 +512,7 @@ ReturnCode_t PublisherImpl::wait_for_acknowledgments( // Check ellapsed time and decrement participant_->get_current_time(end); current = current - (end - begin); - if (current < fastrtps::c_TimeZero) + if (current < fastdds::c_TimeZero) { return RETCODE_TIMEOUT; } @@ -675,7 +674,7 @@ PublisherListener* PublisherImpl::get_listener_for( #ifdef FASTDDS_STATISTICS bool PublisherImpl::get_monitoring_status( statistics::MonitorServiceData& status, - const fastrtps::rtps::GUID_t& entity_guid) + const fastdds::rtps::GUID_t& entity_guid) { bool ret = false; std::vector writers; diff --git a/src/cpp/fastdds/publisher/PublisherImpl.hpp b/src/cpp/fastdds/publisher/PublisherImpl.hpp index 06e1b401e1d..782484fc435 100644 --- a/src/cpp/fastdds/publisher/PublisherImpl.hpp +++ b/src/cpp/fastdds/publisher/PublisherImpl.hpp @@ -40,7 +40,7 @@ #endif // ifdef FASTDDS_STATISTICS namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSParticipant; @@ -49,9 +49,6 @@ class RTPSParticipant; class TopicAttributes; -} // namespace fastrtps - -namespace fastdds { namespace dds { class PublisherListener; @@ -108,14 +105,14 @@ class PublisherImpl const DataWriterQos& qos, DataWriterListener* listener, const StatusMask& mask = StatusMask::all(), - std::shared_ptr payload_pool = nullptr); + std::shared_ptr payload_pool = nullptr); DataWriter* create_datawriter_with_profile( Topic* topic, const std::string& profile_name, DataWriterListener* listener, const StatusMask& mask = StatusMask::all(), - std::shared_ptr payload_pool = nullptr); + std::shared_ptr payload_pool = nullptr); ReturnCode_t delete_datawriter( const DataWriter* writer); @@ -124,7 +121,7 @@ class PublisherImpl const std::string& topic_name) const; bool contains_entity( - const fastrtps::rtps::InstanceHandle_t& handle) const; + const fastdds::rtps::InstanceHandle_t& handle) const; bool get_datawriters( std::vector& writers) const; @@ -148,7 +145,7 @@ class PublisherImpl */ ReturnCode_t wait_for_acknowledgments( - const fastrtps::Duration_t& max_wait); + const fastdds::Duration_t& max_wait); const DomainParticipant* get_participant() const; @@ -175,14 +172,14 @@ class PublisherImpl DataWriterQos& writer_qos, const TopicQos& topic_qos); - fastrtps::rtps::RTPSParticipant* rtps_participant() const + fastdds::rtps::RTPSParticipant* rtps_participant() const { return rtps_participant_; } const Publisher* get_publisher() const; - const fastrtps::rtps::InstanceHandle_t& get_instance_handle() const; + const fastdds::rtps::InstanceHandle_t& get_instance_handle() const; //! Remove all listeners in the hierarchy to allow a quiet destruction void disable(); @@ -203,7 +200,7 @@ class PublisherImpl #ifdef FASTDDS_STATISTICS bool get_monitoring_status( statistics::MonitorServiceData& status, - const fastrtps::rtps::GUID_t& entity_guid); + const fastdds::rtps::GUID_t& entity_guid); #endif //FASTDDS_STATISTICS protected: @@ -253,18 +250,18 @@ class PublisherImpl Publisher* user_publisher_; - fastrtps::rtps::RTPSParticipant* rtps_participant_; + fastdds::rtps::RTPSParticipant* rtps_participant_; DataWriterQos default_datawriter_qos_; - fastrtps::rtps::InstanceHandle_t handle_; + fastdds::rtps::InstanceHandle_t handle_; virtual DataWriterImpl* create_datawriter_impl( const TypeSupport& type, Topic* topic, const DataWriterQos& qos, DataWriterListener* listener, - std::shared_ptr payload_pool); + std::shared_ptr payload_pool); static void set_qos( PublisherQos& to, diff --git a/src/cpp/fastdds/publisher/filtering/DataWriterFilteredChange.hpp b/src/cpp/fastdds/publisher/filtering/DataWriterFilteredChange.hpp index 4207e652876..302e4d55ff6 100644 --- a/src/cpp/fastdds/publisher/filtering/DataWriterFilteredChange.hpp +++ b/src/cpp/fastdds/publisher/filtering/DataWriterFilteredChange.hpp @@ -31,7 +31,7 @@ namespace dds { /** * A cache change that holds writer-side filtering information. */ -struct DataWriterFilteredChange final : public fastrtps::rtps::CacheChange_t +struct DataWriterFilteredChange final : public fastdds::rtps::CacheChange_t { /** * Construct a DataWriterFilteredChange. @@ -39,8 +39,8 @@ struct DataWriterFilteredChange final : public fastrtps::rtps::CacheChange_t * @param filter_allocation Allocation configuration for the collection of filtered out readers. */ explicit DataWriterFilteredChange( - const fastrtps::ResourceLimitedContainerConfig& filter_allocation) - : fastrtps::rtps::CacheChange_t() + const fastdds::ResourceLimitedContainerConfig& filter_allocation) + : fastdds::rtps::CacheChange_t() , filtered_out_readers(filter_allocation) { } @@ -55,9 +55,9 @@ struct DataWriterFilteredChange final : public fastrtps::rtps::CacheChange_t * @return whether this change is relevant for the specified reader. */ inline bool is_relevant_for( - const fastrtps::rtps::GUID_t& reader_guid) const + const fastdds::rtps::GUID_t& reader_guid) const { - for (const fastrtps::rtps::GUID_t& guid : filtered_out_readers) + for (const fastdds::rtps::GUID_t& guid : filtered_out_readers) { if (guid == reader_guid) { @@ -69,7 +69,7 @@ struct DataWriterFilteredChange final : public fastrtps::rtps::CacheChange_t } /// Collection with the GUIDs of the readers for which this change is not relevant. - fastrtps::ResourceLimitedVector filtered_out_readers; + fastdds::ResourceLimitedVector filtered_out_readers; }; } // namespace dds diff --git a/src/cpp/fastdds/publisher/filtering/DataWriterFilteredChangePool.hpp b/src/cpp/fastdds/publisher/filtering/DataWriterFilteredChangePool.hpp index 4da89ef4991..b9ab6315ef4 100644 --- a/src/cpp/fastdds/publisher/filtering/DataWriterFilteredChangePool.hpp +++ b/src/cpp/fastdds/publisher/filtering/DataWriterFilteredChangePool.hpp @@ -32,14 +32,14 @@ namespace dds { /** * A CacheChangePool that allocates DataWriterFilteredChange objects. */ -class DataWriterFilteredChangePool final : public fastrtps::rtps::CacheChangePool +class DataWriterFilteredChangePool final : public fastdds::rtps::CacheChangePool { public: DataWriterFilteredChangePool( - const fastrtps::rtps::PoolConfig& config, - const fastrtps::ResourceLimitedContainerConfig& filter_allocation) - : fastrtps::rtps::CacheChangePool() + const fastdds::rtps::PoolConfig& config, + const fastdds::ResourceLimitedContainerConfig& filter_allocation) + : fastdds::rtps::CacheChangePool() , filter_allocation_(filter_allocation) { init(config); @@ -47,19 +47,19 @@ class DataWriterFilteredChangePool final : public fastrtps::rtps::CacheChangePoo protected: - fastrtps::rtps::CacheChange_t* create_change() const final + fastdds::rtps::CacheChange_t* create_change() const final { return new DataWriterFilteredChange(filter_allocation_); } void destroy_change( - fastrtps::rtps::CacheChange_t* change) const final + fastdds::rtps::CacheChange_t* change) const final { DataWriterFilteredChange* writer_change = static_cast(change); delete writer_change; } - fastrtps::ResourceLimitedContainerConfig filter_allocation_; + fastdds::ResourceLimitedContainerConfig filter_allocation_; }; } // namespace dds diff --git a/src/cpp/fastdds/publisher/filtering/ReaderFilterCollection.hpp b/src/cpp/fastdds/publisher/filtering/ReaderFilterCollection.hpp index b7b8b2d2d8a..dd52012d3ae 100644 --- a/src/cpp/fastdds/publisher/filtering/ReaderFilterCollection.hpp +++ b/src/cpp/fastdds/publisher/filtering/ReaderFilterCollection.hpp @@ -54,7 +54,7 @@ namespace dds { class ReaderFilterCollection { using reader_filter_map_helper = - utilities::collections::map_size_helper; + utilities::collections::map_size_helper; public: @@ -64,7 +64,7 @@ class ReaderFilterCollection * @param allocation Allocation configuration for reader filtering information. */ explicit ReaderFilterCollection( - const fastrtps::ResourceLimitedContainerConfig& allocation) + const fastdds::ResourceLimitedContainerConfig& allocation) : reader_filter_allocator_( reader_filter_map_helper::node_size, reader_filter_map_helper::min_pool_size(allocation.initial)) @@ -103,7 +103,7 @@ class ReaderFilterCollection */ void update_filter_info( DataWriterFilteredChange& change, - const fastrtps::rtps::SampleIdentity& related_sample_identity) const + const fastdds::rtps::SampleIdentity& related_sample_identity) const { change.filtered_out_readers.clear(); @@ -135,7 +135,7 @@ class ReaderFilterCollection // Only evaluate filter on ALIVE changes, as UNREGISTERED and DISPOSED are always relevant bool filter_result = true; - if (fastrtps::rtps::ALIVE == change.kind) + if (fastdds::rtps::ALIVE == change.kind) { // Evaluate filter and update filtered_out_readers filter_result = entry.filter->evaluate(change.serializedPayload, info, it->first); @@ -181,7 +181,7 @@ class ReaderFilterCollection * @param [in] guid GUID of the reader to remove. */ void remove_reader( - const fastrtps::rtps::GUID_t& guid) + const fastdds::rtps::GUID_t& guid) { auto it = reader_filters_.find(guid); if (it != reader_filters_.end()) @@ -201,7 +201,7 @@ class ReaderFilterCollection * @param [in] topic Topic on which the writer calling this method is writing. */ void process_reader_filter_info( - const fastrtps::rtps::GUID_t& guid, + const fastdds::rtps::GUID_t& guid, const rtps::ContentFilterProperty& filter_info, DomainParticipantImpl* participant, Topic* topic) @@ -335,7 +335,7 @@ class ReaderFilterCollection pool_allocator_t reader_filter_allocator_; - foonathan::memory::map reader_filters_; + foonathan::memory::map reader_filters_; std::size_t max_filters_; }; diff --git a/src/cpp/fastdds/publisher/history/DataWriterInstance.hpp b/src/cpp/fastdds/publisher/history/DataWriterInstance.hpp index 7195859eb3c..48e90910d62 100644 --- a/src/cpp/fastdds/publisher/history/DataWriterInstance.hpp +++ b/src/cpp/fastdds/publisher/history/DataWriterInstance.hpp @@ -36,11 +36,11 @@ namespace detail { struct DataWriterInstance { //! A vector of cache changes - std::vector cache_changes; + std::vector cache_changes; //! The time when the group will miss the deadline std::chrono::steady_clock::time_point next_deadline_us; //! Serialized payload for key holder - fastrtps::rtps::SerializedPayload_t key_payload; + fastdds::rtps::SerializedPayload_t key_payload; DataWriterInstance() = default; @@ -50,8 +50,8 @@ struct DataWriterInstance bool is_registered() const { return cache_changes.empty() || - (fastrtps::rtps::NOT_ALIVE_UNREGISTERED != cache_changes.back()->kind && - fastrtps::rtps::NOT_ALIVE_DISPOSED_UNREGISTERED != cache_changes.back()->kind); + (fastdds::rtps::NOT_ALIVE_UNREGISTERED != cache_changes.back()->kind && + fastdds::rtps::NOT_ALIVE_DISPOSED_UNREGISTERED != cache_changes.back()->kind); } }; diff --git a/src/cpp/fastdds/publisher/qos/DataWriterQos.cpp b/src/cpp/fastdds/publisher/qos/DataWriterQos.cpp index 267df91096c..0c353c6022c 100644 --- a/src/cpp/fastdds/publisher/qos/DataWriterQos.cpp +++ b/src/cpp/fastdds/publisher/qos/DataWriterQos.cpp @@ -19,11 +19,12 @@ #include #include +namespace eprosima { +namespace fastdds { +namespace dds { -using namespace eprosima::fastdds::dds; - -const DataWriterQos eprosima::fastdds::dds::DATAWRITER_QOS_DEFAULT; -const DataWriterQos eprosima::fastdds::dds::DATAWRITER_QOS_USE_TOPIC_QOS; +const DataWriterQos DATAWRITER_QOS_DEFAULT; +const DataWriterQos DATAWRITER_QOS_USE_TOPIC_QOS; DataWriterQos::DataWriterQos() { @@ -64,3 +65,7 @@ WriterQos DataWriterQos::get_writerqos( return qos; } + +} // namespace dds +} // namespace fastdds +} // namespace eprosima diff --git a/src/cpp/fastdds/publisher/qos/WriterQos.cpp b/src/cpp/fastdds/publisher/qos/WriterQos.cpp index 3bf221cc905..c50c7daf284 100644 --- a/src/cpp/fastdds/publisher/qos/WriterQos.cpp +++ b/src/cpp/fastdds/publisher/qos/WriterQos.cpp @@ -20,8 +20,7 @@ #include #include -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; namespace eprosima { namespace fastdds { diff --git a/src/cpp/fastdds/subscriber/DataReader.cpp b/src/cpp/fastdds/subscriber/DataReader.cpp index 93defebd8a0..019cc55a89a 100644 --- a/src/cpp/fastdds/subscriber/DataReader.cpp +++ b/src/cpp/fastdds/subscriber/DataReader.cpp @@ -26,8 +26,7 @@ namespace eprosima { -using namespace fastrtps; -using namespace fastrtps::rtps; +using namespace fastdds::rtps; namespace fastdds { namespace dds { @@ -73,7 +72,7 @@ ReturnCode_t DataReader::enable() } bool DataReader::wait_for_unread_message( - const fastrtps::Duration_t& timeout) + const fastdds::Duration_t& timeout) { return impl_->wait_for_unread_message(timeout); } @@ -393,7 +392,7 @@ ReturnCode_t DataReader::get_subscription_matched_status( ReturnCode_t DataReader::get_matched_publication_data( builtin::PublicationBuiltinTopicData& publication_data, - const fastrtps::rtps::InstanceHandle_t& publication_handle) const + const fastdds::rtps::InstanceHandle_t& publication_handle) const { static_cast (publication_data); static_cast (publication_handle); diff --git a/src/cpp/fastdds/subscriber/DataReaderImpl.cpp b/src/cpp/fastdds/subscriber/DataReaderImpl.cpp index 885b69861c7..7dde2e62aec 100644 --- a/src/cpp/fastdds/subscriber/DataReaderImpl.cpp +++ b/src/cpp/fastdds/subscriber/DataReaderImpl.cpp @@ -57,10 +57,10 @@ #include #endif //FASTDDS_STATISTICS -using eprosima::fastrtps::RecursiveTimedMutex; -using eprosima::fastrtps::c_TimeInfinite; +using eprosima::fastdds::RecursiveTimedMutex; +using eprosima::fastdds::c_TimeInfinite; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; using namespace std::chrono; namespace eprosima { @@ -97,7 +97,7 @@ DataReaderImpl::DataReaderImpl( TopicDescription* topic, const DataReaderQos& qos, DataReaderListener* listener, - std::shared_ptr payload_pool) + std::shared_ptr payload_pool) : subscriber_(s) , type_(type) , topic_(topic) @@ -117,7 +117,7 @@ DataReaderImpl::DataReaderImpl( endpoint_attributes.setEntityID(qos_.endpoint().entity_id); endpoint_attributes.setUserDefinedID(qos_.endpoint().user_defined_id); RTPSParticipantImpl::preprocess_endpoint_attributes( - fastrtps::rtps::EntityId_t::unknown(), + fastdds::rtps::EntityId_t::unknown(), subscriber_->get_participant_impl()->id_counter(), endpoint_attributes, guid_.entityId); guid_.guidPrefix = subscriber_->get_participant_impl()->guid().guidPrefix; @@ -807,7 +807,7 @@ uint64_t DataReaderImpl::get_unread_count( return ret_val; } -const fastrtps::rtps::GUID_t& DataReaderImpl::guid() const +const fastdds::rtps::GUID_t& DataReaderImpl::guid() const { return guid_; } @@ -908,9 +908,9 @@ const DataReaderQos& DataReaderImpl::get_qos() const void DataReaderImpl::InnerDataReaderListener::on_data_available( RTPSReader* /*reader*/, - const fastrtps::rtps::GUID_t& writer_guid, - const fastrtps::rtps::SequenceNumber_t& first_sequence, - const fastrtps::rtps::SequenceNumber_t& last_sequence, + const fastdds::rtps::GUID_t& writer_guid, + const fastdds::rtps::SequenceNumber_t& first_sequence, + const fastdds::rtps::SequenceNumber_t& last_sequence, bool& should_notify_individual_changes) { should_notify_individual_changes = false; @@ -1065,9 +1065,9 @@ void DataReaderImpl::InnerDataReaderListener::notify_status_observer( #endif //FASTDDS_STATISTICS bool DataReaderImpl::on_data_available( - const fastrtps::rtps::GUID_t& writer_guid, - const fastrtps::rtps::SequenceNumber_t& first_sequence, - const fastrtps::rtps::SequenceNumber_t& last_sequence) + const fastdds::rtps::GUID_t& writer_guid, + const fastdds::rtps::SequenceNumber_t& first_sequence, + const fastdds::rtps::SequenceNumber_t& last_sequence) { bool ret_val = false; @@ -1765,9 +1765,9 @@ void DataReaderImpl::set_qos( } } -fastrtps::TopicAttributes DataReaderImpl::topic_attributes() const +fastdds::TopicAttributes DataReaderImpl::topic_attributes() const { - fastrtps::TopicAttributes topic_att; + fastdds::TopicAttributes topic_att; topic_att.topicKind = type_->m_isGetKeyDefined ? WITH_KEY : NO_KEY; topic_att.topicName = topic_->get_impl()->get_rtps_topic_name(); topic_att.topicDataType = topic_->get_type_name(); @@ -1776,7 +1776,7 @@ fastrtps::TopicAttributes DataReaderImpl::topic_attributes() const if (type_->auto_fill_type_information() && xtypes::TK_NONE != type_->type_identifiers().type_identifier1()._d()) { if (RETCODE_OK == - fastrtps::rtps::RTPSDomainImpl::get_instance()->type_object_registry_observer().get_type_information( + fastdds::rtps::RTPSDomainImpl::get_instance()->type_object_registry_observer().get_type_information( type_->type_identifiers(), topic_att.type_information.type_information)) { topic_att.type_information.assigned(true); @@ -1851,8 +1851,8 @@ void DataReaderImpl::release_payload_pool() if (!is_custom_payload_pool_) { PoolConfig config = PoolConfig::from_history_attributes(history_.m_att); - std::shared_ptr topic_payload_pool = - std::dynamic_pointer_cast(payload_pool_); + std::shared_ptr topic_payload_pool = + std::dynamic_pointer_cast(payload_pool_); topic_payload_pool->release_history(config, true); } diff --git a/src/cpp/fastdds/subscriber/DataReaderImpl.hpp b/src/cpp/fastdds/subscriber/DataReaderImpl.hpp index 82e218837fd..d8c1f35779c 100644 --- a/src/cpp/fastdds/subscriber/DataReaderImpl.hpp +++ b/src/cpp/fastdds/subscriber/DataReaderImpl.hpp @@ -49,16 +49,14 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSReader; class TimedEvent; } // namespace rtps -} // namespace fastrtps -namespace fastdds { namespace dds { class ContentFilteredTopicImpl; @@ -86,8 +84,8 @@ class DataReaderImpl protected: - using ITopicPayloadPool = eprosima::fastrtps::rtps::ITopicPayloadPool; - using IPayloadPool = eprosima::fastrtps::rtps::IPayloadPool; + using ITopicPayloadPool = eprosima::fastdds::rtps::ITopicPayloadPool; + using IPayloadPool = eprosima::fastdds::rtps::IPayloadPool; friend class SubscriberImpl; @@ -100,7 +98,7 @@ class DataReaderImpl TopicDescription* topic, const DataReaderQos& qos, DataReaderListener* listener = nullptr, - std::shared_ptr payload_pool = nullptr); + std::shared_ptr payload_pool = nullptr); public: @@ -120,7 +118,7 @@ class DataReaderImpl * Method to block the current thread until an unread message is available */ bool wait_for_unread_message( - const fastrtps::Duration_t& timeout); + const fastdds::Duration_t& timeout); /** @name Read or take data methods. @@ -218,9 +216,9 @@ class DataReaderImpl * Get associated GUID * @return Associated GUID */ - const fastrtps::rtps::GUID_t& guid() const; + const fastdds::rtps::GUID_t& guid() const; - fastrtps::rtps::InstanceHandle_t get_instance_handle() const; + fastdds::rtps::InstanceHandle_t get_instance_handle() const; /** * Get topic data type @@ -253,7 +251,7 @@ class DataReaderImpl /* TODO bool get_key_value( void* data, - const fastrtps::rtps::InstanceHandle_t& handle); + const fastdds::rtps::InstanceHandle_t& handle); */ ReturnCode_t get_liveliness_changed_status( @@ -286,7 +284,7 @@ class DataReaderImpl /* TODO bool wait_for_historical_data( - const fastrtps::Duration_t& max_wait) const; + const fastdds::Duration_t& max_wait) const; */ //! Remove all listeners in the hierarchy to allow a quiet destruction @@ -383,7 +381,7 @@ class DataReaderImpl SubscriberImpl* subscriber_ = nullptr; //!Pointer to associated RTPSReader - fastrtps::rtps::RTPSReader* reader_ = nullptr; + fastdds::rtps::RTPSReader* reader_ = nullptr; //! Pointer to the TopicDataType object. TypeSupport type_; @@ -399,9 +397,9 @@ class DataReaderImpl DataReaderListener* listener_ = nullptr; mutable std::mutex listener_mutex_; - fastrtps::rtps::GUID_t guid_; + fastdds::rtps::GUID_t guid_; - class InnerDataReaderListener : public fastrtps::rtps::ReaderListener + class InnerDataReaderListener : public fastdds::rtps::ReaderListener { public: @@ -416,32 +414,32 @@ class DataReaderImpl } void on_reader_matched( - fastrtps::rtps::RTPSReader* reader, - const fastrtps::rtps::MatchingInfo& info) override; + fastdds::rtps::RTPSReader* reader, + const fastdds::rtps::MatchingInfo& info) override; void on_data_available( - fastrtps::rtps::RTPSReader* reader, - const fastrtps::rtps::GUID_t& writer_guid, - const fastrtps::rtps::SequenceNumber_t& first_sequence, - const fastrtps::rtps::SequenceNumber_t& last_sequence, + fastdds::rtps::RTPSReader* reader, + const fastdds::rtps::GUID_t& writer_guid, + const fastdds::rtps::SequenceNumber_t& first_sequence, + const fastdds::rtps::SequenceNumber_t& last_sequence, bool& should_notify_individual_changes) override; void on_liveliness_changed( - fastrtps::rtps::RTPSReader* reader, + fastdds::rtps::RTPSReader* reader, const LivelinessChangedStatus& status) override; void on_requested_incompatible_qos( - fastrtps::rtps::RTPSReader* reader, + fastdds::rtps::RTPSReader* reader, fastdds::dds::PolicyMask qos) override; void on_sample_lost( - fastrtps::rtps::RTPSReader* reader, + fastdds::rtps::RTPSReader* reader, int32_t sample_lost_since_last_update) override; void on_sample_rejected( - fastrtps::rtps::RTPSReader* reader, + fastdds::rtps::RTPSReader* reader, SampleRejectedStatusKind reason, - const fastrtps::rtps::CacheChange_t* const change) override; + const fastdds::rtps::CacheChange_t* const change) override; #ifdef FASTDDS_STATISTICS void notify_status_observer( @@ -454,13 +452,13 @@ class DataReaderImpl reader_listener_; //! A timer used to check for deadlines - fastrtps::rtps::TimedEvent* deadline_timer_ = nullptr; + fastdds::rtps::TimedEvent* deadline_timer_ = nullptr; //! Deadline duration in microseconds std::chrono::duration> deadline_duration_us_; //! The current timer owner, i.e. the instance which started the deadline timer - fastrtps::rtps::InstanceHandle_t timer_owner_; + fastdds::rtps::InstanceHandle_t timer_owner_; //! Subscription matched status SubscriptionMatchedStatus subscription_matched_status_; @@ -480,7 +478,7 @@ class DataReaderImpl SampleRejectedStatus sample_rejected_status_; //! A timed callback to remove expired samples - fastrtps::rtps::TimedEvent* lifespan_timer_ = nullptr; + fastdds::rtps::TimedEvent* lifespan_timer_ = nullptr; //! The lifespan duration std::chrono::duration> lifespan_duration_us_; @@ -572,12 +570,12 @@ class DataReaderImpl bool trigger_value); void update_subscription_matched_status( - const fastrtps::rtps::MatchingInfo& status); + const fastdds::rtps::MatchingInfo& status); bool on_data_available( - const fastrtps::rtps::GUID_t& writer_guid, - const fastrtps::rtps::SequenceNumber_t& first_sequence, - const fastrtps::rtps::SequenceNumber_t& last_sequence); + const fastdds::rtps::GUID_t& writer_guid, + const fastdds::rtps::SequenceNumber_t& first_sequence, + const fastdds::rtps::SequenceNumber_t& last_sequence); /** * @brief A method called when a new cache change is added @@ -585,7 +583,7 @@ class DataReaderImpl * @return True if the change was added (due to some QoS it could have been 'rejected') */ bool on_new_cache_change_added( - const fastrtps::rtps::CacheChange_t* const change); + const fastdds::rtps::CacheChange_t* const change); /** * @brief Method called when an instance misses the deadline @@ -602,7 +600,7 @@ class DataReaderImpl */ bool lifespan_expired(); - fastrtps::TopicAttributes topic_attributes() const; + fastdds::TopicAttributes topic_attributes() const; void subscriber_qos_updated(); @@ -623,7 +621,7 @@ class DataReaderImpl */ const SampleRejectedStatus& update_sample_rejected_status( SampleRejectedStatusKind reason, - const fastrtps::rtps::CacheChange_t* const change_in); + const fastdds::rtps::CacheChange_t* const change_in); /** * Returns the most appropriate listener to handle the callback for the given status, @@ -639,7 +637,7 @@ class DataReaderImpl void stop(); ReturnCode_t check_datasharing_compatible( - const fastrtps::rtps::ReaderAttributes& reader_attributes, + const fastdds::rtps::ReaderAttributes& reader_attributes, bool& is_datasharing_compatible) const; private: diff --git a/src/cpp/fastdds/subscriber/DataReaderImpl/DataReaderLoanManager.hpp b/src/cpp/fastdds/subscriber/DataReaderImpl/DataReaderLoanManager.hpp index f47fbc98456..c0377f450af 100644 --- a/src/cpp/fastdds/subscriber/DataReaderImpl/DataReaderLoanManager.hpp +++ b/src/cpp/fastdds/subscriber/DataReaderImpl/DataReaderLoanManager.hpp @@ -136,7 +136,7 @@ struct DataReaderLoanManager }; - using collection_type = eprosima::fastrtps::ResourceLimitedVector; + using collection_type = eprosima::fastdds::ResourceLimitedVector; int32_t max_samples_ = 0; collection_type free_loans_; diff --git a/src/cpp/fastdds/subscriber/DataReaderImpl/ReadTakeCommand.hpp b/src/cpp/fastdds/subscriber/DataReaderImpl/ReadTakeCommand.hpp index 62e7ec5f588..ce539ae5efc 100644 --- a/src/cpp/fastdds/subscriber/DataReaderImpl/ReadTakeCommand.hpp +++ b/src/cpp/fastdds/subscriber/DataReaderImpl/ReadTakeCommand.hpp @@ -51,11 +51,11 @@ namespace detail { struct ReadTakeCommand { using history_type = eprosima::fastdds::dds::detail::DataReaderHistory; - using CacheChange_t = eprosima::fastrtps::rtps::CacheChange_t; - using RTPSReader = eprosima::fastrtps::rtps::RTPSReader; - using WriterProxy = eprosima::fastrtps::rtps::WriterProxy; + using CacheChange_t = eprosima::fastdds::rtps::CacheChange_t; + using RTPSReader = eprosima::fastdds::rtps::RTPSReader; + using WriterProxy = eprosima::fastdds::rtps::WriterProxy; using SampleInfoSeq = LoanableTypedCollection; - using DataSharingPayloadPool = eprosima::fastrtps::rtps::DataSharingPayloadPool; + using DataSharingPayloadPool = eprosima::fastdds::rtps::DataSharingPayloadPool; ReadTakeCommand( DataReaderImpl& reader, @@ -252,12 +252,12 @@ struct ReadTakeCommand switch (item->kind) { - case eprosima::fastrtps::rtps::NOT_ALIVE_DISPOSED: - case eprosima::fastrtps::rtps::NOT_ALIVE_DISPOSED_UNREGISTERED: - case eprosima::fastrtps::rtps::NOT_ALIVE_UNREGISTERED: + case eprosima::fastdds::rtps::NOT_ALIVE_DISPOSED: + case eprosima::fastdds::rtps::NOT_ALIVE_DISPOSED_UNREGISTERED: + case eprosima::fastdds::rtps::NOT_ALIVE_UNREGISTERED: info.valid_data = false; break; - case eprosima::fastrtps::rtps::ALIVE: + case eprosima::fastdds::rtps::ALIVE: default: break; } diff --git a/src/cpp/fastdds/subscriber/DataReaderImpl/SampleInfoPool.hpp b/src/cpp/fastdds/subscriber/DataReaderImpl/SampleInfoPool.hpp index bbef87f718e..dc98a24da4c 100644 --- a/src/cpp/fastdds/subscriber/DataReaderImpl/SampleInfoPool.hpp +++ b/src/cpp/fastdds/subscriber/DataReaderImpl/SampleInfoPool.hpp @@ -94,7 +94,7 @@ struct SampleInfoPool private: - using collection_type = eprosima::fastrtps::ResourceLimitedVector; + using collection_type = eprosima::fastdds::ResourceLimitedVector; collection_type free_items_; collection_type used_items_; diff --git a/src/cpp/fastdds/subscriber/DataReaderImpl/SampleLoanManager.hpp b/src/cpp/fastdds/subscriber/DataReaderImpl/SampleLoanManager.hpp index 31ece784d99..af9f9d84f67 100644 --- a/src/cpp/fastdds/subscriber/DataReaderImpl/SampleLoanManager.hpp +++ b/src/cpp/fastdds/subscriber/DataReaderImpl/SampleLoanManager.hpp @@ -41,11 +41,11 @@ namespace detail { struct SampleLoanManager { - using CacheChange_t = eprosima::fastrtps::rtps::CacheChange_t; - using IPayloadPool = eprosima::fastrtps::rtps::IPayloadPool; - using PoolConfig = eprosima::fastrtps::rtps::PoolConfig; - using SampleIdentity = eprosima::fastrtps::rtps::SampleIdentity; - using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; + using CacheChange_t = eprosima::fastdds::rtps::CacheChange_t; + using IPayloadPool = eprosima::fastdds::rtps::IPayloadPool; + using PoolConfig = eprosima::fastdds::rtps::PoolConfig; + using SampleIdentity = eprosima::fastdds::rtps::SampleIdentity; + using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; SampleLoanManager( const PoolConfig& pool_config, @@ -201,10 +201,10 @@ struct SampleLoanManager }; - using collection_type = eprosima::fastrtps::ResourceLimitedVector; + using collection_type = eprosima::fastdds::ResourceLimitedVector; bool is_plain_; - eprosima::fastrtps::ResourceLimitedContainerConfig limits_; + eprosima::fastdds::ResourceLimitedContainerConfig limits_; collection_type free_loans_; collection_type used_loans_; TypeSupport type_; diff --git a/src/cpp/fastdds/subscriber/ReadCondition.cpp b/src/cpp/fastdds/subscriber/ReadCondition.cpp index fc773e2ecc7..dceff372061 100644 --- a/src/cpp/fastdds/subscriber/ReadCondition.cpp +++ b/src/cpp/fastdds/subscriber/ReadCondition.cpp @@ -18,7 +18,9 @@ #include -using namespace eprosima::fastdds::dds; +namespace eprosima { +namespace fastdds { +namespace dds { ReadCondition::ReadCondition() { @@ -57,3 +59,7 @@ InstanceStateMask ReadCondition::get_instance_state_mask() const noexcept assert((bool)impl_); return impl_->get_instance_state_mask(); } + +} // namespace dds +} // namespace fastdds +} // namespace eprosima diff --git a/src/cpp/fastdds/subscriber/Subscriber.cpp b/src/cpp/fastdds/subscriber/Subscriber.cpp index ff2a03df165..88b058f3c4f 100644 --- a/src/cpp/fastdds/subscriber/Subscriber.cpp +++ b/src/cpp/fastdds/subscriber/Subscriber.cpp @@ -21,8 +21,9 @@ #include #include -using namespace eprosima; -using namespace eprosima::fastdds::dds; +namespace eprosima { +namespace fastdds { +namespace dds { Subscriber::Subscriber( SubscriberImpl* pimpl, @@ -107,7 +108,7 @@ DataReader* Subscriber::create_datareader( const DataReaderQos& reader_qos, DataReaderListener* listener, const StatusMask& mask, - std::shared_ptr payload_pool) + std::shared_ptr payload_pool) { return impl_->create_datareader(topic, reader_qos, listener, mask, payload_pool); } @@ -117,7 +118,7 @@ DataReader* Subscriber::create_datareader_with_profile( const std::string& profile_name, DataReaderListener* listener, const StatusMask& mask, - std::shared_ptr payload_pool) + std::shared_ptr payload_pool) { return impl_->create_datareader_with_profile(topic, profile_name, listener, mask, payload_pool); } @@ -229,7 +230,11 @@ const DomainParticipant* Subscriber::get_participant() const return impl_->get_participant(); } -const fastrtps::rtps::InstanceHandle_t& Subscriber::get_instance_handle() const +const fastdds::rtps::InstanceHandle_t& Subscriber::get_instance_handle() const { return impl_->get_instance_handle(); } + +} // namespace dds +} // namespace fastdds +} // namespace eprosima diff --git a/src/cpp/fastdds/subscriber/SubscriberImpl.cpp b/src/cpp/fastdds/subscriber/SubscriberImpl.cpp index 3e436111b71..81ff756b712 100644 --- a/src/cpp/fastdds/subscriber/SubscriberImpl.cpp +++ b/src/cpp/fastdds/subscriber/SubscriberImpl.cpp @@ -45,11 +45,10 @@ namespace eprosima { namespace fastdds { namespace dds { -using fastrtps::xmlparser::XMLProfileManager; -using fastrtps::xmlparser::XMLP_ret; -using fastrtps::rtps::InstanceHandle_t; -using fastrtps::rtps::Property; -using fastrtps::Duration_t; +using xmlparser::XMLProfileManager; +using xmlparser::XMLP_ret; +using rtps::InstanceHandle_t; +using rtps::Property; SubscriberImpl::SubscriberImpl( DomainParticipantImpl* p, @@ -177,7 +176,7 @@ DataReaderImpl* SubscriberImpl::create_datareader_impl( TopicDescription* topic, const DataReaderQos& qos, DataReaderListener* listener, - std::shared_ptr payload_pool) + std::shared_ptr payload_pool) { return new DataReaderImpl(this, type, topic, qos, listener, payload_pool); } @@ -187,7 +186,7 @@ DataReader* SubscriberImpl::create_datareader( const DataReaderQos& qos, DataReaderListener* listener, const StatusMask& mask, - std::shared_ptr payload_pool) + std::shared_ptr payload_pool) { EPROSIMA_LOG_INFO(SUBSCRIBER, "CREATING SUBSCRIBER IN TOPIC: " << topic->get_name()); //Look for the correct type registration @@ -252,7 +251,7 @@ DataReader* SubscriberImpl::create_datareader_with_profile( const std::string& profile_name, DataReaderListener* listener, const StatusMask& mask, - std::shared_ptr payload_pool) + std::shared_ptr payload_pool) { // TODO (ILG): Change when we have full XML support for DDS QoS profiles SubscriberAttributes attr; @@ -405,7 +404,7 @@ DataReaderQos& SubscriberImpl::get_default_datareader_qos() } bool SubscriberImpl::contains_entity( - const fastrtps::rtps::InstanceHandle_t& handle) const + const fastdds::rtps::InstanceHandle_t& handle) const { std::lock_guard lock(mtx_readers_); for (auto vit : readers_) @@ -691,7 +690,7 @@ bool SubscriberImpl::can_be_deleted() const #ifdef FASTDDS_STATISTICS bool SubscriberImpl::get_monitoring_status( statistics::MonitorServiceData& status, - const fastrtps::rtps::GUID_t& entity_guid) + const fastdds::rtps::GUID_t& entity_guid) { bool ret = false; std::vector readers; diff --git a/src/cpp/fastdds/subscriber/SubscriberImpl.hpp b/src/cpp/fastdds/subscriber/SubscriberImpl.hpp index c624ac5bc26..b6bb6af2732 100644 --- a/src/cpp/fastdds/subscriber/SubscriberImpl.hpp +++ b/src/cpp/fastdds/subscriber/SubscriberImpl.hpp @@ -34,7 +34,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSParticipant; @@ -43,9 +43,6 @@ class RTPSParticipant; class TopicAttributes; -} // namespace fastrtps - -namespace fastdds { namespace dds { class SubscriberListener; @@ -97,14 +94,14 @@ class SubscriberImpl const DataReaderQos& reader_qos, DataReaderListener* listener = nullptr, const StatusMask& mask = StatusMask::all(), - std::shared_ptr payload_pool = nullptr); + std::shared_ptr payload_pool = nullptr); DataReader* create_datareader_with_profile( TopicDescription* topic, const std::string& profile_name, DataReaderListener* listener, const StatusMask& mask = StatusMask::all(), - std::shared_ptr payload_pool = nullptr); + std::shared_ptr payload_pool = nullptr); ReturnCode_t delete_datareader( const DataReader* reader); @@ -113,7 +110,7 @@ class SubscriberImpl const std::string& topic_name) const; bool contains_entity( - const fastrtps::rtps::InstanceHandle_t& handle) const; + const fastdds::rtps::InstanceHandle_t& handle) const; /* TODO bool begin_access(); */ @@ -160,12 +157,12 @@ class SubscriberImpl return participant_; } - const fastrtps::rtps::RTPSParticipant* rtps_participant() const + const fastdds::rtps::RTPSParticipant* rtps_participant() const { return rtps_participant_; } - fastrtps::rtps::RTPSParticipant* rtps_participant() + fastdds::rtps::RTPSParticipant* rtps_participant() { return rtps_participant_; } @@ -175,7 +172,7 @@ class SubscriberImpl return user_subscriber_; } - const fastrtps::rtps::InstanceHandle_t& get_instance_handle() const; + const fastdds::rtps::InstanceHandle_t& get_instance_handle() const; //! Remove all listeners in the hierarchy to allow a quiet destruction void disable(); @@ -227,7 +224,7 @@ class SubscriberImpl #ifdef FASTDDS_STATISTICS bool get_monitoring_status( statistics::MonitorServiceData& status, - const fastrtps::rtps::GUID_t& entity_guid); + const fastdds::rtps::GUID_t& entity_guid); #endif //FASTDDS_STATISTICS protected: @@ -293,18 +290,18 @@ class SubscriberImpl Subscriber* user_subscriber_; //!RTPSParticipant - fastrtps::rtps::RTPSParticipant* rtps_participant_; + fastdds::rtps::RTPSParticipant* rtps_participant_; DataReaderQos default_datareader_qos_; - fastrtps::rtps::InstanceHandle_t handle_; + fastdds::rtps::InstanceHandle_t handle_; virtual DataReaderImpl* create_datareader_impl( const TypeSupport& type, TopicDescription* topic, const DataReaderQos& qos, DataReaderListener* listener, - std::shared_ptr payload_pool); + std::shared_ptr payload_pool); }; } /* namespace dds */ diff --git a/src/cpp/fastdds/subscriber/history/DataReaderCacheChange.hpp b/src/cpp/fastdds/subscriber/history/DataReaderCacheChange.hpp index 5b13109f721..c3ff994f38c 100644 --- a/src/cpp/fastdds/subscriber/history/DataReaderCacheChange.hpp +++ b/src/cpp/fastdds/subscriber/history/DataReaderCacheChange.hpp @@ -29,7 +29,7 @@ namespace dds { namespace detail { /// A DataReader cache entry -using DataReaderCacheChange = fastrtps::rtps::CacheChange_t*; +using DataReaderCacheChange = fastdds::rtps::CacheChange_t*; } /* namespace detail */ } /* namespace dds */ diff --git a/src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp b/src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp index bf0ccf56037..6ed2111e228 100644 --- a/src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp +++ b/src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp @@ -35,14 +35,14 @@ #include #include -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; namespace eprosima { namespace fastdds { namespace dds { namespace detail { -using eprosima::fastrtps::RecursiveTimedMutex; +using fastdds::RecursiveTimedMutex; static HistoryAttributes to_history_attributes( const TypeSupport& type, diff --git a/src/cpp/fastdds/subscriber/history/DataReaderHistory.hpp b/src/cpp/fastdds/subscriber/history/DataReaderHistory.hpp index 71358ed80d9..c66abf41552 100644 --- a/src/cpp/fastdds/subscriber/history/DataReaderHistory.hpp +++ b/src/cpp/fastdds/subscriber/history/DataReaderHistory.hpp @@ -57,15 +57,15 @@ namespace detail { /** * Class DataReaderHistory, container of the different CacheChanges of a DataReader */ -class DataReaderHistory : public eprosima::fastrtps::rtps::ReaderHistory +class DataReaderHistory : public eprosima::fastdds::rtps::ReaderHistory { public: - using MemoryManagementPolicy_t = eprosima::fastrtps::rtps::MemoryManagementPolicy_t; - using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; - using CacheChange_t = eprosima::fastrtps::rtps::CacheChange_t; - using GUID_t = eprosima::fastrtps::rtps::GUID_t; - using SequenceNumber_t = eprosima::fastrtps::rtps::SequenceNumber_t; + using MemoryManagementPolicy_t = eprosima::fastdds::rtps::MemoryManagementPolicy_t; + using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; + using CacheChange_t = eprosima::fastdds::rtps::CacheChange_t; + using GUID_t = eprosima::fastdds::rtps::GUID_t; + using SequenceNumber_t = eprosima::fastdds::rtps::SequenceNumber_t; using InstanceCollection = std::map>; using instance_info = InstanceCollection::iterator; @@ -350,7 +350,7 @@ class DataReaderHistory : public eprosima::fastrtps::rtps::ReaderHistory CacheChange_t* const change); void writer_not_alive( - const fastrtps::rtps::GUID_t& writer_guid); + const fastdds::rtps::GUID_t& writer_guid); void check_and_remove_instance( instance_info& instance_info); @@ -370,9 +370,9 @@ class DataReaderHistory : public eprosima::fastrtps::rtps::ReaderHistory private: //!Resource limits for allocating the array of changes per instance - eprosima::fastrtps::ResourceLimitedContainerConfig key_changes_allocation_; + eprosima::fastdds::ResourceLimitedContainerConfig key_changes_allocation_; //!Resource limits for allocating the array of alive writers per instance - eprosima::fastrtps::ResourceLimitedContainerConfig key_writers_allocation_; + eprosima::fastdds::ResourceLimitedContainerConfig key_writers_allocation_; //!Collection of DataReaderInstance objects accessible by their handle InstanceCollection instances_; //!Collection of DataReaderInstance objects with available data, accessible by their handle diff --git a/src/cpp/fastdds/subscriber/history/DataReaderInstance.hpp b/src/cpp/fastdds/subscriber/history/DataReaderInstance.hpp index 9979a21bf2c..4b4d973e4b8 100644 --- a/src/cpp/fastdds/subscriber/history/DataReaderInstance.hpp +++ b/src/cpp/fastdds/subscriber/history/DataReaderInstance.hpp @@ -38,9 +38,9 @@ namespace detail { /// Book-keeping information for an instance struct DataReaderInstance { - using ChangeCollection = eprosima::fastrtps::ResourceLimitedVector; - using WriterOwnership = std::pair; - using WriterCollection = eprosima::fastrtps::ResourceLimitedVector; + using ChangeCollection = eprosima::fastdds::ResourceLimitedVector; + using WriterOwnership = std::pair; + using WriterCollection = eprosima::fastdds::ResourceLimitedVector; //! A vector of DataReader changes belonging to the same instance ChangeCollection cache_changes; @@ -60,15 +60,15 @@ struct DataReaderInstance int32_t no_writers_generation_count = 0; DataReaderInstance( - const eprosima::fastrtps::ResourceLimitedContainerConfig& changes_allocation, - const eprosima::fastrtps::ResourceLimitedContainerConfig& writers_allocation) + const eprosima::fastdds::ResourceLimitedContainerConfig& changes_allocation, + const eprosima::fastdds::ResourceLimitedContainerConfig& writers_allocation) : cache_changes(changes_allocation) , alive_writers(writers_allocation) { } void writer_update_its_ownership_strength( - const fastrtps::rtps::GUID_t& writer_guid, + const fastdds::rtps::GUID_t& writer_guid, const uint32_t ownership_strength) { if (writer_guid == current_owner.first) @@ -93,8 +93,8 @@ struct DataReaderInstance bool update_state( DataReaderHistoryCounters& counters, - const fastrtps::rtps::ChangeKind_t change_kind, - const fastrtps::rtps::GUID_t& writer_guid, + const fastdds::rtps::ChangeKind_t change_kind, + const fastdds::rtps::GUID_t& writer_guid, const uint32_t ownership_strength) { bool ret_val = false; @@ -110,20 +110,20 @@ struct DataReaderInstance switch (change_kind) { - case fastrtps::rtps::ALIVE: + case fastdds::rtps::ALIVE: ret_val = writer_alive(counters, writer_guid, ownership_strength); break; - case fastrtps::rtps::NOT_ALIVE_DISPOSED: + case fastdds::rtps::NOT_ALIVE_DISPOSED: ret_val = writer_dispose(counters, writer_guid, ownership_strength); break; - case fastrtps::rtps::NOT_ALIVE_DISPOSED_UNREGISTERED: + case fastdds::rtps::NOT_ALIVE_DISPOSED_UNREGISTERED: ret_val = writer_dispose(counters, writer_guid, ownership_strength); ret_val |= writer_unregister(counters, writer_guid); break; - case fastrtps::rtps::NOT_ALIVE_UNREGISTERED: + case fastdds::rtps::NOT_ALIVE_UNREGISTERED: ret_val = writer_unregister(counters, writer_guid); break; @@ -137,14 +137,14 @@ struct DataReaderInstance bool writer_removed( DataReaderHistoryCounters& counters, - const fastrtps::rtps::GUID_t& writer_guid) + const fastdds::rtps::GUID_t& writer_guid) { return has_been_accounted_ && writer_unregister(counters, writer_guid); } void deadline_missed() { - if (fastrtps::rtps::c_Guid_Unknown != current_owner.first) + if (fastdds::rtps::c_Guid_Unknown != current_owner.first) { if (alive_writers.remove_if([&](const WriterOwnership& item) { @@ -153,7 +153,7 @@ struct DataReaderInstance { current_owner.second = 0; - current_owner.first = fastrtps::rtps::c_Guid_Unknown; + current_owner.first = fastdds::rtps::c_Guid_Unknown; if (alive_writers.empty() && (InstanceStateKind::ALIVE_INSTANCE_STATE == instance_state)) { instance_state = InstanceStateKind::NOT_ALIVE_NO_WRITERS_INSTANCE_STATE; @@ -173,7 +173,7 @@ struct DataReaderInstance bool writer_alive( DataReaderHistoryCounters& counters, - const fastrtps::rtps::GUID_t& writer_guid, + const fastdds::rtps::GUID_t& writer_guid, const uint32_t ownership_strength) { bool ret_val = false; @@ -197,11 +197,11 @@ struct DataReaderInstance } else if ((std::numeric_limits::max)() == ownership_strength) // uint32_t::max indicates we are in SHARED_OWNERSHIP_QOS. { - assert(eprosima::fastrtps::rtps::c_Guid_Unknown == current_owner.first); + assert(eprosima::fastdds::rtps::c_Guid_Unknown == current_owner.first); assert((std::numeric_limits::max)() == current_owner.second); ret_val = true; } - else if (eprosima::fastrtps::rtps::c_Guid_Unknown == current_owner.first) // Without owner. + else if (eprosima::fastdds::rtps::c_Guid_Unknown == current_owner.first) // Without owner. { current_owner.first = writer_guid; current_owner.second = ownership_strength; @@ -237,7 +237,7 @@ struct DataReaderInstance bool writer_dispose( DataReaderHistoryCounters& counters, - const fastrtps::rtps::GUID_t& writer_guid, + const fastdds::rtps::GUID_t& writer_guid, const uint32_t ownership_strength) { bool ret_val = false; @@ -268,7 +268,7 @@ struct DataReaderInstance bool writer_unregister( DataReaderHistoryCounters& counters, - const fastrtps::rtps::GUID_t& writer_guid) + const fastdds::rtps::GUID_t& writer_guid) { bool ret_val = false; @@ -280,7 +280,7 @@ struct DataReaderInstance if (writer_guid == current_owner.first) { current_owner.second = 0; - current_owner.first = fastrtps::rtps::c_Guid_Unknown; + current_owner.first = fastdds::rtps::c_Guid_Unknown; if (ALIVE_INSTANCE_STATE == instance_state) { update_owner(); @@ -300,7 +300,7 @@ struct DataReaderInstance } void writer_set( - const fastrtps::rtps::GUID_t& writer_guid, + const fastdds::rtps::GUID_t& writer_guid, const uint32_t ownership_strength) { auto it = std::find_if(alive_writers.begin(), alive_writers.end(), [&writer_guid](const WriterOwnership& item) diff --git a/src/cpp/fastdds/subscriber/qos/ReaderQos.cpp b/src/cpp/fastdds/subscriber/qos/ReaderQos.cpp index 423f2459cf8..864d85b4df4 100644 --- a/src/cpp/fastdds/subscriber/qos/ReaderQos.cpp +++ b/src/cpp/fastdds/subscriber/qos/ReaderQos.cpp @@ -20,8 +20,6 @@ #include #include -using namespace eprosima::fastrtps; - namespace eprosima { namespace fastdds { namespace dds { diff --git a/src/cpp/fastdds/topic/ContentFilterInfo.hpp b/src/cpp/fastdds/topic/ContentFilterInfo.hpp index 84a28496862..661c04f4e4d 100644 --- a/src/cpp/fastdds/topic/ContentFilterInfo.hpp +++ b/src/cpp/fastdds/topic/ContentFilterInfo.hpp @@ -80,7 +80,7 @@ inline bool cdr_serialized_size( } inline void add_bitmap( - fastrtps::rtps::CDRMessage_t& msg, + fastdds::rtps::CDRMessage_t& msg, uint32_t current_bitmap, uint32_t& bitmap_pos) { @@ -88,7 +88,7 @@ inline void add_bitmap( uint32_t old_pos = msg.pos; msg.pos = bitmap_pos; msg.length = bitmap_pos; - fastrtps::rtps::CDRMessage::addUInt32(&msg, current_bitmap); + fastdds::rtps::CDRMessage::addUInt32(&msg, current_bitmap); bitmap_pos = msg.pos; msg.pos = old_pos; msg.length = old_len; @@ -108,11 +108,11 @@ inline void add_bitmap( */ template void cdr_serialize( - fastrtps::rtps::SerializedPayload_t& payload, + fastdds::rtps::SerializedPayload_t& payload, std::size_t num_filters, FilterEvaluate evaluate) { - using namespace fastrtps::rtps; + using namespace fastdds::rtps; uint16_t cdr_size = 0; if ((0 < num_filters) && cdr_serialized_size(num_filters, cdr_size)) diff --git a/src/cpp/fastdds/topic/ContentFilteredTopicImpl.cpp b/src/cpp/fastdds/topic/ContentFilteredTopicImpl.cpp index 073b55eb86d..38d1473ba47 100644 --- a/src/cpp/fastdds/topic/ContentFilteredTopicImpl.cpp +++ b/src/cpp/fastdds/topic/ContentFilteredTopicImpl.cpp @@ -36,8 +36,8 @@ namespace fastdds { namespace dds { bool ContentFilteredTopicImpl::is_relevant( - const fastrtps::rtps::CacheChange_t& change, - const fastrtps::rtps::GUID_t& reader_guid) const + const fastdds::rtps::CacheChange_t& change, + const fastdds::rtps::GUID_t& reader_guid) const { bool ret_val = true; @@ -115,7 +115,7 @@ void ContentFilteredTopicImpl::update_signature() } bool ContentFilteredTopicImpl::check_filter_signature( - const fastrtps::rtps::CacheChange_t& change, + const fastdds::rtps::CacheChange_t& change, bool& filter_result) const { // Empty expressions always pass the filter @@ -138,7 +138,7 @@ bool ContentFilteredTopicImpl::check_filter_signature( // matches our own signature, in which case found is set to true, and filter_result is set to the result present // on the ContentFilterInfo parameter for that signature. auto parameter_process = [&]( - fastrtps::rtps::CDRMessage_t* msg, + fastdds::rtps::CDRMessage_t* msg, const ParameterId_t pid, uint16_t plength) { @@ -157,7 +157,7 @@ bool ContentFilteredTopicImpl::check_filter_signature( plength -= 8; // Read and validate numBitmaps - valid &= fastrtps::rtps::CDRMessage::readUInt32(msg, &num_bitmaps); + valid &= fastdds::rtps::CDRMessage::readUInt32(msg, &num_bitmaps); valid &= num_bitmaps * 4 <= plength; if (!valid || 0 == num_bitmaps) { @@ -170,7 +170,7 @@ bool ContentFilteredTopicImpl::check_filter_signature( plength -= static_cast(num_bitmaps * 4); // Read and validate numSignatures - valid &= fastrtps::rtps::CDRMessage::readUInt32(msg, &num_signatures); + valid &= fastdds::rtps::CDRMessage::readUInt32(msg, &num_signatures); valid &= num_signatures * 16 <= plength; if (!valid || 0 == num_signatures || ((num_signatures + 31) / 32) != num_bitmaps) { @@ -205,7 +205,7 @@ bool ContentFilteredTopicImpl::check_filter_signature( uint32_t bitmap = 0; msg->pos = bitmap_pos + bitmap_idx * 4; - fastrtps::rtps::CDRMessage::readUInt32(msg, &bitmap); + fastdds::rtps::CDRMessage::readUInt32(msg, &bitmap); filter_result = 0 != (bitmap & bitmask); } } @@ -214,7 +214,7 @@ bool ContentFilteredTopicImpl::check_filter_signature( }; uint32_t qos_size = 0; - fastrtps::rtps::CDRMessage_t msg(change.inline_qos); + fastdds::rtps::CDRMessage_t msg(change.inline_qos); ParameterList::readParameterListfromCDRMsg(msg, parameter_process, false, qos_size); return found; diff --git a/src/cpp/fastdds/topic/ContentFilteredTopicImpl.hpp b/src/cpp/fastdds/topic/ContentFilteredTopicImpl.hpp index 897854e7cae..44e7b7b823c 100644 --- a/src/cpp/fastdds/topic/ContentFilteredTopicImpl.hpp +++ b/src/cpp/fastdds/topic/ContentFilteredTopicImpl.hpp @@ -50,8 +50,8 @@ class ContentFilteredTopicImpl final : public TopicDescriptionImpl, public epros } bool is_relevant( - const fastrtps::rtps::CacheChange_t& change, - const fastrtps::rtps::GUID_t& reader_guid) const final; + const fastdds::rtps::CacheChange_t& change, + const fastdds::rtps::GUID_t& reader_guid) const final; /** * Add an entry to the list of DataReaderImpl that should be notified of changes to this object. @@ -114,7 +114,7 @@ class ContentFilteredTopicImpl final : public TopicDescriptionImpl, public epros * @return whether the signature for the current filter was found on the inline QoS of the change. */ bool check_filter_signature( - const fastrtps::rtps::CacheChange_t& change, + const fastdds::rtps::CacheChange_t& change, bool& filter_result) const; std::set readers_; diff --git a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterExpressionParser.cpp b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterExpressionParser.cpp index a709ec8daef..ffee448fbe9 100644 --- a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterExpressionParser.cpp +++ b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterExpressionParser.cpp @@ -38,7 +38,7 @@ namespace DDSSQLFilter { namespace parser { using namespace tao::TAO_PEGTL_NAMESPACE; -using namespace eprosima::fastdds::dds::xtypes; +using namespace xtypes; #include "DDSFilterExpressionParserImpl/rearrange.hpp" #include "DDSFilterExpressionParserImpl/literal_values.hpp" diff --git a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterField.cpp b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterField.cpp index 60033533bdf..ebc52441fc6 100644 --- a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterField.cpp +++ b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterField.cpp @@ -156,7 +156,7 @@ bool DDSFilterField::set_value_using_member_id( case eprosima::fastdds::dds::xtypes::TK_BYTE: { - fastrtps::rtps::octet byte {0}; + fastdds::rtps::octet byte {0}; ret = RETCODE_OK == data->get_byte_value(byte, member_id); unsigned_integer_value = byte; } diff --git a/src/cpp/fastdds/topic/TopicDataType.cpp b/src/cpp/fastdds/topic/TopicDataType.cpp index e2266c119ef..b0bf69b6f7e 100644 --- a/src/cpp/fastdds/topic/TopicDataType.cpp +++ b/src/cpp/fastdds/topic/TopicDataType.cpp @@ -44,7 +44,7 @@ TopicDataType::~TopicDataType() bool TopicDataType::serialize( void* data, - fastrtps::rtps::SerializedPayload_t* payload, + fastdds::rtps::SerializedPayload_t* payload, DataRepresentationId_t data_representation) { diff --git a/src/cpp/fastdds/topic/TopicImpl.cpp b/src/cpp/fastdds/topic/TopicImpl.cpp index a7b5dc72274..0ffc3293c57 100644 --- a/src/cpp/fastdds/topic/TopicImpl.cpp +++ b/src/cpp/fastdds/topic/TopicImpl.cpp @@ -79,7 +79,7 @@ ReturnCode_t TopicImpl::check_qos( if (AUTOMATIC_LIVELINESS_QOS == qos.liveliness().kind || MANUAL_BY_PARTICIPANT_LIVELINESS_QOS == qos.liveliness().kind) { - if (qos.liveliness().lease_duration < eprosima::fastrtps::c_TimeInfinite && + if (qos.liveliness().lease_duration < eprosima::fastdds::c_TimeInfinite && qos.liveliness().lease_duration <= qos.liveliness().announcement_period) { EPROSIMA_LOG_ERROR(DDS_QOS_CHECK, "lease_duration <= announcement period."); diff --git a/src/cpp/fastdds/topic/TypeSupport.cpp b/src/cpp/fastdds/topic/TypeSupport.cpp index 8172e2c4c6f..cd1abd6b711 100644 --- a/src/cpp/fastdds/topic/TypeSupport.cpp +++ b/src/cpp/fastdds/topic/TypeSupport.cpp @@ -45,7 +45,7 @@ ReturnCode_t TypeSupport::register_type( bool TypeSupport::serialize( void* data, - fastrtps::rtps::SerializedPayload_t* payload, + fastdds::rtps::SerializedPayload_t* payload, DataRepresentationId_t data_representation) { bool result = false; @@ -62,7 +62,7 @@ bool TypeSupport::serialize( } bool TypeSupport::deserialize( - fastrtps::rtps::SerializedPayload_t* payload, + fastdds::rtps::SerializedPayload_t* payload, void* data) { bool result = false; diff --git a/src/cpp/fastdds/topic/qos/TopicQos.cpp b/src/cpp/fastdds/topic/qos/TopicQos.cpp index f09e771fd6a..73a542c11d0 100644 --- a/src/cpp/fastdds/topic/qos/TopicQos.cpp +++ b/src/cpp/fastdds/topic/qos/TopicQos.cpp @@ -19,12 +19,18 @@ #include -using namespace eprosima::fastdds::dds; +namespace eprosima { +namespace fastdds { +namespace dds { -const TopicQos eprosima::fastdds::dds::TOPIC_QOS_DEFAULT; +const TopicQos TOPIC_QOS_DEFAULT; TopicQos::TopicQos() { reliability_.kind = RELIABLE_RELIABILITY_QOS; durability_.kind = TRANSIENT_LOCAL_DURABILITY_QOS; } + +} // namespace dds +} // namespace fastdds +} // namespace eprosima diff --git a/src/cpp/fastdds/utils/QosConverters.cpp b/src/cpp/fastdds/utils/QosConverters.cpp index 05da8e46b20..5b20e188ab3 100644 --- a/src/cpp/fastdds/utils/QosConverters.cpp +++ b/src/cpp/fastdds/utils/QosConverters.cpp @@ -27,7 +27,7 @@ namespace fastdds { namespace dds { namespace utils { -using fastrtps::rtps::Property; +using rtps::Property; using std::string; void set_qos_from_attributes( @@ -136,7 +136,7 @@ void set_qos_from_attributes( void set_qos_from_attributes( DomainParticipantQos& qos, - const eprosima::fastrtps::rtps::RTPSParticipantAttributes& attr) + const eprosima::fastdds::rtps::RTPSParticipantAttributes& attr) { qos.user_data().setValue(attr.userData); qos.allocation() = attr.allocation; @@ -167,7 +167,7 @@ void set_qos_from_attributes( // Merge attributes and qos properties for (auto property : attr.properties.properties()) { - string* property_value = fastrtps::rtps::PropertyPolicyHelper::find_property( + string* property_value = fastdds::rtps::PropertyPolicyHelper::find_property( qos.properties(), property.name()); if (nullptr == property_value) { @@ -182,7 +182,7 @@ void set_qos_from_attributes( } void set_attributes_from_qos( - fastrtps::rtps::RTPSParticipantAttributes& attr, + fastdds::rtps::RTPSParticipantAttributes& attr, const DomainParticipantQos& qos) { attr.allocation = qos.allocation(); diff --git a/src/cpp/fastdds/utils/QosConverters.hpp b/src/cpp/fastdds/utils/QosConverters.hpp index 4e554775c60..a49fd43106e 100644 --- a/src/cpp/fastdds/utils/QosConverters.hpp +++ b/src/cpp/fastdds/utils/QosConverters.hpp @@ -39,8 +39,6 @@ namespace fastdds { namespace dds { namespace utils { -using fastrtps::TopicAttributes; - /** * Obtains the DataWriterQos from the PublisherAttributes provided. * @@ -77,7 +75,7 @@ void set_qos_from_attributes( */ void set_qos_from_attributes( DomainParticipantQos& qos, - const eprosima::fastrtps::rtps::RTPSParticipantAttributes& attr); + const eprosima::fastdds::rtps::RTPSParticipantAttributes& attr); /** * Obtains the RTPSParticipantAttributes from the DomainParticipantQos provided. @@ -86,7 +84,7 @@ void set_qos_from_attributes( * @param[in] qos Pointer to the QoS to write on */ void set_attributes_from_qos( - fastrtps::rtps::RTPSParticipantAttributes& attr, + fastdds::rtps::RTPSParticipantAttributes& attr, const DomainParticipantQos& qos); /** diff --git a/src/cpp/fastdds/xtypes/dynamic_types/DynamicDataImpl.cpp b/src/cpp/fastdds/xtypes/dynamic_types/DynamicDataImpl.cpp index 31071d9861c..75a60e6c9fa 100644 --- a/src/cpp/fastdds/xtypes/dynamic_types/DynamicDataImpl.cpp +++ b/src/cpp/fastdds/xtypes/dynamic_types/DynamicDataImpl.cpp @@ -679,7 +679,7 @@ ReturnCode_t DynamicDataImpl::get_char16_value( } ReturnCode_t DynamicDataImpl::get_byte_value( - eprosima::fastrtps::rtps::octet& value, + eprosima::fastdds::rtps::octet& value, MemberId id) noexcept { return get_value(value, id); @@ -1179,7 +1179,7 @@ ReturnCode_t DynamicDataImpl::set_char16_value( ReturnCode_t DynamicDataImpl::set_byte_value( MemberId id, - eprosima::fastrtps::rtps::octet value) noexcept + eprosima::fastdds::rtps::octet value) noexcept { return set_value(id, value); } diff --git a/src/cpp/fastdds/xtypes/dynamic_types/DynamicDataImpl.hpp b/src/cpp/fastdds/xtypes/dynamic_types/DynamicDataImpl.hpp index d926d24fdfe..2206a276b88 100644 --- a/src/cpp/fastdds/xtypes/dynamic_types/DynamicDataImpl.hpp +++ b/src/cpp/fastdds/xtypes/dynamic_types/DynamicDataImpl.hpp @@ -151,7 +151,7 @@ class DynamicDataImpl : public traits::base_type MemberId id) noexcept override; ReturnCode_t get_byte_value( - eprosima::fastrtps::rtps::octet& value, + eprosima::fastdds::rtps::octet& value, MemberId id) noexcept override; ReturnCode_t get_boolean_value( @@ -310,7 +310,7 @@ class DynamicDataImpl : public traits::base_type ReturnCode_t set_byte_value( MemberId id, - eprosima::fastrtps::rtps::octet value) noexcept override; + eprosima::fastdds::rtps::octet value) noexcept override; ReturnCode_t set_boolean_value( MemberId id, diff --git a/src/cpp/fastdds/xtypes/dynamic_types/DynamicPubSubType.cpp b/src/cpp/fastdds/xtypes/dynamic_types/DynamicPubSubType.cpp index 9ebe613117c..fe833254de0 100644 --- a/src/cpp/fastdds/xtypes/dynamic_types/DynamicPubSubType.cpp +++ b/src/cpp/fastdds/xtypes/dynamic_types/DynamicPubSubType.cpp @@ -75,7 +75,7 @@ void DynamicPubSubType::deleteData( } bool DynamicPubSubType::deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) { traits::ref_type* data_ptr = static_cast::ref_type*>(data); @@ -104,7 +104,7 @@ traits::ref_type DynamicPubSubType::get_dynamic_type() const noexce bool DynamicPubSubType::getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* handle, + eprosima::fastdds::rtps::InstanceHandle_t* handle, bool force_md5) { if (!dynamic_type_ || !m_isGetKeyDefined) @@ -181,7 +181,7 @@ std::function DynamicPubSubType::getSerializedSizeProvider( bool DynamicPubSubType::serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, fastdds::dds::DataRepresentationId_t data_representation) { traits::ref_type* data_ptr = static_cast::ref_type*>(data); @@ -238,7 +238,7 @@ void DynamicPubSubType::register_type_object_representation() { if (dynamic_type_) { - if (RETCODE_OK != fastrtps::rtps::RTPSDomainImpl::get_instance()->type_object_registry_observer(). + if (RETCODE_OK != fastdds::rtps::RTPSDomainImpl::get_instance()->type_object_registry_observer(). register_typeobject_w_dynamic_type(dynamic_type_, type_identifiers_)) { EPROSIMA_LOG_ERROR(DYN_TYPES, "Error registering DynamicType TypeObject representation."); diff --git a/src/cpp/fastdds/xtypes/dynamic_types/DynamicTypeBuilderFactoryImpl.cpp b/src/cpp/fastdds/xtypes/dynamic_types/DynamicTypeBuilderFactoryImpl.cpp index e41a939cee6..5a2e25ead5f 100644 --- a/src/cpp/fastdds/xtypes/dynamic_types/DynamicTypeBuilderFactoryImpl.cpp +++ b/src/cpp/fastdds/xtypes/dynamic_types/DynamicTypeBuilderFactoryImpl.cpp @@ -1379,7 +1379,7 @@ traits::ref_type DynamicTypeBuilderFactoryImpl::base_type_from_type // Find related type object xtypes::TypeObject base_type_object; if (RETCODE_OK != - fastrtps::rtps::RTPSDomainImpl::get_instance()->type_object_registry_observer().get_type_object( + fastdds::rtps::RTPSDomainImpl::get_instance()->type_object_registry_observer().get_type_object( type_identifier, base_type_object)) { EPROSIMA_LOG_ERROR(DYN_TYPES, "Given TypeIdentifier unknown to TypeObjectRegistry"); @@ -1409,7 +1409,7 @@ bool DynamicTypeBuilderFactoryImpl::apply_custom_annotations( // Find annotation type object xtypes::TypeObject annotation_type_object; if (RETCODE_OK != - fastrtps::rtps::RTPSDomainImpl::get_instance()->type_object_registry_observer().get_type_object( + fastdds::rtps::RTPSDomainImpl::get_instance()->type_object_registry_observer().get_type_object( annotation.annotation_typeid(), annotation_type_object)) { EPROSIMA_LOG_ERROR(DYN_TYPES, "Given annotation type identifier unknown to TypeObjectRegistry"); diff --git a/src/cpp/fastdds/xtypes/dynamic_types/TypeForKind.hpp b/src/cpp/fastdds/xtypes/dynamic_types/TypeForKind.hpp index b7947595e95..86b3f8029a4 100644 --- a/src/cpp/fastdds/xtypes/dynamic_types/TypeForKind.hpp +++ b/src/cpp/fastdds/xtypes/dynamic_types/TypeForKind.hpp @@ -123,7 +123,7 @@ struct TypeForKind_ template <> struct TypeForKind_ { - using type = eprosima::fastrtps::rtps::octet; + using type = eprosima::fastdds::rtps::octet; using sequence_type = ByteSeq; }; diff --git a/src/cpp/fastdds/xtypes/type_representation/TypeObjectRegistry.cpp b/src/cpp/fastdds/xtypes/type_representation/TypeObjectRegistry.cpp index 7b1b8af4716..c3f6e6ed692 100644 --- a/src/cpp/fastdds/xtypes/type_representation/TypeObjectRegistry.cpp +++ b/src/cpp/fastdds/xtypes/type_representation/TypeObjectRegistry.cpp @@ -535,7 +535,7 @@ const TypeIdentifier TypeObjectRegistry::calculate_type_identifier( TypeIdentifier type_id; eprosima::fastcdr::CdrSizeCalculator calculator(eprosima::fastcdr::CdrVersion::XCDRv2); size_t current_alignment {0}; - eprosima::fastrtps::rtps::SerializedPayload_t payload(static_cast( + eprosima::fastdds::rtps::SerializedPayload_t payload(static_cast( calculator.calculate_serialized_size(type_object, current_alignment))); eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast(payload.data), payload.max_size); eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::LITTLE_ENDIANNESS, diff --git a/src/cpp/fastdds/xtypes/type_representation/TypeObjectUtils.cpp b/src/cpp/fastdds/xtypes/type_representation/TypeObjectUtils.cpp index b079582089b..97d3e0a49dc 100644 --- a/src/cpp/fastdds/xtypes/type_representation/TypeObjectUtils.cpp +++ b/src/cpp/fastdds/xtypes/type_representation/TypeObjectUtils.cpp @@ -55,7 +55,7 @@ constexpr const EnumeratedLiteralFlag enum_literal_flag_mask = MemberFlagBits::T fastdds::dds::xtypes::TypeObjectRegistry& type_object_registry_observer() { - return eprosima::fastrtps::rtps::RTPSDomainImpl::get_instance()->type_object_registry_observer(); + return eprosima::fastdds::rtps::RTPSDomainImpl::get_instance()->type_object_registry_observer(); } const TypeObjectHashId TypeObjectUtils::build_type_object_hash_id( diff --git a/src/cpp/fastdds/xtypes/type_representation/dds_xtypes_typeobjectPubSubTypes.cxx b/src/cpp/fastdds/xtypes/type_representation/dds_xtypes_typeobjectPubSubTypes.cxx index 25692d26104..b1c9cf4590e 100644 --- a/src/cpp/fastdds/xtypes/type_representation/dds_xtypes_typeobjectPubSubTypes.cxx +++ b/src/cpp/fastdds/xtypes/type_representation/dds_xtypes_typeobjectPubSubTypes.cxx @@ -25,8 +25,8 @@ #include #include -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; namespace eprosima { diff --git a/src/cpp/rtps/DataSharing/DataSharingListener.cpp b/src/cpp/rtps/DataSharing/DataSharingListener.cpp index ab9ec618d73..ce1693f50eb 100644 --- a/src/cpp/rtps/DataSharing/DataSharingListener.cpp +++ b/src/cpp/rtps/DataSharing/DataSharingListener.cpp @@ -26,7 +26,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { using BaseReader = fastdds::rtps::BaseReader; @@ -312,5 +312,5 @@ std::shared_ptr DataSharingListener::get_pool_for_writer( } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/rtps/DataSharing/DataSharingListener.hpp b/src/cpp/rtps/DataSharing/DataSharingListener.hpp index 34f291cc953..17d088134c0 100644 --- a/src/cpp/rtps/DataSharing/DataSharingListener.hpp +++ b/src/cpp/rtps/DataSharing/DataSharingListener.hpp @@ -42,7 +42,7 @@ class BaseReader; } // namespace rtps } // namespace fastdds -namespace fastrtps { +namespace fastdds { namespace rtps { @@ -136,7 +136,7 @@ class DataSharingListener : public IDataSharingListener }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // RTPS_DATASHARING_DATASHARINGLISTENER_HPP diff --git a/src/cpp/rtps/DataSharing/DataSharingNotification.cpp b/src/cpp/rtps/DataSharing/DataSharingNotification.cpp index a68100b5315..3895bc33046 100644 --- a/src/cpp/rtps/DataSharing/DataSharingNotification.cpp +++ b/src/cpp/rtps/DataSharing/DataSharingNotification.cpp @@ -23,7 +23,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { std::shared_ptr DataSharingNotification::create_notification( @@ -100,5 +100,5 @@ void DataSharingNotification::destroy() } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/rtps/DataSharing/DataSharingNotification.hpp b/src/cpp/rtps/DataSharing/DataSharingNotification.hpp index 401100cfa59..a35a1a51c7d 100644 --- a/src/cpp/rtps/DataSharing/DataSharingNotification.hpp +++ b/src/cpp/rtps/DataSharing/DataSharingNotification.hpp @@ -31,7 +31,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class DataSharingNotification @@ -231,7 +231,7 @@ class DataSharingNotification }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // RTPS_DATASHARING_DATASHARINGNOTIFICATION_HPP diff --git a/src/cpp/rtps/DataSharing/DataSharingNotifier.hpp b/src/cpp/rtps/DataSharing/DataSharingNotifier.hpp index 46f7a80685a..dfdf9a93f03 100644 --- a/src/cpp/rtps/DataSharing/DataSharingNotifier.hpp +++ b/src/cpp/rtps/DataSharing/DataSharingNotifier.hpp @@ -26,7 +26,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class DataSharingNotifier : public IDataSharingNotifier @@ -92,7 +92,7 @@ class DataSharingNotifier : public IDataSharingNotifier } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // RTPS_DATASHARING_DATASHARINGNOTIFIER_HPP diff --git a/src/cpp/rtps/DataSharing/DataSharingPayloadPool.cpp b/src/cpp/rtps/DataSharing/DataSharingPayloadPool.cpp index b40d9a1ac53..c76a08af900 100644 --- a/src/cpp/rtps/DataSharing/DataSharingPayloadPool.cpp +++ b/src/cpp/rtps/DataSharing/DataSharingPayloadPool.cpp @@ -24,7 +24,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { bool DataSharingPayloadPool::release_payload( @@ -108,5 +108,5 @@ std::shared_ptr DataSharingPayloadPool::get_writer_pool( } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/rtps/DataSharing/DataSharingPayloadPool.hpp b/src/cpp/rtps/DataSharing/DataSharingPayloadPool.hpp index 7bb0ff09406..99716ff68e9 100644 --- a/src/cpp/rtps/DataSharing/DataSharingPayloadPool.hpp +++ b/src/cpp/rtps/DataSharing/DataSharingPayloadPool.hpp @@ -29,7 +29,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSWriter; @@ -150,7 +150,7 @@ class DataSharingPayloadPool : public IPayloadPool public: PayloadNodeMetaData() - : status(fastrtps::rtps::ChangeKind_t::ALIVE) + : status(fastdds::rtps::ChangeKind_t::ALIVE) , has_been_removed(0) , data_length(0) , sequence_number(c_SequenceNumber_Unknown) @@ -186,7 +186,7 @@ class DataSharingPayloadPool : public IPayloadPool InstanceHandle_t instance_handle; // Related sample identity for the change - fastrtps::rtps::SampleIdentity related_sample_identity; + fastdds::rtps::SampleIdentity related_sample_identity; // Mutex for shared read / exclusive write access to the payload sharable_mutex mutex; @@ -207,12 +207,12 @@ class DataSharingPayloadPool : public IPayloadPool { // Reset the sequence number first, it signals the data is not valid anymore metadata_.sequence_number.store(c_SequenceNumber_Unknown, std::memory_order_relaxed); - metadata_.status = fastrtps::rtps::ChangeKind_t::ALIVE; + metadata_.status = fastdds::rtps::ChangeKind_t::ALIVE; metadata_.has_been_removed = 0; metadata_.data_length = 0; metadata_.writer_GUID = c_Guid_Unknown; metadata_.instance_handle = c_InstanceHandle_Unknown; - metadata_.related_sample_identity = fastrtps::rtps::SampleIdentity(); + metadata_.related_sample_identity = fastdds::rtps::SampleIdentity(); } static const PayloadNode* get_from_data( @@ -321,13 +321,13 @@ class DataSharingPayloadPool : public IPayloadPool metadata_.has_been_removed = removed ? 1 : 0; } - fastrtps::rtps::SampleIdentity related_sample_identity() const + fastdds::rtps::SampleIdentity related_sample_identity() const { return metadata_.related_sample_identity; } void related_sample_identity( - fastrtps::rtps::SampleIdentity identity) + fastdds::rtps::SampleIdentity identity) { metadata_.related_sample_identity = identity; } @@ -380,7 +380,7 @@ class DataSharingPayloadPool : public IPayloadPool } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // RTPS_DATASHARING_DATASHARINGPAYLOADPOOL_HPP diff --git a/src/cpp/rtps/DataSharing/IDataSharingListener.hpp b/src/cpp/rtps/DataSharing/IDataSharingListener.hpp index b99e5d0a892..6bde1c56d43 100644 --- a/src/cpp/rtps/DataSharing/IDataSharingListener.hpp +++ b/src/cpp/rtps/DataSharing/IDataSharingListener.hpp @@ -29,7 +29,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { struct GUID_t; @@ -111,7 +111,7 @@ class IDataSharingListener }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // RTPS_DATASHARING_IDATASHARINGLISTENER_HPP diff --git a/src/cpp/rtps/DataSharing/IDataSharingNotifier.hpp b/src/cpp/rtps/DataSharing/IDataSharingNotifier.hpp index 34621ae70d6..41696bb87ac 100644 --- a/src/cpp/rtps/DataSharing/IDataSharingNotifier.hpp +++ b/src/cpp/rtps/DataSharing/IDataSharingNotifier.hpp @@ -21,7 +21,7 @@ namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { struct GUID_t; @@ -61,7 +61,7 @@ class IDataSharingNotifier } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // RTPS_DATASHARING_IDATASHARINGNOTIFIER_HPP diff --git a/src/cpp/rtps/DataSharing/ReaderPool.hpp b/src/cpp/rtps/DataSharing/ReaderPool.hpp index 716979efa5f..a3c28d00eae 100644 --- a/src/cpp/rtps/DataSharing/ReaderPool.hpp +++ b/src/cpp/rtps/DataSharing/ReaderPool.hpp @@ -27,7 +27,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class ReaderPool : public DataSharingPayloadPool @@ -308,7 +308,7 @@ class ReaderPool : public DataSharingPayloadPool }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // RTPS_DATASHARING_DATASHARINGPAYLOADPOOLIMPL_READERPOOL_HPP diff --git a/src/cpp/rtps/DataSharing/WriterPool.hpp b/src/cpp/rtps/DataSharing/WriterPool.hpp index 5ff423e41ae..ad1224cd7f3 100644 --- a/src/cpp/rtps/DataSharing/WriterPool.hpp +++ b/src/cpp/rtps/DataSharing/WriterPool.hpp @@ -29,7 +29,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class WriterPool : public DataSharingPayloadPool @@ -361,7 +361,7 @@ class WriterPool : public DataSharingPayloadPool } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // RTPS_DATASHARING_WRITERPOOL_HPP diff --git a/src/cpp/rtps/RTPSDomain.cpp b/src/cpp/rtps/RTPSDomain.cpp index 4a1845d2a35..f572be5653e 100644 --- a/src/cpp/rtps/RTPSDomain.cpp +++ b/src/cpp/rtps/RTPSDomain.cpp @@ -50,7 +50,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { using BaseReader = fastdds::rtps::BaseReader; @@ -191,7 +191,7 @@ RTPSParticipant* RTPSDomainImpl::createParticipant( if (!PParam.builtin.metatraffic_external_unicast_locators.empty()) { fastdds::rtps::LocatorList locators; - fastrtps::rtps::IPFinder::getIP4Address(&locators); + fastdds::rtps::IPFinder::getIP4Address(&locators); fastdds::rtps::network::external_locators::add_external_locators(locators, PParam.builtin.metatraffic_external_unicast_locators); uint16_t host_id = Host::compute_id(locators); @@ -224,8 +224,8 @@ RTPSParticipant* RTPSDomainImpl::createParticipant( // Above constructors create the sender resources. If a given listening port cannot be allocated an iterative // mechanism will allocate another by default. Change the default listening port is unacceptable for // discovery server Participant. - if ((PParam.builtin.discovery_config.discoveryProtocol == DiscoveryProtocol_t::SERVER - || PParam.builtin.discovery_config.discoveryProtocol == DiscoveryProtocol_t::BACKUP) + if ((PParam.builtin.discovery_config.discoveryProtocol == DiscoveryProtocol::SERVER + || PParam.builtin.discovery_config.discoveryProtocol == DiscoveryProtocol::BACKUP) && pimpl->did_mutation_took_place_on_meta( PParam.builtin.metatrafficMulticastLocatorList, PParam.builtin.metatrafficUnicastLocatorList)) @@ -261,7 +261,7 @@ RTPSParticipant* RTPSDomainImpl::createParticipant( } // Check the environment file in case it was modified during participant creation leading to a missed callback. - if ((PParam.builtin.discovery_config.discoveryProtocol != DiscoveryProtocol_t::CLIENT) && + if ((PParam.builtin.discovery_config.discoveryProtocol != DiscoveryProtocol::CLIENT) && instance->file_watch_handle_) { pimpl->environment_file_has_changed(); @@ -543,7 +543,7 @@ RTPSParticipant* RTPSDomainImpl::clientServerEnvironmentCreationOverride( RTPSParticipantListener* listen) { // Check the specified discovery protocol: if other than simple it has priority over ros environment variable - if (att.builtin.discovery_config.discoveryProtocol != DiscoveryProtocol_t::SIMPLE) + if (att.builtin.discovery_config.discoveryProtocol != DiscoveryProtocol::SIMPLE) { EPROSIMA_LOG_INFO(DOMAIN, "Detected non simple discovery protocol attributes." << " Ignoring auto default client-server setup."); @@ -653,13 +653,13 @@ RTPSParticipant* RTPSDomainImpl::clientServerEnvironmentCreationOverride( << "Trying to create client with the default server setup: " << client_att.builtin.discovery_config.m_DiscoveryServers); - client_att.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::CLIENT; + client_att.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::CLIENT; // RemoteServerAttributes already fill in above // Check if the client must become a super client if (ros_super_client_env()) { - client_att.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::SUPER_CLIENT; + client_att.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::SUPER_CLIENT; } RTPSParticipant* part = createParticipant(domain_id, enabled, client_att, listen); @@ -940,5 +940,5 @@ fastdds::dds::xtypes::TypeObjectRegistry& RTPSDomainImpl::type_object_registry_o } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/rtps/RTPSDomainImpl.hpp b/src/cpp/rtps/RTPSDomainImpl.hpp index 480d9dc9065..bd9b1891030 100644 --- a/src/cpp/rtps/RTPSDomainImpl.hpp +++ b/src/cpp/rtps/RTPSDomainImpl.hpp @@ -36,7 +36,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** @@ -322,7 +322,7 @@ class RTPSDomainImpl }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _RTPS_RTPSDOMAINIMPL_HPP_ diff --git a/src/cpp/rtps/attributes/EndpointSecurityAttributes.cpp b/src/cpp/rtps/attributes/EndpointSecurityAttributes.cpp index 80bb5d66dd4..8747c5a07ce 100644 --- a/src/cpp/rtps/attributes/EndpointSecurityAttributes.cpp +++ b/src/cpp/rtps/attributes/EndpointSecurityAttributes.cpp @@ -21,7 +21,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -92,5 +92,5 @@ bool EndpointSecurityAttributes::match( } // namespace security } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/rtps/attributes/PropertyPolicy.cpp b/src/cpp/rtps/attributes/PropertyPolicy.cpp index 4f4a8e9819e..08c15b9039b 100644 --- a/src/cpp/rtps/attributes/PropertyPolicy.cpp +++ b/src/cpp/rtps/attributes/PropertyPolicy.cpp @@ -20,7 +20,9 @@ #include -using namespace eprosima::fastrtps::rtps; +namespace eprosima { +namespace fastdds { +namespace rtps { PropertyPolicy PropertyPolicyHelper::get_properties_with_prefix( const PropertyPolicy& property_policy, @@ -118,3 +120,7 @@ const Property* PropertyPolicyHelper::get_property( return returnedValue; } + +} // namespace rtps +} // namespace fastdds +} // namespace eprosima diff --git a/src/cpp/rtps/attributes/RTPSParticipantAttributes.cpp b/src/cpp/rtps/attributes/RTPSParticipantAttributes.cpp index 85dfde5e1d9..34577a50815 100644 --- a/src/cpp/rtps/attributes/RTPSParticipantAttributes.cpp +++ b/src/cpp/rtps/attributes/RTPSParticipantAttributes.cpp @@ -32,7 +32,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { static bool is_intraprocess_only( diff --git a/src/cpp/rtps/attributes/ThreadSettings.cpp b/src/cpp/rtps/attributes/ThreadSettings.cpp index 0c2761539f6..802d473e1bf 100644 --- a/src/cpp/rtps/attributes/ThreadSettings.cpp +++ b/src/cpp/rtps/attributes/ThreadSettings.cpp @@ -14,7 +14,9 @@ #include -using namespace eprosima::fastdds::rtps; +namespace eprosima { +namespace fastdds { +namespace rtps { bool ThreadSettings::operator ==( const ThreadSettings& rhs) const @@ -30,3 +32,7 @@ bool ThreadSettings::operator !=( { return !(*this == rhs); } + +} // namespace rtps +} // namespace fastdds +} // namespace eprosima diff --git a/src/cpp/rtps/attributes/TopicAttributes.cpp b/src/cpp/rtps/attributes/TopicAttributes.cpp index 0e7ba4bab34..2cef11846d2 100644 --- a/src/cpp/rtps/attributes/TopicAttributes.cpp +++ b/src/cpp/rtps/attributes/TopicAttributes.cpp @@ -19,7 +19,8 @@ #include #include -using namespace eprosima::fastrtps; +namespace eprosima { +namespace fastdds { bool TopicAttributes::checkQos() const { @@ -70,3 +71,6 @@ bool TopicAttributes::checkQos() const } return true; } + +} // namespace fastdds +} // namespace eprosima diff --git a/src/cpp/rtps/builtin/BuiltinProtocols.cpp b/src/cpp/rtps/builtin/BuiltinProtocols.cpp index 6f30a3afde8..46d251f8e26 100644 --- a/src/cpp/rtps/builtin/BuiltinProtocols.cpp +++ b/src/cpp/rtps/builtin/BuiltinProtocols.cpp @@ -35,10 +35,8 @@ #include #include -using namespace eprosima::fastrtps; - namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { @@ -89,38 +87,38 @@ bool BuiltinProtocols::initBuiltinProtocols( // PDP switch (m_att.discovery_config.discoveryProtocol) { - case DiscoveryProtocol_t::NONE: + case DiscoveryProtocol::NONE: EPROSIMA_LOG_WARNING(RTPS_PDP, "No participant discovery protocol specified"); return true; - case DiscoveryProtocol_t::SIMPLE: + case DiscoveryProtocol::SIMPLE: mp_PDP = new PDPSimple(this, allocation); break; - case DiscoveryProtocol_t::EXTERNAL: + case DiscoveryProtocol::EXTERNAL: EPROSIMA_LOG_ERROR(RTPS_PDP, "Flag only present for debugging purposes"); return false; - case DiscoveryProtocol_t::CLIENT: + case DiscoveryProtocol::CLIENT: mp_PDP = new fastdds::rtps::PDPClient(this, allocation); break; - case DiscoveryProtocol_t::SERVER: + case DiscoveryProtocol::SERVER: mp_PDP = new fastdds::rtps::PDPServer(this, allocation, DurabilityKind_t::TRANSIENT_LOCAL); break; #if HAVE_SQLITE3 - case DiscoveryProtocol_t::BACKUP: + case DiscoveryProtocol::BACKUP: mp_PDP = new fastdds::rtps::PDPServer(this, allocation, DurabilityKind_t::TRANSIENT); break; #endif // if HAVE_SQLITE3 - case DiscoveryProtocol_t::SUPER_CLIENT: + case DiscoveryProtocol::SUPER_CLIENT: mp_PDP = new fastdds::rtps::PDPClient(this, allocation, true); break; default: - EPROSIMA_LOG_ERROR(RTPS_PDP, "Unknown DiscoveryProtocol_t specified."); + EPROSIMA_LOG_ERROR(RTPS_PDP, "Unknown DiscoveryProtocol specified."); return false; } @@ -188,7 +186,7 @@ void BuiltinProtocols::filter_server_remote_locators( bool BuiltinProtocols::addLocalWriter( RTPSWriter* w, - const fastrtps::TopicAttributes& topicAtt, + const fastdds::TopicAttributes& topicAtt, const fastdds::dds::WriterQos& wqos) { bool ok = true; @@ -222,7 +220,7 @@ bool BuiltinProtocols::addLocalWriter( bool BuiltinProtocols::addLocalReader( RTPSReader* R, - const fastrtps::TopicAttributes& topicAtt, + const fastdds::TopicAttributes& topicAtt, const fastdds::dds::ReaderQos& rqos, const fastdds::rtps::ContentFilterProperty* content_filter) { @@ -316,7 +314,7 @@ void BuiltinProtocols::announceRTPSParticipantState() { mp_PDP->announceParticipantState(false); } - else if (m_att.discovery_config.discoveryProtocol != DiscoveryProtocol_t::NONE) + else if (m_att.discovery_config.discoveryProtocol != DiscoveryProtocol::NONE) { EPROSIMA_LOG_ERROR(RTPS_EDP, "Trying to use BuiltinProtocols interfaces before initBuiltinProtocols call"); } @@ -331,7 +329,7 @@ void BuiltinProtocols::stopRTPSParticipantAnnouncement() { mp_PDP->stopParticipantAnnouncement(); } - else if (m_att.discovery_config.discoveryProtocol != DiscoveryProtocol_t::NONE) + else if (m_att.discovery_config.discoveryProtocol != DiscoveryProtocol::NONE) { EPROSIMA_LOG_ERROR(RTPS_EDP, "Trying to use BuiltinProtocols interfaces before initBuiltinProtocols call"); } @@ -345,7 +343,7 @@ void BuiltinProtocols::resetRTPSParticipantAnnouncement() { mp_PDP->resetParticipantAnnouncement(); } - else if (m_att.discovery_config.discoveryProtocol != DiscoveryProtocol_t::NONE) + else if (m_att.discovery_config.discoveryProtocol != DiscoveryProtocol::NONE) { EPROSIMA_LOG_ERROR(RTPS_EDP, "Trying to use BuiltinProtocols interfaces before initBuiltinProtocols call"); } diff --git a/src/cpp/rtps/builtin/BuiltinProtocols.h b/src/cpp/rtps/builtin/BuiltinProtocols.h index a2c2ccd9466..db8fd3d957a 100644 --- a/src/cpp/rtps/builtin/BuiltinProtocols.h +++ b/src/cpp/rtps/builtin/BuiltinProtocols.h @@ -42,9 +42,6 @@ class TypeLookupManager; class ReaderQos; class WriterQos; } // namespace dds -} // namespace fastdds - -namespace fastrtps { class TopicAttributes; diff --git a/src/cpp/rtps/builtin/BuiltinReader.hpp b/src/cpp/rtps/builtin/BuiltinReader.hpp index f93ececcf4a..d40dace9abc 100644 --- a/src/cpp/rtps/builtin/BuiltinReader.hpp +++ b/src/cpp/rtps/builtin/BuiltinReader.hpp @@ -46,7 +46,7 @@ struct BuiltinReader { if (history_) { - auto cfg = fastrtps::rtps::PoolConfig::from_history_attributes(history_->m_att); + auto cfg = fastdds::rtps::PoolConfig::from_history_attributes(history_->m_att); history_.reset(); if (payload_pool_) { @@ -58,7 +58,7 @@ struct BuiltinReader } void remove_from_history( - const fastrtps::rtps::InstanceHandle_t& key) + const fastdds::rtps::InstanceHandle_t& key) { history_->getMutex()->lock(); for (auto it = history_->changesBegin(); it != history_->changesEnd(); ++it) @@ -73,13 +73,13 @@ struct BuiltinReader } //! Payload pool for the topic - std::shared_ptr payload_pool_; + std::shared_ptr payload_pool_; //! History for the builtin reader - std::unique_ptr history_; + std::unique_ptr history_; //! Builtin RTPS reader TReader* reader_ = nullptr; //! Listener for the builtin RTPS reader - std::unique_ptr listener_; + std::unique_ptr listener_; }; } // namespace rtps diff --git a/src/cpp/rtps/builtin/BuiltinWriter.hpp b/src/cpp/rtps/builtin/BuiltinWriter.hpp index 36d55f08ab4..1fa1679a779 100644 --- a/src/cpp/rtps/builtin/BuiltinWriter.hpp +++ b/src/cpp/rtps/builtin/BuiltinWriter.hpp @@ -45,7 +45,7 @@ struct BuiltinWriter { if (history_) { - auto cfg = fastrtps::rtps::PoolConfig::from_history_attributes(history_->m_att); + auto cfg = fastdds::rtps::PoolConfig::from_history_attributes(history_->m_att); history_.reset(); if (payload_pool_) { @@ -55,9 +55,9 @@ struct BuiltinWriter } //! Payload pool for the topic - std::shared_ptr payload_pool_; + std::shared_ptr payload_pool_; //! History for the builtin writer - std::unique_ptr history_; + std::unique_ptr history_; //! Builtin RTPS writer TWriter* writer_ = nullptr; }; diff --git a/src/cpp/rtps/builtin/data/ParticipantProxyData.cpp b/src/cpp/rtps/builtin/data/ParticipantProxyData.cpp index a78cb3c2181..3e6b606d135 100644 --- a/src/cpp/rtps/builtin/data/ParticipantProxyData.cpp +++ b/src/cpp/rtps/builtin/data/ParticipantProxyData.cpp @@ -39,11 +39,10 @@ #include "ProxyDataFilters.hpp" #include "ProxyHashTables.hpp" -using namespace eprosima::fastrtps; using ParameterList = eprosima::fastdds::dds::ParameterList; namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { using ::operator <<; @@ -950,5 +949,5 @@ void ParticipantProxyData::assert_liveliness() } } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/builtin/data/ProxyDataFilters.hpp b/src/cpp/rtps/builtin/data/ProxyDataFilters.hpp index f526cde8df6..a81c569cc12 100644 --- a/src/cpp/rtps/builtin/data/ProxyDataFilters.hpp +++ b/src/cpp/rtps/builtin/data/ProxyDataFilters.hpp @@ -19,7 +19,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** @@ -66,7 +66,7 @@ class ProxyDataFilters }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif // _FASTDDS_RTPS_BUILTIN_DATA_PROXYDATAFILTERS_H_ diff --git a/src/cpp/rtps/builtin/data/ProxyHashTables.hpp b/src/cpp/rtps/builtin/data/ProxyHashTables.hpp index d432df4c750..9b866d554d7 100644 --- a/src/cpp/rtps/builtin/data/ProxyHashTables.hpp +++ b/src/cpp/rtps/builtin/data/ProxyHashTables.hpp @@ -31,7 +31,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { // Static allocation ancillary for proxies @@ -185,7 +185,7 @@ class ProxyHashTable }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _FASTDDS_RTPS_BUILTIN_DATA_PROXYHASHTABLES_HPP_ diff --git a/src/cpp/rtps/builtin/data/ReaderProxyData.cpp b/src/cpp/rtps/builtin/data/ReaderProxyData.cpp index 4d1da335d68..33317b71e55 100644 --- a/src/cpp/rtps/builtin/data/ReaderProxyData.cpp +++ b/src/cpp/rtps/builtin/data/ReaderProxyData.cpp @@ -32,7 +32,7 @@ using ParameterList = eprosima::fastdds::dds::ParameterList; using ContentFilterProperty = eprosima::fastdds::rtps::ContentFilterProperty; namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { using ::operator <<; @@ -1331,5 +1331,5 @@ void ReaderProxyData::set_remote_locators( } } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/builtin/data/WriterProxyData.cpp b/src/cpp/rtps/builtin/data/WriterProxyData.cpp index 0495ddd8993..591c3aa10bc 100644 --- a/src/cpp/rtps/builtin/data/WriterProxyData.cpp +++ b/src/cpp/rtps/builtin/data/WriterProxyData.cpp @@ -30,7 +30,7 @@ using ParameterList = eprosima::fastdds::dds::ParameterList; namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { using ::operator <<; @@ -1306,5 +1306,5 @@ void WriterProxyData::set_remote_locators( } } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.cpp b/src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.cpp index c6fa1c574a0..84c29edf267 100644 --- a/src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.cpp +++ b/src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.cpp @@ -37,8 +37,8 @@ namespace rtps { namespace ddb { DiscoveryDataBase::DiscoveryDataBase( - fastrtps::rtps::GuidPrefix_t server_guid_prefix, - std::set servers) + fastdds::rtps::GuidPrefix_t server_guid_prefix, + std::set servers) : server_guid_prefix_(server_guid_prefix) , server_acked_by_all_(servers.size() == 0) , servers_(servers) @@ -63,15 +63,15 @@ DiscoveryDataBase::~DiscoveryDataBase() } void DiscoveryDataBase::add_server( - fastrtps::rtps::GuidPrefix_t server) + fastdds::rtps::GuidPrefix_t server) { EPROSIMA_LOG_INFO(DISCOVERY_DATABASE, "Server " << server << " added"); servers_.insert(server); } void DiscoveryDataBase::remove_related_alive_from_history_nts( - fastrtps::rtps::WriterHistory* writer_history, - const fastrtps::rtps::GuidPrefix_t& entity_guid_prefix) + fastdds::rtps::WriterHistory* writer_history, + const fastdds::rtps::GuidPrefix_t& entity_guid_prefix) { // Iterate over changes in writer_history for (auto chit = writer_history->changesBegin(); chit != writer_history->changesEnd();) @@ -86,13 +86,13 @@ void DiscoveryDataBase::remove_related_alive_from_history_nts( } } -std::vector DiscoveryDataBase::clear() +std::vector DiscoveryDataBase::clear() { // Cannot clear an enabled database, since there could be inconsistencies after the process if (enabled_) { EPROSIMA_LOG_ERROR(DISCOVERY_DATABASE, "Cannot clear an enabled database"); - return std::vector({}); + return std::vector({}); } EPROSIMA_LOG_INFO(DISCOVERY_DATABASE, "Clearing DiscoveryDataBase"); @@ -153,7 +153,7 @@ std::vector DiscoveryDataBase::clear() server_acked_by_all_ = true; /* Clear changes to release */ - std::vector leftover_changes = changes_to_release_; + std::vector leftover_changes = changes_to_release_; changes_to_release_.clear(); servers_.clear(); @@ -162,12 +162,12 @@ std::vector DiscoveryDataBase::clear() } bool DiscoveryDataBase::pdp_is_relevant( - const eprosima::fastrtps::rtps::CacheChange_t& change, - const eprosima::fastrtps::rtps::GUID_t& reader_guid) const + const eprosima::fastdds::rtps::CacheChange_t& change, + const eprosima::fastdds::rtps::GUID_t& reader_guid) const { // Get identity of the participant that generated the DATA(p|Up) - fastrtps::rtps::GuidPrefix_t change_guid_prefix = guid_from_change(&change).guidPrefix; + fastdds::rtps::GuidPrefix_t change_guid_prefix = guid_from_change(&change).guidPrefix; // Own DATA(p|Up) is always relevant for remote PDP readers. Server's PDP ReaderProxy will never // be queried for relevance, since Participant's own PDP writer and reader are not matched, @@ -195,11 +195,11 @@ bool DiscoveryDataBase::pdp_is_relevant( } bool DiscoveryDataBase::edp_publications_is_relevant( - const eprosima::fastrtps::rtps::CacheChange_t& change, - const eprosima::fastrtps::rtps::GUID_t& reader_guid) const + const eprosima::fastdds::rtps::CacheChange_t& change, + const eprosima::fastdds::rtps::GUID_t& reader_guid) const { // Get identity of the participant that generated the DATA - fastrtps::rtps::GUID_t change_guid = guid_from_change(&change); + fastdds::rtps::GUID_t change_guid = guid_from_change(&change); // Lock(shared mode) mutex locally std::lock_guard guard(mutex_); @@ -228,11 +228,11 @@ bool DiscoveryDataBase::edp_publications_is_relevant( } bool DiscoveryDataBase::edp_subscriptions_is_relevant( - const eprosima::fastrtps::rtps::CacheChange_t& change, - const eprosima::fastrtps::rtps::GUID_t& reader_guid) const + const eprosima::fastdds::rtps::CacheChange_t& change, + const eprosima::fastdds::rtps::GUID_t& reader_guid) const { // Get identity of the participant that generated the DATA - fastrtps::rtps::GUID_t change_guid = guid_from_change(&change); + fastdds::rtps::GUID_t change_guid = guid_from_change(&change); // Lock(shared mode) mutex locally std::lock_guard guard(mutex_); @@ -261,7 +261,7 @@ bool DiscoveryDataBase::edp_subscriptions_is_relevant( } void DiscoveryDataBase::update_change_and_unmatch_( - fastrtps::rtps::CacheChange_t* new_change, + fastdds::rtps::CacheChange_t* new_change, ddb::DiscoverySharedInfo& entity) { changes_to_release_.push_back(entity.update_and_unmatch(new_change)); @@ -272,8 +272,8 @@ void DiscoveryDataBase::update_change_and_unmatch_( } void DiscoveryDataBase::add_ack_( - const eprosima::fastrtps::rtps::CacheChange_t* change, - const eprosima::fastrtps::rtps::GuidPrefix_t& acked_entity) + const eprosima::fastdds::rtps::CacheChange_t* change, + const eprosima::fastdds::rtps::GuidPrefix_t& acked_entity) { if (!enabled_) { @@ -329,7 +329,7 @@ void DiscoveryDataBase::add_ack_( } bool DiscoveryDataBase::update( - eprosima::fastrtps::rtps::CacheChange_t* change, + eprosima::fastdds::rtps::CacheChange_t* change, DiscoveryParticipantChangeData participant_change_data) { // In case the ddb is persistent, we store every cache in queue in a file @@ -362,7 +362,7 @@ bool DiscoveryDataBase::update( } bool DiscoveryDataBase::update( - eprosima::fastrtps::rtps::CacheChange_t* change, + eprosima::fastdds::rtps::CacheChange_t* change, std::string topic_name) { // in case the ddb is persistent, we store every cache in queue in a file @@ -394,7 +394,7 @@ bool DiscoveryDataBase::update( return true; } -const std::vector DiscoveryDataBase::changes_to_dispose() +const std::vector DiscoveryDataBase::changes_to_dispose() { // lock(sharing mode) mutex locally std::lock_guard guard(mutex_); @@ -410,7 +410,7 @@ void DiscoveryDataBase::clear_changes_to_dispose() //////////// // Functions to process_to_send_lists() -const std::vector DiscoveryDataBase::pdp_to_send() +const std::vector DiscoveryDataBase::pdp_to_send() { // lock(sharing mode) mutex locally std::lock_guard guard(mutex_); @@ -424,7 +424,7 @@ void DiscoveryDataBase::clear_pdp_to_send() pdp_to_send_.clear(); } -const std::vector DiscoveryDataBase::edp_publications_to_send() +const std::vector DiscoveryDataBase::edp_publications_to_send() { // lock(sharing mode) mutex locally std::lock_guard guard(mutex_); @@ -438,7 +438,7 @@ void DiscoveryDataBase::clear_edp_publications_to_send() edp_publications_to_send_.clear(); } -const std::vector DiscoveryDataBase::edp_subscriptions_to_send() +const std::vector DiscoveryDataBase::edp_subscriptions_to_send() { // lock(sharing mode) mutex locally std::lock_guard guard(mutex_); @@ -452,7 +452,7 @@ void DiscoveryDataBase::clear_edp_subscriptions_to_send() edp_subscriptions_to_send_.clear(); } -const std::vector DiscoveryDataBase::changes_to_release() +const std::vector DiscoveryDataBase::changes_to_release() { // lock(sharing mode) mutex locally std::lock_guard guard(mutex_); @@ -489,7 +489,7 @@ void DiscoveryDataBase::process_pdp_data_queue() DiscoveryPDPDataQueueInfo data_queue_info = pdp_data_queue_.FrontAndPop(); // If the change is a DATA(p) - if (data_queue_info.change()->kind == eprosima::fastrtps::rtps::ALIVE) + if (data_queue_info.change()->kind == eprosima::fastdds::rtps::ALIVE) { // Update participants map EPROSIMA_LOG_INFO(DISCOVERY_DATABASE, "DATA(p) of entity " << data_queue_info.change()->instanceHandle << @@ -522,7 +522,7 @@ bool DiscoveryDataBase::process_edp_data_queue() // Swap DATA queues edp_data_queue_.Swap(); - eprosima::fastrtps::rtps::CacheChange_t* change; + eprosima::fastdds::rtps::CacheChange_t* change; std::string topic_name; // Process all messages in the queque @@ -534,7 +534,7 @@ bool DiscoveryDataBase::process_edp_data_queue() topic_name = data_queue_info.topic(); // If the change is a DATA(w|r) - if (change->kind == eprosima::fastrtps::rtps::ALIVE) + if (change->kind == eprosima::fastdds::rtps::ALIVE) { EPROSIMA_LOG_INFO(DISCOVERY_DATABASE, "ALIVE change received from: " << change->instanceHandle); // DATA(w) case @@ -574,10 +574,10 @@ bool DiscoveryDataBase::process_edp_data_queue() } void DiscoveryDataBase::create_participant_from_change_( - eprosima::fastrtps::rtps::CacheChange_t* ch, + eprosima::fastdds::rtps::CacheChange_t* ch, const DiscoveryParticipantChangeData& change_data) { - fastrtps::rtps::GUID_t change_guid = guid_from_change(ch); + fastdds::rtps::GUID_t change_guid = guid_from_change(ch); auto participant_it = participants_.find(change_guid.guidPrefix); // The participant was already known in the database @@ -594,7 +594,7 @@ void DiscoveryDataBase::create_participant_from_change_( } void DiscoveryDataBase::match_new_server_( - eprosima::fastrtps::rtps::GuidPrefix_t& participant_prefix) + eprosima::fastdds::rtps::GuidPrefix_t& participant_prefix) { // Send Our DATA(p) to the new participant // If this is not done, our data could be skip afterwards because a gap sent in newer DATA(p)s @@ -608,26 +608,26 @@ void DiscoveryDataBase::match_new_server_( } void DiscoveryDataBase::create_virtual_endpoints_( - eprosima::fastrtps::rtps::GuidPrefix_t& participant_prefix) + eprosima::fastdds::rtps::GuidPrefix_t& participant_prefix) { EPROSIMA_LOG_INFO(DISCOVERY_DATABASE, "Creating virtual entities for " << participant_prefix); /* Create virtual writer */ // Create a GUID for the virtual writer from the local server GUID prefix and the virtual writer entity // ID. - fastrtps::rtps::GUID_t virtual_writer_guid(participant_prefix, - fastrtps::rtps::ds_server_virtual_writer); + fastdds::rtps::GUID_t virtual_writer_guid(participant_prefix, + fastdds::rtps::ds_server_virtual_writer); // Create a populate the Cache Change with the necessary information. - fastrtps::rtps::CacheChange_t* virtual_writer_change = new fastrtps::rtps::CacheChange_t(); - virtual_writer_change->kind = fastrtps::rtps::ChangeKind_t::ALIVE; + fastdds::rtps::CacheChange_t* virtual_writer_change = new fastdds::rtps::CacheChange_t(); + virtual_writer_change->kind = fastdds::rtps::ChangeKind_t::ALIVE; virtual_writer_change->writerGUID.guidPrefix = participant_prefix; - virtual_writer_change->writerGUID.entityId = fastrtps::rtps::ds_server_virtual_writer; - virtual_writer_change->instanceHandle = fastrtps::rtps::InstanceHandle_t(virtual_writer_guid); + virtual_writer_change->writerGUID.entityId = fastdds::rtps::ds_server_virtual_writer; + virtual_writer_change->instanceHandle = fastdds::rtps::InstanceHandle_t(virtual_writer_guid); // Populate sample identity - fastrtps::rtps::SampleIdentity virtual_writer_sample_id; + fastdds::rtps::SampleIdentity virtual_writer_sample_id; virtual_writer_sample_id.writer_guid(virtual_writer_guid); - virtual_writer_sample_id.sequence_number(eprosima::fastrtps::rtps::SequenceNumber_t(0)); + virtual_writer_sample_id.sequence_number(eprosima::fastdds::rtps::SequenceNumber_t(0)); // Set write params - eprosima::fastrtps::rtps::WriteParams virtual_writer_writer_params; + eprosima::fastdds::rtps::WriteParams virtual_writer_writer_params; virtual_writer_writer_params.sample_identity(virtual_writer_sample_id); virtual_writer_writer_params.related_sample_identity(virtual_writer_sample_id); virtual_writer_change->write_params = std::move(virtual_writer_writer_params); @@ -640,20 +640,20 @@ void DiscoveryDataBase::create_virtual_endpoints_( /* Create virtual reader */ // Create a GUID for the virtual reader from the local server GUID prefix and the virtual reader entity // ID. - fastrtps::rtps::GUID_t virtual_reader_guid(participant_prefix, - fastrtps::rtps::ds_server_virtual_reader); + fastdds::rtps::GUID_t virtual_reader_guid(participant_prefix, + fastdds::rtps::ds_server_virtual_reader); // Create a populate the Cache Change with the necessary information. - fastrtps::rtps::CacheChange_t* virtual_reader_change = new fastrtps::rtps::CacheChange_t(); - virtual_reader_change->kind = fastrtps::rtps::ChangeKind_t::ALIVE; + fastdds::rtps::CacheChange_t* virtual_reader_change = new fastdds::rtps::CacheChange_t(); + virtual_reader_change->kind = fastdds::rtps::ChangeKind_t::ALIVE; virtual_reader_change->writerGUID.guidPrefix = participant_prefix; - virtual_reader_change->writerGUID.entityId = fastrtps::rtps::ds_server_virtual_reader; - virtual_reader_change->instanceHandle = fastrtps::rtps::InstanceHandle_t(virtual_reader_guid); + virtual_reader_change->writerGUID.entityId = fastdds::rtps::ds_server_virtual_reader; + virtual_reader_change->instanceHandle = fastdds::rtps::InstanceHandle_t(virtual_reader_guid); // Populate sample identity - fastrtps::rtps::SampleIdentity virtual_reader_sample_id; + fastdds::rtps::SampleIdentity virtual_reader_sample_id; virtual_reader_sample_id.writer_guid(virtual_reader_guid); - virtual_reader_sample_id.sequence_number(eprosima::fastrtps::rtps::SequenceNumber_t(0)); + virtual_reader_sample_id.sequence_number(eprosima::fastdds::rtps::SequenceNumber_t(0)); // Set write params - eprosima::fastrtps::rtps::WriteParams virtual_reader_writer_params; + eprosima::fastdds::rtps::WriteParams virtual_reader_writer_params; virtual_reader_writer_params.sample_identity(virtual_reader_sample_id); virtual_reader_writer_params.related_sample_identity(virtual_reader_sample_id); virtual_reader_change->write_params = std::move(virtual_reader_writer_params); @@ -673,12 +673,12 @@ bool DiscoveryDataBase::participant_data_has_changed_( } void DiscoveryDataBase::create_new_participant_from_change_( - eprosima::fastrtps::rtps::CacheChange_t* ch, + eprosima::fastdds::rtps::CacheChange_t* ch, const DiscoveryParticipantChangeData& change_data) { - fastrtps::rtps::GUID_t change_guid = guid_from_change(ch); + fastdds::rtps::GUID_t change_guid = guid_from_change(ch); - std::pair::iterator, bool> ret = + std::pair::iterator, bool> ret = participants_.insert( std::make_pair( change_guid.guidPrefix, @@ -723,10 +723,10 @@ void DiscoveryDataBase::create_new_participant_from_change_( void DiscoveryDataBase::update_participant_from_change_( DiscoveryParticipantInfo& participant_info, - eprosima::fastrtps::rtps::CacheChange_t* ch, + eprosima::fastdds::rtps::CacheChange_t* ch, const DiscoveryParticipantChangeData& change_data) { - fastrtps::rtps::GUID_t change_guid = guid_from_change(ch); + fastdds::rtps::GUID_t change_guid = guid_from_change(ch); // Specific case when a Data(P) from an entity A known as remote comes from the very entity A (we have // the Data(P) because of other server B, but now it arrives from A itself) @@ -805,10 +805,10 @@ void DiscoveryDataBase::update_participant_from_change_( } void DiscoveryDataBase::create_writers_from_change_( - eprosima::fastrtps::rtps::CacheChange_t* ch, + eprosima::fastdds::rtps::CacheChange_t* ch, const std::string& topic_name) { - const eprosima::fastrtps::rtps::GUID_t& writer_guid = guid_from_change(ch); + const eprosima::fastdds::rtps::GUID_t& writer_guid = guid_from_change(ch); auto writer_it = writers_.find(writer_guid); // The writer was already known in the database @@ -863,7 +863,7 @@ void DiscoveryDataBase::create_writers_from_change_( topic_name == virtual_topic_, server_guid_prefix_); - std::pair::iterator, bool> ret = + std::pair::iterator, bool> ret = writers_.insert(std::make_pair(writer_guid, tmp_writer)); if (!ret.second) { @@ -876,7 +876,7 @@ void DiscoveryDataBase::create_writers_from_change_( new_updates_++; // Add entry to participants_[guid_prefix]::writers - std::map::iterator writer_part_it = + std::map::iterator writer_part_it = participants_.find(writer_guid.guidPrefix); if (writer_part_it != participants_.end()) { @@ -923,10 +923,10 @@ void DiscoveryDataBase::create_writers_from_change_( } void DiscoveryDataBase::create_readers_from_change_( - eprosima::fastrtps::rtps::CacheChange_t* ch, + eprosima::fastdds::rtps::CacheChange_t* ch, const std::string& topic_name) { - const eprosima::fastrtps::rtps::GUID_t& reader_guid = guid_from_change(ch); + const eprosima::fastdds::rtps::GUID_t& reader_guid = guid_from_change(ch); auto reader_it = readers_.find(reader_guid); // The reader was already known in the database @@ -981,7 +981,7 @@ void DiscoveryDataBase::create_readers_from_change_( topic_name == virtual_topic_, server_guid_prefix_); - std::pair::iterator, bool> ret = + std::pair::iterator, bool> ret = readers_.insert(std::make_pair(reader_guid, tmp_reader)); if (!ret.second) { @@ -994,7 +994,7 @@ void DiscoveryDataBase::create_readers_from_change_( new_updates_++; // Add entry to participants_[guid_prefix]::readers - std::map::iterator reader_part_it = + std::map::iterator reader_part_it = participants_.find(reader_guid.guidPrefix); if (reader_part_it != participants_.end()) { @@ -1041,8 +1041,8 @@ void DiscoveryDataBase::create_readers_from_change_( } void DiscoveryDataBase::match_writer_reader_( - const eprosima::fastrtps::rtps::GUID_t& writer_guid, - const eprosima::fastrtps::rtps::GUID_t& reader_guid) + const eprosima::fastdds::rtps::GUID_t& writer_guid, + const eprosima::fastdds::rtps::GUID_t& reader_guid) { EPROSIMA_LOG_INFO(DISCOVERY_DATABASE, "Matching writer " << writer_guid << " with reader " << reader_guid); @@ -1228,18 +1228,18 @@ bool DiscoveryDataBase::set_dirty_topic_( } void DiscoveryDataBase::process_dispose_participant_( - eprosima::fastrtps::rtps::CacheChange_t* ch) + eprosima::fastdds::rtps::CacheChange_t* ch) { - const eprosima::fastrtps::rtps::GUID_t& participant_guid = guid_from_change(ch); + const eprosima::fastdds::rtps::GUID_t& participant_guid = guid_from_change(ch); // Change DATA(p) with DATA(Up) in participants map - std::map::iterator pit = + std::map::iterator pit = participants_.find(participant_guid.guidPrefix); if (pit != participants_.end()) { // Check if this participant is already NOT ALIVE // Due to the way of announce a server, it is common to receive two DATA(Up) from the same server - if (pit->second.change()->kind != fastrtps::rtps::ChangeKind_t::ALIVE) + if (pit->second.change()->kind != fastdds::rtps::ChangeKind_t::ALIVE) { EPROSIMA_LOG_INFO(DISCOVERY_DATABASE, "Ignoring second DATA(Up)" << participant_guid.guidPrefix); @@ -1298,12 +1298,12 @@ void DiscoveryDataBase::process_dispose_participant_( } void DiscoveryDataBase::process_dispose_writer_( - eprosima::fastrtps::rtps::CacheChange_t* ch) + eprosima::fastdds::rtps::CacheChange_t* ch) { - const eprosima::fastrtps::rtps::GUID_t& writer_guid = guid_from_change(ch); + const eprosima::fastdds::rtps::GUID_t& writer_guid = guid_from_change(ch); // Check if the writer is still alive (if DATA(Up) is processed before it will be erased) - std::map::iterator wit = writers_.find(writer_guid); + std::map::iterator wit = writers_.find(writer_guid); if (wit != writers_.end()) { // Change DATA(w) with DATA(Uw) @@ -1327,13 +1327,13 @@ void DiscoveryDataBase::process_dispose_writer_( } void DiscoveryDataBase::process_dispose_reader_( - eprosima::fastrtps::rtps::CacheChange_t* ch) + eprosima::fastdds::rtps::CacheChange_t* ch) { - const eprosima::fastrtps::rtps::GUID_t& reader_guid = guid_from_change(ch); + const eprosima::fastdds::rtps::GUID_t& reader_guid = guid_from_change(ch); // Check if the writer is still alive (if DATA(Up) is processed before it will be erased) - std::map::iterator rit = readers_.find(reader_guid); + std::map::iterator rit = readers_.find(reader_guid); if (rit != readers_.end()) { // Change DATA(r) with DATA(Ur) @@ -1369,10 +1369,10 @@ bool DiscoveryDataBase::process_dirty_topics() std::lock_guard guard(mutex_); // Iterator objects are declared here because they are reused in each iteration of the loops - std::map::iterator parts_reader_it; - std::map::iterator parts_writer_it; - std::map::iterator readers_it; - std::map::iterator writers_it; + std::map::iterator parts_reader_it; + std::map::iterator parts_writer_it; + std::map::iterator readers_it; + std::map::iterator writers_it; // Iterate over dirty_topics_ for (auto topic_it = dirty_topics_.begin(); topic_it != dirty_topics_.end();) @@ -1382,26 +1382,26 @@ bool DiscoveryDataBase::process_dirty_topics() bool is_clearable = true; // Get all the writers in the topic - std::vector writers; + std::vector writers; auto ret = writers_by_topic_.find(*topic_it); if (ret != writers_by_topic_.end()) { writers = ret->second; } // Get all the readers in the topic - std::vector readers; + std::vector readers; ret = readers_by_topic_.find(*topic_it); if (ret != readers_by_topic_.end()) { readers = ret->second; } - for (fastrtps::rtps::GUID_t writer: writers) + for (fastdds::rtps::GUID_t writer: writers) // Iterate over writers in the topic: { EPROSIMA_LOG_INFO(DISCOVERY_DATABASE, "[" << *topic_it << "]" << " Processing writer: " << writer); // Iterate over readers in the topic: - for (fastrtps::rtps::GUID_t reader : readers) + for (fastdds::rtps::GUID_t reader : readers) { EPROSIMA_LOG_INFO(DISCOVERY_DATABASE, "[" << *topic_it << "]" << " Processing reader: " << reader); // Find participants with writer info and participant with reader info in participants_ @@ -1500,7 +1500,7 @@ bool DiscoveryDataBase::process_dirty_topics() } bool DiscoveryDataBase::delete_entity_of_change( - fastrtps::rtps::CacheChange_t* change) + fastdds::rtps::CacheChange_t* change) { if (!enabled_) { @@ -1511,7 +1511,7 @@ bool DiscoveryDataBase::delete_entity_of_change( // Lock(exclusive mode) mutex locally std::lock_guard guard(mutex_); - if (change->kind == fastrtps::rtps::ChangeKind_t::ALIVE) + if (change->kind == fastdds::rtps::ChangeKind_t::ALIVE) { EPROSIMA_LOG_WARNING(DISCOVERY_DATABASE, "Attempting to delete information of an ALIVE entity: " << guid_from_change(change)); @@ -1543,19 +1543,19 @@ bool DiscoveryDataBase::data_queue_empty() } bool DiscoveryDataBase::is_participant( - const eprosima::fastrtps::rtps::GUID_t& guid) + const eprosima::fastdds::rtps::GUID_t& guid) { - return eprosima::fastrtps::rtps::c_EntityId_RTPSParticipant == guid.entityId; + return eprosima::fastdds::rtps::c_EntityId_RTPSParticipant == guid.entityId; } bool DiscoveryDataBase::is_writer( - const eprosima::fastrtps::rtps::GUID_t& guid) + const eprosima::fastdds::rtps::GUID_t& guid) { // RTPS Specification v2.3 // - For writers: NO_KEY = 0x03, WITH_KEY = 0x02 // - For built-in writers: NO_KEY = 0xc3, WITH_KEY = 0xc2 // Furthermore, the Fast DDS Statistics Module defines an Entity ID for Statistics DataWriters - const eprosima::fastrtps::rtps::octet identifier = guid.entityId.value[3]; + const eprosima::fastdds::rtps::octet identifier = guid.entityId.value[3]; return ((identifier == 0x02) || (identifier == 0xc2) || (identifier == 0x03) || @@ -1564,12 +1564,12 @@ bool DiscoveryDataBase::is_writer( } bool DiscoveryDataBase::is_reader( - const eprosima::fastrtps::rtps::GUID_t& guid) + const eprosima::fastdds::rtps::GUID_t& guid) { // RTPS Specification v2.3 // For readers: NO_KEY = 0x04, WITH_KEY = 0x07 // For built-in readers: NO_KEY = 0xc4, WITH_KEY = 0xc7 - const eprosima::fastrtps::rtps::octet identifier = guid.entityId.value[3]; + const eprosima::fastdds::rtps::octet identifier = guid.entityId.value[3]; return ((identifier == 0x04) || (identifier == 0xc4) || (identifier == 0x07) || @@ -1577,30 +1577,30 @@ bool DiscoveryDataBase::is_reader( } bool DiscoveryDataBase::is_participant( - const eprosima::fastrtps::rtps::CacheChange_t* ch) + const eprosima::fastdds::rtps::CacheChange_t* ch) { return is_participant(guid_from_change(ch)); } bool DiscoveryDataBase::is_writer( - const eprosima::fastrtps::rtps::CacheChange_t* ch) + const eprosima::fastdds::rtps::CacheChange_t* ch) { return is_writer(guid_from_change(ch)); } bool DiscoveryDataBase::is_reader( - const eprosima::fastrtps::rtps::CacheChange_t* ch) + const eprosima::fastdds::rtps::CacheChange_t* ch) { return is_reader(guid_from_change(ch)); } -eprosima::fastrtps::rtps::GUID_t DiscoveryDataBase::guid_from_change( - const eprosima::fastrtps::rtps::CacheChange_t* ch) +eprosima::fastdds::rtps::GUID_t DiscoveryDataBase::guid_from_change( + const eprosima::fastdds::rtps::CacheChange_t* ch) { - return fastrtps::rtps::iHandle2GUID(ch->instanceHandle); + return fastdds::rtps::iHandle2GUID(ch->instanceHandle); } -fastrtps::rtps::CacheChange_t* DiscoveryDataBase::cache_change_own_participant() +fastdds::rtps::CacheChange_t* DiscoveryDataBase::cache_change_own_participant() { auto part_it = participants_.find(server_guid_prefix_); if (part_it != participants_.end()) @@ -1610,11 +1610,11 @@ fastrtps::rtps::CacheChange_t* DiscoveryDataBase::cache_change_own_participant() return nullptr; } -const std::vector DiscoveryDataBase::direct_clients_and_servers() +const std::vector DiscoveryDataBase::direct_clients_and_servers() { std::lock_guard guard(mutex_); - std::vector direct_clients_and_servers; + std::vector direct_clients_and_servers; // Iterate over participants to add the remote ones that are direct clients or servers for (auto participant: participants_) { @@ -1622,7 +1622,7 @@ const std::vector DiscoveryDataBase::direct_client if (server_guid_prefix_ != participant.first) { // Only add direct clients or server that are alive, not relayed ones. - if (participant.second.is_local() && participant.second.change()->kind == eprosima::fastrtps::rtps::ALIVE) + if (participant.second.is_local() && participant.second.change()->kind == eprosima::fastdds::rtps::ALIVE) { direct_clients_and_servers.push_back(participant.first); } @@ -1656,11 +1656,11 @@ bool DiscoveryDataBase::server_acked_by_my_servers() return true; } -std::vector DiscoveryDataBase::ack_pending_servers() +std::vector DiscoveryDataBase::ack_pending_servers() { std::lock_guard guard(mutex_); - std::vector ack_pending_servers; + std::vector ack_pending_servers; // Find the server's participant and check whether all its servers have ACKed the server's DATA(p) auto this_server = participants_.find(server_guid_prefix_); for (auto prefix : servers_) @@ -1674,7 +1674,7 @@ std::vector DiscoveryDataBase::ack_pending_servers } LocatorList DiscoveryDataBase::participant_metatraffic_locators( - fastrtps::rtps::GuidPrefix_t participant_guid_prefix) + fastdds::rtps::GuidPrefix_t participant_guid_prefix) { LocatorList locators; auto part_it = participants_.find(participant_guid_prefix); @@ -1689,14 +1689,14 @@ LocatorList DiscoveryDataBase::participant_metatraffic_locators( } DiscoveryDataBase::AckedFunctor DiscoveryDataBase::functor( - eprosima::fastrtps::rtps::CacheChange_t* change) + eprosima::fastdds::rtps::CacheChange_t* change) { return DiscoveryDataBase::AckedFunctor(this, change); } DiscoveryDataBase::AckedFunctor::AckedFunctor( DiscoveryDataBase* db, - eprosima::fastrtps::rtps::CacheChange_t* change) + eprosima::fastdds::rtps::CacheChange_t* change) : db_(db) , change_(change) , pending_(false) @@ -1726,7 +1726,7 @@ DiscoveryDataBase::AckedFunctor::~AckedFunctor() } void DiscoveryDataBase::AckedFunctor::operator () ( - const eprosima::fastrtps::rtps::ReaderProxy* reader_proxy) + const eprosima::fastdds::rtps::ReaderProxy* reader_proxy) { std::lock_guard guard(db_->mutex_); @@ -1779,7 +1779,7 @@ void DiscoveryDataBase::AckedFunctor::operator () ( } void DiscoveryDataBase::unmatch_participant_( - const eprosima::fastrtps::rtps::GuidPrefix_t& guid_prefix) + const eprosima::fastdds::rtps::GuidPrefix_t& guid_prefix) { EPROSIMA_LOG_INFO(DISCOVERY_DATABASE, "unmatching participant: " << guid_prefix); @@ -1801,7 +1801,7 @@ void DiscoveryDataBase::unmatch_participant_( } void DiscoveryDataBase::unmatch_writer_( - const eprosima::fastrtps::rtps::GUID_t& guid) + const eprosima::fastdds::rtps::GUID_t& guid) { EPROSIMA_LOG_INFO(DISCOVERY_DATABASE, "unmatching writer: " << guid); @@ -1846,7 +1846,7 @@ void DiscoveryDataBase::unmatch_writer_( } void DiscoveryDataBase::unmatch_reader_( - const eprosima::fastrtps::rtps::GUID_t& guid) + const eprosima::fastdds::rtps::GUID_t& guid) { EPROSIMA_LOG_INFO(DISCOVERY_DATABASE, "unmatching reader: " << guid); @@ -1889,7 +1889,7 @@ void DiscoveryDataBase::unmatch_reader_( } bool DiscoveryDataBase::repeated_writer_topic_( - const eprosima::fastrtps::rtps::GuidPrefix_t& participant, + const eprosima::fastdds::rtps::GuidPrefix_t& participant, const std::string& topic_name) { int count = 0; @@ -1926,7 +1926,7 @@ bool DiscoveryDataBase::repeated_writer_topic_( } bool DiscoveryDataBase::repeated_reader_topic_( - const eprosima::fastrtps::rtps::GuidPrefix_t& participant, + const eprosima::fastdds::rtps::GuidPrefix_t& participant, const std::string& topic_name) { int count = 0; @@ -1964,15 +1964,15 @@ bool DiscoveryDataBase::repeated_reader_topic_( } void DiscoveryDataBase::remove_writer_from_topic_( - const eprosima::fastrtps::rtps::GUID_t& writer_guid, + const eprosima::fastdds::rtps::GUID_t& writer_guid, const std::string& topic_name) { if (topic_name == virtual_topic_) { - std::map>::iterator topic_it; + std::map>::iterator topic_it; for (topic_it = writers_by_topic_.begin(); topic_it != writers_by_topic_.end(); topic_it++) { - for (std::vector::iterator writer_it = topic_it->second.begin(); + for (std::vector::iterator writer_it = topic_it->second.begin(); writer_it != topic_it->second.end(); ++writer_it) { @@ -1986,11 +1986,11 @@ void DiscoveryDataBase::remove_writer_from_topic_( } else { - std::map>::iterator topic_it = + std::map>::iterator topic_it = writers_by_topic_.find(topic_name); if (topic_it != writers_by_topic_.end()) { - for (std::vector::iterator writer_it = topic_it->second.begin(); + for (std::vector::iterator writer_it = topic_it->second.begin(); writer_it != topic_it->second.end(); ++writer_it) { @@ -2010,17 +2010,17 @@ void DiscoveryDataBase::remove_writer_from_topic_( } void DiscoveryDataBase::remove_reader_from_topic_( - const eprosima::fastrtps::rtps::GUID_t& reader_guid, + const eprosima::fastdds::rtps::GUID_t& reader_guid, const std::string& topic_name) { EPROSIMA_LOG_INFO(DISCOVERY_DATABASE, "removing: " << reader_guid << " from topic " << topic_name); if (topic_name == virtual_topic_) { - std::map>::iterator topic_it; + std::map>::iterator topic_it; for (topic_it = readers_by_topic_.begin(); topic_it != readers_by_topic_.end(); topic_it++) { - for (std::vector::iterator reader_it = topic_it->second.begin(); + for (std::vector::iterator reader_it = topic_it->second.begin(); reader_it != topic_it->second.end(); ++reader_it) { @@ -2034,11 +2034,11 @@ void DiscoveryDataBase::remove_reader_from_topic_( } else { - std::map>::iterator topic_it = + std::map>::iterator topic_it = readers_by_topic_.find(topic_name); if (topic_it != readers_by_topic_.end()) { - for (std::vector::iterator reader_it = topic_it->second.begin(); + for (std::vector::iterator reader_it = topic_it->second.begin(); reader_it != topic_it->second.end(); ++reader_it) { @@ -2059,9 +2059,9 @@ void DiscoveryDataBase::create_topic_( { // Create writers topic auto wit = writers_by_topic_.insert( - std::pair>( + std::pair>( topic_name, - std::vector())); + std::vector())); if (wit.second) { // Find virtual topic @@ -2070,7 +2070,7 @@ void DiscoveryDataBase::create_topic_( { // add all virtual writers // in case virtual topic does not exist do nothing - for (fastrtps::rtps::GUID_t virtual_writer : v_wit->second) + for (fastdds::rtps::GUID_t virtual_writer : v_wit->second) { wit.first->second.push_back(virtual_writer); } @@ -2079,9 +2079,9 @@ void DiscoveryDataBase::create_topic_( // Create readers topic auto rit = readers_by_topic_.insert( - std::pair>( + std::pair>( topic_name, - std::vector())); + std::vector())); if (rit.second) { // Find virtual topic @@ -2090,7 +2090,7 @@ void DiscoveryDataBase::create_topic_( { // add all virtual readers // in case virtual topic does not exist do nothing - for (fastrtps::rtps::GUID_t virtual_reader : v_rit->second) + for (fastdds::rtps::GUID_t virtual_reader : v_rit->second) { rit.first->second.push_back(virtual_reader); } @@ -2101,7 +2101,7 @@ void DiscoveryDataBase::create_topic_( } void DiscoveryDataBase::add_writer_to_topic_( - const eprosima::fastrtps::rtps::GUID_t& writer_guid, + const eprosima::fastdds::rtps::GUID_t& writer_guid, const std::string& topic_name) { // Check if the topic exists already, if not create it @@ -2122,7 +2122,7 @@ void DiscoveryDataBase::add_writer_to_topic_( { // This find should be useless because right now we only call this function from // create_writer_from_change, so the entity must be always new - std::vector::iterator writer_by_topic_it = + std::vector::iterator writer_by_topic_it = std::find(it_topics->second.begin(), it_topics->second.end(), writer_guid); if (writer_by_topic_it == it_topics->second.end()) { @@ -2136,7 +2136,7 @@ void DiscoveryDataBase::add_writer_to_topic_( } // Add the writer in the topic - std::vector::iterator writer_by_topic_it = + std::vector::iterator writer_by_topic_it = std::find(it->second.begin(), it->second.end(), writer_guid); if (writer_by_topic_it == it->second.end()) { @@ -2146,7 +2146,7 @@ void DiscoveryDataBase::add_writer_to_topic_( } void DiscoveryDataBase::add_reader_to_topic_( - const eprosima::fastrtps::rtps::GUID_t& reader_guid, + const eprosima::fastdds::rtps::GUID_t& reader_guid, const std::string& topic_name) { // Check if the topic exists already, if not create it @@ -2167,7 +2167,7 @@ void DiscoveryDataBase::add_reader_to_topic_( { // This find should be useless because right now we only call this function from // create_reader_from_change, so the entity must be always new - std::vector::iterator reader_by_topic_it = + std::vector::iterator reader_by_topic_it = std::find(it_topics->second.begin(), it_topics->second.end(), reader_guid); if (reader_by_topic_it == it_topics->second.end()) { @@ -2181,7 +2181,7 @@ void DiscoveryDataBase::add_reader_to_topic_( } // Add the reader in the topic - std::vector::iterator reader_by_topic_it = + std::vector::iterator reader_by_topic_it = std::find(it->second.begin(), it->second.end(), reader_guid); if (reader_by_topic_it == it->second.end()) { @@ -2191,7 +2191,7 @@ void DiscoveryDataBase::add_reader_to_topic_( } bool DiscoveryDataBase::delete_participant_entity_( - const fastrtps::rtps::GuidPrefix_t& guid_prefix) + const fastdds::rtps::GuidPrefix_t& guid_prefix) { auto it = participants_.find(guid_prefix); if (it == participants_.end()) @@ -2203,9 +2203,9 @@ bool DiscoveryDataBase::delete_participant_entity_( return true; } -std::map::iterator +std::map::iterator DiscoveryDataBase::delete_participant_entity_( - std::map::iterator it) + std::map::iterator it) { EPROSIMA_LOG_INFO(DISCOVERY_DATABASE, "Deleting participant: " << it->first); if (it == participants_.end()) @@ -2217,7 +2217,7 @@ DiscoveryDataBase::delete_participant_entity_( } bool DiscoveryDataBase::delete_reader_entity_( - const fastrtps::rtps::GUID_t& guid) + const fastdds::rtps::GUID_t& guid) { // Find own reader auto it = readers_.find(guid); @@ -2230,8 +2230,8 @@ bool DiscoveryDataBase::delete_reader_entity_( return true; } -std::map::iterator DiscoveryDataBase::delete_reader_entity_( - std::map::iterator it) +std::map::iterator DiscoveryDataBase::delete_reader_entity_( + std::map::iterator it) { EPROSIMA_LOG_INFO(DISCOVERY_DATABASE, "Deleting reader: " << it->first.guidPrefix); if (it == readers_.end()) @@ -2266,7 +2266,7 @@ std::map::iterator Disc } bool DiscoveryDataBase::delete_writer_entity_( - const fastrtps::rtps::GUID_t& guid) + const fastdds::rtps::GUID_t& guid) { // Find own writer auto it = writers_.find(guid); @@ -2279,8 +2279,8 @@ bool DiscoveryDataBase::delete_writer_entity_( return true; } -std::map::iterator DiscoveryDataBase::delete_writer_entity_( - std::map::iterator it) +std::map::iterator DiscoveryDataBase::delete_writer_entity_( + std::map::iterator it) { EPROSIMA_LOG_INFO(DISCOVERY_DATABASE, "Deleting writer: " << it->first.guidPrefix); if (it == writers_.end()) @@ -2315,7 +2315,7 @@ std::map::iterator Disc } bool DiscoveryDataBase::add_pdp_to_send_( - eprosima::fastrtps::rtps::CacheChange_t* change) + eprosima::fastdds::rtps::CacheChange_t* change) { // Add DATA(p) to send in next iteration if it is not already there if (std::find( @@ -2332,7 +2332,7 @@ bool DiscoveryDataBase::add_pdp_to_send_( } bool DiscoveryDataBase::add_edp_publications_to_send_( - eprosima::fastrtps::rtps::CacheChange_t* change) + eprosima::fastdds::rtps::CacheChange_t* change) { // Add DATA(w) to send in next iteration if it is not already there if (std::find( @@ -2349,7 +2349,7 @@ bool DiscoveryDataBase::add_edp_publications_to_send_( } bool DiscoveryDataBase::add_edp_subscriptions_to_send_( - eprosima::fastrtps::rtps::CacheChange_t* change) + eprosima::fastdds::rtps::CacheChange_t* change) { // Add DATA(r) to send in next iteration if it is not already there if (std::find( @@ -2416,7 +2416,7 @@ void DiscoveryDataBase::to_json( bool DiscoveryDataBase::from_json( nlohmann::json& j, - std::map& changes_map) + std::map& changes_map) { // This function will parse each attribute in json backup, casting it to istringstream // std::istringstream(j[""]) >> obj; @@ -2424,10 +2424,10 @@ bool DiscoveryDataBase::from_json( // Changes are taken from changes_map, with already created changes // Auxiliar variables to deserialize and create new objects of the ddb - fastrtps::rtps::InstanceHandle_t instance_handle_aux; - fastrtps::rtps::GuidPrefix_t prefix_aux; - fastrtps::rtps::GuidPrefix_t prefix_aux_ack; - fastrtps::rtps::GUID_t guid_aux; + fastdds::rtps::InstanceHandle_t instance_handle_aux; + fastdds::rtps::GuidPrefix_t prefix_aux; + fastdds::rtps::GuidPrefix_t prefix_aux_ack; + fastdds::rtps::GUID_t guid_aux; EPROSIMA_LOG_INFO(DISCOVERY_DATABASE, "Raising DDB from json Backup"); @@ -2441,11 +2441,11 @@ bool DiscoveryDataBase::from_json( std::istringstream(it.value()["change"]["instance_handle"].get()) >> instance_handle_aux; // Get change - fastrtps::rtps::CacheChange_t* change; + fastdds::rtps::CacheChange_t* change; change = changes_map[instance_handle_aux]; // Populate RemoteLocatorList - fastrtps::rtps::RemoteLocatorList rll; + fastdds::rtps::RemoteLocatorList rll; std::istringstream(it.value()["metatraffic_locators"].get()) >> rll; // Populate DiscoveryParticipantChangeData @@ -2472,7 +2472,7 @@ bool DiscoveryDataBase::from_json( EPROSIMA_LOG_INFO(DISCOVERY_DATABASE, "Participant " << prefix_aux << " created"); // In case the change is NOT ALIVE it must be set as dispose so it can be communicate to others and erased - if (change->kind != fastrtps::rtps::ALIVE) + if (change->kind != fastdds::rtps::ALIVE) { disposals_.push_back(change); } @@ -2486,7 +2486,7 @@ bool DiscoveryDataBase::from_json( std::istringstream(it.value()["change"]["instance_handle"].get()) >> instance_handle_aux; // Get change - fastrtps::rtps::CacheChange_t* change; + fastdds::rtps::CacheChange_t* change; change = changes_map[instance_handle_aux]; // Populate topic @@ -2514,7 +2514,7 @@ bool DiscoveryDataBase::from_json( add_writer_to_topic_(guid_aux, topic); // Add writer to its participant - std::map::iterator writer_part_it = + std::map::iterator writer_part_it = participants_.find(guid_aux.guidPrefix); if (writer_part_it != participants_.end()) { @@ -2532,7 +2532,7 @@ bool DiscoveryDataBase::from_json( "Writer " << guid_aux << " created with instance handle " << wit.first->second.change()->instanceHandle); - if (change->kind != fastrtps::rtps::ALIVE) + if (change->kind != fastdds::rtps::ALIVE) { disposals_.push_back(change); } @@ -2546,7 +2546,7 @@ bool DiscoveryDataBase::from_json( std::istringstream(it.value()["change"]["instance_handle"].get()) >> instance_handle_aux; // Get change - fastrtps::rtps::CacheChange_t* change; + fastdds::rtps::CacheChange_t* change; change = changes_map[instance_handle_aux]; // Populate topic @@ -2572,7 +2572,7 @@ bool DiscoveryDataBase::from_json( add_reader_to_topic_(guid_aux, topic); // Add reader to its participant - std::map::iterator reader_part_it = + std::map::iterator reader_part_it = participants_.find(guid_aux.guidPrefix); if (reader_part_it != participants_.end()) { @@ -2586,7 +2586,7 @@ bool DiscoveryDataBase::from_json( } EPROSIMA_LOG_INFO(DISCOVERY_DATABASE, "Reader " << guid_aux << " created"); - if (change->kind != fastrtps::rtps::ALIVE) + if (change->kind != fastdds::rtps::ALIVE) { disposals_.push_back(change); } @@ -2625,7 +2625,7 @@ void DiscoveryDataBase::persistence_enable( } bool DiscoveryDataBase::is_participant_local( - const eprosima::fastrtps::rtps::GuidPrefix_t& participant_prefix) + const eprosima::fastdds::rtps::GuidPrefix_t& participant_prefix) { std::lock_guard guard(mutex_); diff --git a/src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.hpp b/src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.hpp index c9feb9b91a2..63740915936 100644 --- a/src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.hpp +++ b/src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.hpp @@ -62,23 +62,23 @@ class DiscoveryDataBase // Functions to process_writers_acknowledgements() // Return the functor, class that works as a lambda AckedFunctor functor( - eprosima::fastrtps::rtps::CacheChange_t* ); + eprosima::fastdds::rtps::CacheChange_t* ); class AckedFunctor { - using argument_type = eprosima::fastrtps::rtps::ReaderProxy*; + using argument_type = eprosima::fastdds::rtps::ReaderProxy*; using result_type = void; // friend class DiscoveryDataBase; friend AckedFunctor DiscoveryDataBase::functor( - eprosima::fastrtps::rtps::CacheChange_t* ); + eprosima::fastdds::rtps::CacheChange_t* ); // Stateful constructor // This constructor generates the only object that keeps the state // all other constructors reference this object state AckedFunctor( DiscoveryDataBase* db, - eprosima::fastrtps::rtps::CacheChange_t* change); + eprosima::fastdds::rtps::CacheChange_t* change); AckedFunctor() = delete; @@ -98,7 +98,7 @@ class DiscoveryDataBase ~AckedFunctor(); void operator () ( - const eprosima::fastrtps::rtps::ReaderProxy* reader_proxy); + const eprosima::fastdds::rtps::ReaderProxy* reader_proxy); operator bool() const { @@ -108,7 +108,7 @@ class DiscoveryDataBase private: DiscoveryDataBase* db_; - eprosima::fastrtps::rtps::CacheChange_t* change_; + eprosima::fastdds::rtps::CacheChange_t* change_; // stateful functor is the one contructed form the database bool pending_; // stateful functor state bool& external_pending_; // references stateful functor @@ -117,8 +117,8 @@ class DiscoveryDataBase friend class AckedFunctor; DiscoveryDataBase( - fastrtps::rtps::GuidPrefix_t server_guid_prefix, - std::set servers); + fastdds::rtps::GuidPrefix_t server_guid_prefix, + std::set servers); ~DiscoveryDataBase(); @@ -130,11 +130,11 @@ class DiscoveryDataBase * @return: True if the change was added, false otherwise. */ bool update( - eprosima::fastrtps::rtps::CacheChange_t* change, + eprosima::fastdds::rtps::CacheChange_t* change, std::string topic_name); bool update( - eprosima::fastrtps::rtps::CacheChange_t* change, + eprosima::fastdds::rtps::CacheChange_t* change, DiscoveryParticipantChangeData participant_change_data); //! Enables the possibility to add new entries to the database. Enable by default. @@ -179,24 +179,24 @@ class DiscoveryDataBase /* Clear all the collections in the database * @return: The changes that can be released */ - std::vector clear(); + std::vector clear(); //////////// // Functions to is_relevant // Return whether a PDP change is relevant for a given reader bool pdp_is_relevant( - const eprosima::fastrtps::rtps::CacheChange_t& change, - const eprosima::fastrtps::rtps::GUID_t& reader_guid) const; + const eprosima::fastdds::rtps::CacheChange_t& change, + const eprosima::fastdds::rtps::GUID_t& reader_guid) const; // Return whether a EDP publications change is relevant for a given reader bool edp_publications_is_relevant( - const eprosima::fastrtps::rtps::CacheChange_t& change, - const eprosima::fastrtps::rtps::GUID_t& reader_guid) const; + const eprosima::fastdds::rtps::CacheChange_t& change, + const eprosima::fastdds::rtps::GUID_t& reader_guid) const; // Return whether a EDP subscription change is relevant for a given reader bool edp_subscriptions_is_relevant( - const eprosima::fastrtps::rtps::CacheChange_t& change, - const eprosima::fastrtps::rtps::GUID_t& reader_guid) const; + const eprosima::fastdds::rtps::CacheChange_t& change, + const eprosima::fastdds::rtps::GUID_t& reader_guid) const; //////////// // Functions to process PDP and EDP data queues @@ -210,7 +210,7 @@ class DiscoveryDataBase //////////// // Functions to process_disposals() - const std::vector changes_to_dispose(); + const std::vector changes_to_dispose(); void clear_changes_to_dispose(); @@ -219,23 +219,23 @@ class DiscoveryDataBase * @return: True if the entity was deleted, false otherwise. */ bool delete_entity_of_change( - fastrtps::rtps::CacheChange_t* change); + fastdds::rtps::CacheChange_t* change); //////////// // Functions to process_to_send_lists() - const std::vector pdp_to_send(); + const std::vector pdp_to_send(); void clear_pdp_to_send(); - const std::vector edp_publications_to_send(); + const std::vector edp_publications_to_send(); void clear_edp_publications_to_send(); - const std::vector edp_subscriptions_to_send(); + const std::vector edp_subscriptions_to_send(); void clear_edp_subscriptions_to_send(); - const std::vector changes_to_release(); + const std::vector changes_to_release(); void clear_changes_to_release(); @@ -243,39 +243,39 @@ class DiscoveryDataBase //////////// // Static Functions to work with GUIDs static bool is_participant( - const eprosima::fastrtps::rtps::GUID_t& guid); + const eprosima::fastdds::rtps::GUID_t& guid); static bool is_writer( - const eprosima::fastrtps::rtps::GUID_t& guid); + const eprosima::fastdds::rtps::GUID_t& guid); static bool is_reader( - const eprosima::fastrtps::rtps::GUID_t& guid); + const eprosima::fastdds::rtps::GUID_t& guid); static bool is_participant( - const eprosima::fastrtps::rtps::CacheChange_t* ch); + const eprosima::fastdds::rtps::CacheChange_t* ch); static bool is_writer( - const eprosima::fastrtps::rtps::CacheChange_t* ch); + const eprosima::fastdds::rtps::CacheChange_t* ch); static bool is_reader( - const eprosima::fastrtps::rtps::CacheChange_t* ch); + const eprosima::fastdds::rtps::CacheChange_t* ch); - static eprosima::fastrtps::rtps::GUID_t guid_from_change( - const eprosima::fastrtps::rtps::CacheChange_t* ch); + static eprosima::fastdds::rtps::GUID_t guid_from_change( + const eprosima::fastdds::rtps::CacheChange_t* ch); //////////// // Functions to work with own server // return the cache change of the server - fastrtps::rtps::CacheChange_t* cache_change_own_participant(); + fastdds::rtps::CacheChange_t* cache_change_own_participant(); - const std::vector direct_clients_and_servers(); + const std::vector direct_clients_and_servers(); LocatorList participant_metatraffic_locators( - fastrtps::rtps::GuidPrefix_t participant_guid_prefix); + fastdds::rtps::GuidPrefix_t participant_guid_prefix); // return a list of participants that are not the server one - const std::vector remote_participants(); + const std::vector remote_participants(); // set if the server has been acked by all the reader proxys in server bool server_acked_by_all() const @@ -291,7 +291,7 @@ class DiscoveryDataBase bool server_acked_by_my_servers(); - std::vector ack_pending_servers(); + std::vector ack_pending_servers(); //////////// // Data structures utils @@ -304,7 +304,7 @@ class DiscoveryDataBase bool from_json( nlohmann::json& j, - std::map& changes_map); + std::map& changes_map); // This function erase the last backup and all the changes that has arrived since then and create // a new backup that shows the actual state of the database @@ -341,28 +341,28 @@ class DiscoveryDataBase // Check if an participant is stored as local. If the participant does not exist, it returns false bool is_participant_local( - const eprosima::fastrtps::rtps::GuidPrefix_t& participant_prefix); + const eprosima::fastdds::rtps::GuidPrefix_t& participant_prefix); //! Add a server to the list of remote servers void add_server( - fastrtps::rtps::GuidPrefix_t server); + fastdds::rtps::GuidPrefix_t server); // Removes all the changes whose original sender was entity_guid_prefix from writer_history void remove_related_alive_from_history_nts( - fastrtps::rtps::WriterHistory* writer_history, - const fastrtps::rtps::GuidPrefix_t& entity_guid_prefix); + fastdds::rtps::WriterHistory* writer_history, + const fastdds::rtps::GuidPrefix_t& entity_guid_prefix); protected: // change a cacheChange by update or new disposal void update_change_and_unmatch_( - fastrtps::rtps::CacheChange_t* new_change, + fastdds::rtps::CacheChange_t* new_change, ddb::DiscoverySharedInfo& entity); // update the acks void add_ack_( - const eprosima::fastrtps::rtps::CacheChange_t* change, - const eprosima::fastrtps::rtps::GuidPrefix_t& acked_entity); + const eprosima::fastdds::rtps::CacheChange_t* change, + const eprosima::fastdds::rtps::GuidPrefix_t& acked_entity); //////////// // Mutex Functions @@ -380,104 +380,104 @@ class DiscoveryDataBase // functions to manage new cacheChanges in update void create_participant_from_change_( - eprosima::fastrtps::rtps::CacheChange_t* ch, + eprosima::fastdds::rtps::CacheChange_t* ch, const DiscoveryParticipantChangeData& change_data); void create_writers_from_change_( - eprosima::fastrtps::rtps::CacheChange_t* ch, + eprosima::fastdds::rtps::CacheChange_t* ch, const std::string& topic_name); void create_readers_from_change_( - eprosima::fastrtps::rtps::CacheChange_t* ch, + eprosima::fastdds::rtps::CacheChange_t* ch, const std::string& topic_name); // Functions related with create_participant_from_change_ void match_new_server_( - eprosima::fastrtps::rtps::GuidPrefix_t& participant_prefix); + eprosima::fastdds::rtps::GuidPrefix_t& participant_prefix); void create_virtual_endpoints_( - eprosima::fastrtps::rtps::GuidPrefix_t& participant_prefix); + eprosima::fastdds::rtps::GuidPrefix_t& participant_prefix); static bool participant_data_has_changed_( const DiscoveryParticipantInfo& participant_info, const DiscoveryParticipantChangeData& new_change_data); void create_new_participant_from_change_( - eprosima::fastrtps::rtps::CacheChange_t* ch, + eprosima::fastdds::rtps::CacheChange_t* ch, const DiscoveryParticipantChangeData& change_data); void update_participant_from_change_( DiscoveryParticipantInfo& participant_info, - eprosima::fastrtps::rtps::CacheChange_t* ch, + eprosima::fastdds::rtps::CacheChange_t* ch, const DiscoveryParticipantChangeData& change_data); // change ack relevants and matched between entities participants and endpoints void match_writer_reader_( - const eprosima::fastrtps::rtps::GUID_t& writer_guid, - const eprosima::fastrtps::rtps::GUID_t& reader_guid); + const eprosima::fastdds::rtps::GUID_t& writer_guid, + const eprosima::fastdds::rtps::GUID_t& reader_guid); void process_dispose_participant_( - eprosima::fastrtps::rtps::CacheChange_t* ch); + eprosima::fastdds::rtps::CacheChange_t* ch); void process_dispose_writer_( - eprosima::fastrtps::rtps::CacheChange_t* ch); + eprosima::fastdds::rtps::CacheChange_t* ch); void process_dispose_reader_( - eprosima::fastrtps::rtps::CacheChange_t* ch); + eprosima::fastdds::rtps::CacheChange_t* ch); //////////// // functions to manage disposals and clean entities // unmatch in every other entity including its readers and writers void unmatch_participant_( - const eprosima::fastrtps::rtps::GuidPrefix_t& guid_prefix); + const eprosima::fastdds::rtps::GuidPrefix_t& guid_prefix); // unmatch all the readers and erase it from writers_by_topic void unmatch_writer_( - const eprosima::fastrtps::rtps::GUID_t& guid); + const eprosima::fastdds::rtps::GUID_t& guid); // unmatch all the writers and erase it from readers_by_topic void unmatch_reader_( - const eprosima::fastrtps::rtps::GUID_t& guid); + const eprosima::fastdds::rtps::GUID_t& guid); // delete an entity and set its change to release. Assumes the entity has been unmatched before bool delete_participant_entity_( - const fastrtps::rtps::GuidPrefix_t& guid_prefix); + const fastdds::rtps::GuidPrefix_t& guid_prefix); - std::map::iterator delete_participant_entity_( - std::map::iterator it); + std::map::iterator delete_participant_entity_( + std::map::iterator it); // delete an entity and set its change to release. Assumes the entity has been unmatched before bool delete_writer_entity_( - const fastrtps::rtps::GUID_t& guid); + const fastdds::rtps::GUID_t& guid); - std::map::iterator delete_writer_entity_( - std::map::iterator it); + std::map::iterator delete_writer_entity_( + std::map::iterator it); // delete an entity and set its change to release. Assumes the entity has been unmatched before bool delete_reader_entity_( - const fastrtps::rtps::GUID_t& guid); + const fastdds::rtps::GUID_t& guid); - std::map::iterator delete_reader_entity_( - std::map::iterator it); + std::map::iterator delete_reader_entity_( + std::map::iterator it); // return if there are more than one writer in the participant in the same topic bool repeated_writer_topic_( - const eprosima::fastrtps::rtps::GuidPrefix_t& participant, + const eprosima::fastdds::rtps::GuidPrefix_t& participant, const std::string& topic_name); // return if there are more than one reader in the participant in the same topic bool repeated_reader_topic_( - const eprosima::fastrtps::rtps::GuidPrefix_t& participant, + const eprosima::fastdds::rtps::GuidPrefix_t& participant, const std::string& topic_name); void remove_writer_from_topic_( - const eprosima::fastrtps::rtps::GUID_t& writer_guid, + const eprosima::fastdds::rtps::GUID_t& writer_guid, const std::string& topic_name); void remove_reader_from_topic_( - const eprosima::fastrtps::rtps::GUID_t& reader_guid, + const eprosima::fastdds::rtps::GUID_t& reader_guid, const std::string& topic_name); // create a new topic in writers and readers and fill it with virtuals @@ -485,11 +485,11 @@ class DiscoveryDataBase const std::string& topic_name); void add_writer_to_topic_( - const eprosima::fastrtps::rtps::GUID_t& writer_guid, + const eprosima::fastdds::rtps::GUID_t& writer_guid, const std::string& topic_name); void add_reader_to_topic_( - const eprosima::fastrtps::rtps::GUID_t& reader_guid, + const eprosima::fastdds::rtps::GUID_t& reader_guid, const std::string& topic_name); //! Add a topic to the list of dirty topics, unless it's already present @@ -499,22 +499,22 @@ class DiscoveryDataBase // Add data in pdp_to_send if not already in it bool add_pdp_to_send_( - eprosima::fastrtps::rtps::CacheChange_t* change); + eprosima::fastdds::rtps::CacheChange_t* change); // Add data in edp_to_send if not already in it bool add_edp_publications_to_send_( - eprosima::fastrtps::rtps::CacheChange_t* change); + eprosima::fastdds::rtps::CacheChange_t* change); // Add data in edp_to_send if not already in it bool add_edp_subscriptions_to_send_( - eprosima::fastrtps::rtps::CacheChange_t* change); + eprosima::fastdds::rtps::CacheChange_t* change); // Get all the writers in given topic and in virtual topic - std::vector get_writers_in_topic( + std::vector get_writers_in_topic( const std::string& topic_name); // Get all the readers in given topic and in virtual topic - std::vector get_readers_in_topic( + std::vector get_readers_in_topic( const std::string& topic_name); //////////////// @@ -525,35 +525,35 @@ class DiscoveryDataBase DBQueue edp_data_queue_; //! Covenient per-topic mapping of readers and writers to speed-up queries - std::map> readers_by_topic_; - std::map> writers_by_topic_; + std::map> readers_by_topic_; + std::map> writers_by_topic_; //! Collection of participant proxies that: // - stores the CacheChange_t // - keeps track of its acknowledgement status // - keeps an account of participant's readers and writers - std::map participants_; + std::map participants_; //! Collection of reader and writer proxies that: // - stores the CacheChange_t // - keeps track of its acknowledgement status // - stores the topic name (only matching criteria available) - std::map readers_; - std::map writers_; + std::map readers_; + std::map writers_; //! Collection of topics whose related endpoints have changed and require a match recalculation std::vector dirty_topics_; //! Collection of changes to take out of the server builtin writers - std::vector disposals_; + std::vector disposals_; //! Collection of changes to put into the server builtin writers - std::vector pdp_to_send_; - std::vector edp_publications_to_send_; - std::vector edp_subscriptions_to_send_; + std::vector pdp_to_send_; + std::vector edp_publications_to_send_; + std::vector edp_subscriptions_to_send_; //! changes that are no longer associated to living endpoints and should be returned to it's pool - std::vector changes_to_release_; + std::vector changes_to_release_; //! General mutex mutable std::recursive_mutex mutex_; @@ -562,13 +562,13 @@ class DiscoveryDataBase mutable std::recursive_mutex data_queues_mutex_; //! GUID prefix from own server - const fastrtps::rtps::GuidPrefix_t server_guid_prefix_; + const fastdds::rtps::GuidPrefix_t server_guid_prefix_; //! Is own server DATA(p) acked by all other clients std::atomic server_acked_by_all_; //! List of GUID prefixes of the remote servers - std::set servers_; + std::set servers_; // The virtual topic associated with virtual writers and readers const std::string virtual_topic_ = "eprosima_server_virtual_topic"; diff --git a/src/cpp/rtps/builtin/discovery/database/DiscoveryDataFilter.hpp b/src/cpp/rtps/builtin/discovery/database/DiscoveryDataFilter.hpp index 18862be7efd..3474d057847 100644 --- a/src/cpp/rtps/builtin/discovery/database/DiscoveryDataFilter.hpp +++ b/src/cpp/rtps/builtin/discovery/database/DiscoveryDataFilter.hpp @@ -39,8 +39,8 @@ class PDPDataFilter public: bool is_relevant( - const fastrtps::rtps::CacheChange_t& change, - const fastrtps::rtps::GUID_t& reader_guid) const override + const fastdds::rtps::CacheChange_t& change, + const fastdds::rtps::GUID_t& reader_guid) const override { return static_cast(this)->pdp_is_relevant(change, reader_guid); } @@ -61,8 +61,8 @@ class EDPDataFilter public: bool is_relevant( - const fastrtps::rtps::CacheChange_t& change, - const fastrtps::rtps::GUID_t& reader_guid) const override + const fastdds::rtps::CacheChange_t& change, + const fastdds::rtps::GUID_t& reader_guid) const override { return static_cast(this)->edp_publications_is_relevant(change, reader_guid); } @@ -80,8 +80,8 @@ class EDPDataFilter public: bool is_relevant( - const fastrtps::rtps::CacheChange_t& change, - const fastrtps::rtps::GUID_t& reader_guid) const override + const fastdds::rtps::CacheChange_t& change, + const fastdds::rtps::GUID_t& reader_guid) const override { return static_cast(this)->edp_subscriptions_is_relevant(change, reader_guid); } diff --git a/src/cpp/rtps/builtin/discovery/database/DiscoveryDataQueueInfo.hpp b/src/cpp/rtps/builtin/discovery/database/DiscoveryDataQueueInfo.hpp index 6284fc3399d..98792ab66c4 100644 --- a/src/cpp/rtps/builtin/discovery/database/DiscoveryDataQueueInfo.hpp +++ b/src/cpp/rtps/builtin/discovery/database/DiscoveryDataQueueInfo.hpp @@ -33,7 +33,7 @@ class DiscoveryDataQueueInfo public: DiscoveryDataQueueInfo( - eprosima::fastrtps::rtps::CacheChange_t* change) + CacheChange_t* change) : change_(change) { } @@ -42,14 +42,14 @@ class DiscoveryDataQueueInfo { } - eprosima::fastrtps::rtps::CacheChange_t* change() + CacheChange_t* change() { return change_; } protected: - eprosima::fastrtps::rtps::CacheChange_t* change_; + CacheChange_t* change_; }; @@ -58,7 +58,7 @@ class DiscoveryPDPDataQueueInfo : public DiscoveryDataQueueInfo public: DiscoveryPDPDataQueueInfo( - eprosima::fastrtps::rtps::CacheChange_t* change, + CacheChange_t* change, const DiscoveryParticipantChangeData& participant_change_data) : DiscoveryDataQueueInfo(change) , participant_change_data_(participant_change_data) @@ -85,7 +85,7 @@ class DiscoveryEDPDataQueueInfo : public DiscoveryDataQueueInfo public: DiscoveryEDPDataQueueInfo( - eprosima::fastrtps::rtps::CacheChange_t* change, + CacheChange_t* change, const eprosima::fastcdr::string_255& topic) : DiscoveryDataQueueInfo(change) , topic_(topic) diff --git a/src/cpp/rtps/builtin/discovery/database/DiscoveryEndpointInfo.hpp b/src/cpp/rtps/builtin/discovery/database/DiscoveryEndpointInfo.hpp index 87b31ab3322..f26277f16c1 100644 --- a/src/cpp/rtps/builtin/discovery/database/DiscoveryEndpointInfo.hpp +++ b/src/cpp/rtps/builtin/discovery/database/DiscoveryEndpointInfo.hpp @@ -44,10 +44,10 @@ class DiscoveryEndpointInfo : public DiscoverySharedInfo public: DiscoveryEndpointInfo( - eprosima::fastrtps::rtps::CacheChange_t* change, + CacheChange_t* change, std::string topic, bool is_virtual, - const eprosima::fastrtps::rtps::GuidPrefix_t& known_participant) + const GuidPrefix_t& known_participant) : DiscoverySharedInfo(change, known_participant) , topic_(topic) , is_virtual_(is_virtual) diff --git a/src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantChangeData.hpp b/src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantChangeData.hpp index acbd6dad848..98face1c986 100644 --- a/src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantChangeData.hpp +++ b/src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantChangeData.hpp @@ -41,12 +41,12 @@ class DiscoveryParticipantChangeData public: DiscoveryParticipantChangeData() - : metatraffic_locators_(fastrtps::rtps::RemoteLocatorList(0, 0)) + : metatraffic_locators_(RemoteLocatorList(0, 0)) { } DiscoveryParticipantChangeData( - fastrtps::rtps::RemoteLocatorList metatraffic_locators, + RemoteLocatorList metatraffic_locators, bool is_client, bool is_local) : metatraffic_locators_(metatraffic_locators) @@ -65,7 +65,7 @@ class DiscoveryParticipantChangeData return is_local_; } - fastrtps::rtps::RemoteLocatorList metatraffic_locators() const + RemoteLocatorList metatraffic_locators() const { return metatraffic_locators_; } @@ -81,7 +81,7 @@ class DiscoveryParticipantChangeData private: // The metatraffic locators of from the serialized payload - fastrtps::rtps::RemoteLocatorList metatraffic_locators_; + RemoteLocatorList metatraffic_locators_; // Whether this participant is a CLIENT or a SERVER/BACKUP/SUPER_CLIENT // This variable affects the discovery filter to applied to each entity: // false => send all data ; true => send only data that is required to match endpoints diff --git a/src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantInfo.cpp b/src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantInfo.cpp index f0ba43fedec..42dadce3cbc 100644 --- a/src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantInfo.cpp +++ b/src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantInfo.cpp @@ -31,16 +31,16 @@ namespace fastdds { namespace rtps { namespace ddb { -eprosima::fastrtps::rtps::CacheChange_t* DiscoveryParticipantInfo::update( - eprosima::fastrtps::rtps::CacheChange_t* change, +CacheChange_t* DiscoveryParticipantInfo::update( + CacheChange_t* change, DiscoveryParticipantChangeData participant_change_data) { participant_change_data_ = participant_change_data; return update(change); } -eprosima::fastrtps::rtps::CacheChange_t* DiscoveryParticipantInfo::update_and_unmatch( - eprosima::fastrtps::rtps::CacheChange_t* change, +CacheChange_t* DiscoveryParticipantInfo::update_and_unmatch( + CacheChange_t* change, DiscoveryParticipantChangeData participant_change_data) { participant_change_data_ = participant_change_data; @@ -48,7 +48,7 @@ eprosima::fastrtps::rtps::CacheChange_t* DiscoveryParticipantInfo::update_and_un } void DiscoveryParticipantInfo::add_reader( - const eprosima::fastrtps::rtps::GUID_t& guid) + const GUID_t& guid) { if (std::find(readers_.begin(), readers_.end(), guid) == readers_.end()) { @@ -57,7 +57,7 @@ void DiscoveryParticipantInfo::add_reader( } void DiscoveryParticipantInfo::remove_reader( - const eprosima::fastrtps::rtps::GUID_t& guid) + const GUID_t& guid) { // erase it from the back to accelerate participant removal auto rit = std::find(readers_.rbegin(), readers_.rend(), guid); @@ -69,7 +69,7 @@ void DiscoveryParticipantInfo::remove_reader( } void DiscoveryParticipantInfo::add_writer( - const eprosima::fastrtps::rtps::GUID_t& guid) + const GUID_t& guid) { if (std::find(writers_.begin(), writers_.end(), guid) == writers_.end()) { @@ -78,7 +78,7 @@ void DiscoveryParticipantInfo::add_writer( } void DiscoveryParticipantInfo::remove_writer( - const eprosima::fastrtps::rtps::GUID_t& guid) + const GUID_t& guid) { // erase it from the back to accelerate participant removal auto rit = std::find(writers_.rbegin(), writers_.rend(), guid); diff --git a/src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantInfo.hpp b/src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantInfo.hpp index 4b9fecfb0b9..c07d9349fa1 100644 --- a/src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantInfo.hpp +++ b/src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantInfo.hpp @@ -45,8 +45,8 @@ class DiscoveryParticipantInfo : public DiscoverySharedInfo public: DiscoveryParticipantInfo( - eprosima::fastrtps::rtps::CacheChange_t* change, - const eprosima::fastrtps::rtps::GuidPrefix_t& known_participant, + CacheChange_t* change, + const GuidPrefix_t& known_participant, DiscoveryParticipantChangeData participant_change_data) : DiscoverySharedInfo(change, known_participant) , participant_change_data_(participant_change_data) @@ -57,38 +57,38 @@ class DiscoveryParticipantInfo : public DiscoverySharedInfo { } - eprosima::fastrtps::rtps::CacheChange_t* update( - eprosima::fastrtps::rtps::CacheChange_t* change, + CacheChange_t* update( + CacheChange_t* change, DiscoveryParticipantChangeData participant_change_data); - eprosima::fastrtps::rtps::CacheChange_t* update( - eprosima::fastrtps::rtps::CacheChange_t* change) + CacheChange_t* update( + CacheChange_t* change) { return DiscoverySharedInfo::update(change); } - eprosima::fastrtps::rtps::CacheChange_t* update_and_unmatch( - eprosima::fastrtps::rtps::CacheChange_t* change, + CacheChange_t* update_and_unmatch( + CacheChange_t* change, DiscoveryParticipantChangeData participant_change_data); - eprosima::fastrtps::rtps::CacheChange_t* update_and_unmatch( - eprosima::fastrtps::rtps::CacheChange_t* change) + CacheChange_t* update_and_unmatch( + CacheChange_t* change) { return DiscoverySharedInfo::update_and_unmatch(change); } // populate functions void add_reader( - const eprosima::fastrtps::rtps::GUID_t& guid); + const GUID_t& guid); void remove_reader( - const eprosima::fastrtps::rtps::GUID_t& guid); + const GUID_t& guid); void add_writer( - const eprosima::fastrtps::rtps::GUID_t& guid); + const GUID_t& guid); void remove_writer( - const eprosima::fastrtps::rtps::GUID_t& guid); + const GUID_t& guid); bool is_client() const { @@ -111,17 +111,17 @@ class DiscoveryParticipantInfo : public DiscoverySharedInfo return (!is_local()); } - fastrtps::rtps::RemoteLocatorList metatraffic_locators() + fastdds::rtps::RemoteLocatorList metatraffic_locators() { return participant_change_data_.metatraffic_locators(); } - std::vector readers() + std::vector readers() { return readers_; } - std::vector writers() + std::vector writers() { return writers_; } @@ -131,9 +131,9 @@ class DiscoveryParticipantInfo : public DiscoverySharedInfo private: - std::vector readers_; + std::vector readers_; - std::vector writers_; + std::vector writers_; DiscoveryParticipantChangeData participant_change_data_; diff --git a/src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantsAckStatus.cpp b/src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantsAckStatus.cpp index 6232854ed7b..522862bbd97 100644 --- a/src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantsAckStatus.cpp +++ b/src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantsAckStatus.cpp @@ -33,20 +33,20 @@ namespace rtps { namespace ddb { void DiscoveryParticipantsAckStatus::add_or_update_participant( - const eprosima::fastrtps::rtps::GuidPrefix_t& guid_p, + const GuidPrefix_t& guid_p, bool status = false) { relevant_participants_map_[guid_p] = status; } void DiscoveryParticipantsAckStatus::remove_participant( - const eprosima::fastrtps::rtps::GuidPrefix_t& guid_p) + const GuidPrefix_t& guid_p) { relevant_participants_map_.erase(guid_p); } bool DiscoveryParticipantsAckStatus::is_matched( - const eprosima::fastrtps::rtps::GuidPrefix_t& guid_p) const + const GuidPrefix_t& guid_p) const { auto it = relevant_participants_map_.find(guid_p); if (it != relevant_participants_map_.end()) @@ -65,7 +65,7 @@ void DiscoveryParticipantsAckStatus::unmatch_all() } bool DiscoveryParticipantsAckStatus::is_relevant_participant( - const eprosima::fastrtps::rtps::GuidPrefix_t& guid_p) const + const GuidPrefix_t& guid_p) const { auto it = relevant_participants_map_.find(guid_p); if (it == relevant_participants_map_.end()) @@ -75,9 +75,9 @@ bool DiscoveryParticipantsAckStatus::is_relevant_participant( return true; } -std::vector DiscoveryParticipantsAckStatus::relevant_participants() const +std::vector DiscoveryParticipantsAckStatus::relevant_participants() const { - std::vector res; + std::vector res; for (auto it = relevant_participants_map_.begin(); it != relevant_participants_map_.end(); ++it) { res.push_back(it->first); diff --git a/src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantsAckStatus.hpp b/src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantsAckStatus.hpp index 9eeb99ac0d3..4def2132454 100644 --- a/src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantsAckStatus.hpp +++ b/src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantsAckStatus.hpp @@ -46,30 +46,30 @@ class DiscoveryParticipantsAckStatus ~DiscoveryParticipantsAckStatus() = default; void add_or_update_participant( - const eprosima::fastrtps::rtps::GuidPrefix_t& guid_p, + const GuidPrefix_t& guid_p, bool status); void remove_participant( - const eprosima::fastrtps::rtps::GuidPrefix_t& guid_p); + const GuidPrefix_t& guid_p); void unmatch_all(); bool is_matched( - const eprosima::fastrtps::rtps::GuidPrefix_t& guid_p) const; + const GuidPrefix_t& guid_p) const; bool is_relevant_participant( - const eprosima::fastrtps::rtps::GuidPrefix_t& guid_p) const; + const GuidPrefix_t& guid_p) const; bool is_acked_by_all() const; - std::vector relevant_participants() const; + std::vector relevant_participants() const; void to_json( nlohmann::json& j) const; private: - std::map relevant_participants_map_; + std::map relevant_participants_map_; }; } /* namespace ddb */ diff --git a/src/cpp/rtps/builtin/discovery/database/DiscoverySharedInfo.cpp b/src/cpp/rtps/builtin/discovery/database/DiscoverySharedInfo.cpp index 805241a9468..7f249618e2b 100644 --- a/src/cpp/rtps/builtin/discovery/database/DiscoverySharedInfo.cpp +++ b/src/cpp/rtps/builtin/discovery/database/DiscoverySharedInfo.cpp @@ -31,25 +31,25 @@ namespace rtps { namespace ddb { DiscoverySharedInfo::DiscoverySharedInfo( - eprosima::fastrtps::rtps::CacheChange_t* change, - const eprosima::fastrtps::rtps::GuidPrefix_t& known_participant) + CacheChange_t* change, + const GuidPrefix_t& known_participant) : change_(change) { // the server already knows every message add_or_update_ack_participant(known_participant, true); } -eprosima::fastrtps::rtps::CacheChange_t* DiscoverySharedInfo::update_and_unmatch( - eprosima::fastrtps::rtps::CacheChange_t* change) +CacheChange_t* DiscoverySharedInfo::update_and_unmatch( + CacheChange_t* change) { relevant_participants_builtin_ack_status_.unmatch_all(); return update(change); } -eprosima::fastrtps::rtps::CacheChange_t* DiscoverySharedInfo::update( - eprosima::fastrtps::rtps::CacheChange_t* change) +CacheChange_t* DiscoverySharedInfo::update( + CacheChange_t* change) { - eprosima::fastrtps::rtps::CacheChange_t* old_change = change_; + CacheChange_t* old_change = change_; change_ = change; return old_change; } diff --git a/src/cpp/rtps/builtin/discovery/database/DiscoverySharedInfo.hpp b/src/cpp/rtps/builtin/discovery/database/DiscoverySharedInfo.hpp index 530a814333c..a0455a5c868 100644 --- a/src/cpp/rtps/builtin/discovery/database/DiscoverySharedInfo.hpp +++ b/src/cpp/rtps/builtin/discovery/database/DiscoverySharedInfo.hpp @@ -43,53 +43,53 @@ class DiscoverySharedInfo public: DiscoverySharedInfo( - eprosima::fastrtps::rtps::CacheChange_t* change, - const eprosima::fastrtps::rtps::GuidPrefix_t& known_participant); + CacheChange_t* change, + const GuidPrefix_t& known_participant); ~DiscoverySharedInfo() = default; - virtual eprosima::fastrtps::rtps::CacheChange_t* update_and_unmatch( - eprosima::fastrtps::rtps::CacheChange_t* change); + virtual CacheChange_t* update_and_unmatch( + CacheChange_t* change); - virtual eprosima::fastrtps::rtps::CacheChange_t* update( - eprosima::fastrtps::rtps::CacheChange_t* change); + virtual CacheChange_t* update( + CacheChange_t* change); void add_or_update_ack_participant( - const eprosima::fastrtps::rtps::GuidPrefix_t& guid_p, + const GuidPrefix_t& guid_p, bool status = false) { EPROSIMA_LOG_INFO( DISCOVERY_DATABASE, "Adding relevant participant " << guid_p << " with status " << status - << " to " << fastrtps::rtps::iHandle2GUID(change_->instanceHandle)); + << " to " << fastdds::rtps::iHandle2GUID(change_->instanceHandle)); relevant_participants_builtin_ack_status_.add_or_update_participant(guid_p, status); } void remove_participant( - const eprosima::fastrtps::rtps::GuidPrefix_t& guid_p) + const GuidPrefix_t& guid_p) { relevant_participants_builtin_ack_status_.remove_participant(guid_p); } bool is_matched( - const eprosima::fastrtps::rtps::GuidPrefix_t& guid_p) const + const GuidPrefix_t& guid_p) const { return relevant_participants_builtin_ack_status_.is_matched(guid_p); } bool is_relevant_participant( - const eprosima::fastrtps::rtps::GuidPrefix_t& guid_p) const + const GuidPrefix_t& guid_p) const { return relevant_participants_builtin_ack_status_.is_relevant_participant(guid_p); } - eprosima::fastrtps::rtps::CacheChange_t* change() const + CacheChange_t* change() const { return change_; } - std::vector relevant_participants() const + std::vector relevant_participants() const { return relevant_participants_builtin_ack_status_.relevant_participants(); } @@ -104,10 +104,10 @@ class DiscoverySharedInfo protected: - eprosima::fastrtps::rtps::CacheChange_t* change_; + CacheChange_t* change_; // new class is used in order to could change it in the future for a more efficient implementation - eprosima::fastdds::rtps::ddb::DiscoveryParticipantsAckStatus + ddb::DiscoveryParticipantsAckStatus relevant_participants_builtin_ack_status_; }; diff --git a/src/cpp/rtps/builtin/discovery/database/backup/SharedBackupFunctions.cpp b/src/cpp/rtps/builtin/discovery/database/backup/SharedBackupFunctions.cpp index 02673c03936..e961e3dde66 100644 --- a/src/cpp/rtps/builtin/discovery/database/backup/SharedBackupFunctions.cpp +++ b/src/cpp/rtps/builtin/discovery/database/backup/SharedBackupFunctions.cpp @@ -31,7 +31,7 @@ using json = nlohmann::json; void to_json( json& j, - const eprosima::fastrtps::rtps::CacheChange_t& change) + const CacheChange_t& change) { j["kind"] = change.kind; j["writer_GUID"] = object_to_string(change.writerGUID); @@ -51,24 +51,24 @@ void to_json( void from_json( const json& j, - eprosima::fastrtps::rtps::CacheChange_t& change) + CacheChange_t& change) { - change.kind = static_cast(j["kind"].get()); + change.kind = static_cast(j["kind"].get()); std::istringstream(j["writer_GUID"].get()) >> change.writerGUID; std::istringstream(j["instance_handle"].get()) >> change.instanceHandle; std::istringstream(j["sequence_number"].get()) >> change.sequenceNumber; - change.isRead = static_cast(j["isRead"].get()); + change.isRead = static_cast(j["isRead"].get()); std::istringstream(j["source_timestamp"].get()) >> change.sourceTimestamp; std::istringstream(j["reception_timestamp"].get()) >> change.reader_info.receptionTimestamp; // set sample identity - fastrtps::rtps::SampleIdentity si; + fastdds::rtps::SampleIdentity si; std::istringstream(j["sample_identity"].get()) >> si; change.write_params.sample_identity(si); change.write_params.related_sample_identity(si); // set related sample identity - fastrtps::rtps::SampleIdentity rsi; + fastdds::rtps::SampleIdentity rsi; std::istringstream(j["related_sample_identity"].get()) >> rsi; change.write_params.sample_identity(rsi); change.write_params.related_sample_identity(rsi); diff --git a/src/cpp/rtps/builtin/discovery/database/backup/SharedBackupFunctions.hpp b/src/cpp/rtps/builtin/discovery/database/backup/SharedBackupFunctions.hpp index c2335eba872..ab446f539cd 100644 --- a/src/cpp/rtps/builtin/discovery/database/backup/SharedBackupFunctions.hpp +++ b/src/cpp/rtps/builtin/discovery/database/backup/SharedBackupFunctions.hpp @@ -52,13 +52,13 @@ void b64decode( // Writes the info from a change into a json object void to_json( json& j, - const eprosima::fastrtps::rtps::CacheChange_t& change); + const CacheChange_t& change); // Deserialize a cacheChange from a json object. The change must have been // already created from a pool and reserved the payload length void from_json( const json& j, - eprosima::fastrtps::rtps::CacheChange_t& change); + CacheChange_t& change); // INFO TO STORE IN DDB /* diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp index dc0f9fab2ee..d0043de4023 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp @@ -50,15 +50,12 @@ #include #endif //FASTDDS_STATISTICS -using namespace eprosima::fastdds::rtps; -using namespace eprosima::fastrtps; using eprosima::fastdds::dds::PublicationMatchedStatus; using eprosima::fastdds::dds::SubscriptionMatchedStatus; using ParameterList = eprosima::fastdds::dds::ParameterList; -using BaseReader = eprosima::fastdds::rtps::BaseReader; namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { using reader_map_helper = utilities::collections::map_size_helper; @@ -1367,6 +1364,5 @@ const fastdds::dds::PublicationMatchedStatus& EDP::update_publication_matched_st } } // namespace rtps - -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDP.h b/src/cpp/rtps/builtin/discovery/endpoint/EDP.h index ffdfa06d871..ebcd7be315b 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDP.h +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDP.h @@ -46,9 +46,6 @@ class TypeIdentifier; } // namespace xtypes } // namespace dds -} // namespace fastdds - -namespace fastrtps { class TopicAttributes; @@ -405,7 +402,7 @@ class EDP }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPClient.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPClient.cpp index 8d07ace5157..f0e52d3089b 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPClient.cpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPClient.cpp @@ -38,8 +38,6 @@ namespace eprosima { namespace fastdds { namespace rtps { -using namespace fastrtps::rtps; - bool EDPClient::processLocalReaderProxyData( RTPSReader* local_reader, ReaderProxyData* rdata) @@ -133,7 +131,7 @@ bool EDPClient::removeLocalWriter( if (change != nullptr) { { - std::lock_guard guard(*writer->second->getMutex()); + std::lock_guard guard(*writer->second->getMutex()); for (auto ch = writer->second->changesBegin(); ch != writer->second->changesEnd(); ++ch) { if ((*ch)->instanceHandle == change->instanceHandle) @@ -186,7 +184,7 @@ bool EDPClient::removeLocalReader( if (change != nullptr) { { - std::lock_guard guard(*writer->second->getMutex()); + std::lock_guard guard(*writer->second->getMutex()); for (auto ch = writer->second->changesBegin(); ch != writer->second->changesEnd(); ++ch) { if ((*ch)->instanceHandle == change->instanceHandle) diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPClient.h b/src/cpp/rtps/builtin/discovery/endpoint/EDPClient.h index 044069e197b..e0c92ea8cf1 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPClient.h +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPClient.h @@ -27,8 +27,6 @@ namespace eprosima { namespace fastdds { namespace rtps { -using namespace fastrtps::rtps; - /** * Class EDPClient, extends the EDPSimple functionality to accommodate client side needs *@ingroup DISCOVERY_MODULE diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.cpp index f29bd810395..ee738274d2c 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.cpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.cpp @@ -27,7 +27,7 @@ #include #include -using namespace ::eprosima::fastrtps::rtps; +using namespace ::eprosima::fastdds::rtps; namespace eprosima { namespace fastdds { @@ -434,13 +434,13 @@ bool EDPServer::processLocalReaderProxyData( } bool EDPServer::process_disposal( - fastrtps::rtps::CacheChange_t* disposal_change, + fastdds::rtps::CacheChange_t* disposal_change, fastdds::rtps::ddb::DiscoveryDataBase& discovery_db, - fastrtps::rtps::GuidPrefix_t& change_guid_prefix, + fastdds::rtps::GuidPrefix_t& change_guid_prefix, bool should_publish_disposal) { bool ret_val = false; - eprosima::fastrtps::rtps::WriteParams wp = disposal_change->write_params; + eprosima::fastdds::rtps::WriteParams wp = disposal_change->write_params; // DATA(Uw) or DATA(Ur) cases if (discovery_db.is_writer(disposal_change) || discovery_db.is_reader(disposal_change)) @@ -454,7 +454,7 @@ bool EDPServer::process_disposal( if (nullptr != builtin_pair.first && nullptr != builtin_pair.second) { // Lock EDP writer - std::unique_lock lock(builtin_pair.first->getMutex()); + std::unique_lock lock(builtin_pair.first->getMutex()); // Remove all DATA(w/r) with the same sample identity as the DATA(Uw/Ur) from EDP PUBs/Subs writer's history discovery_db.remove_related_alive_from_history_nts(builtin_pair.second, change_guid_prefix); @@ -473,7 +473,7 @@ bool EDPServer::process_disposal( } bool EDPServer::process_and_release_change( - fastrtps::rtps::CacheChange_t* change, + fastdds::rtps::CacheChange_t* change, bool release_from_reader) { bool ret_val = false; diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.hpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.hpp index fd90f073a98..780874b730b 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.hpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.hpp @@ -41,7 +41,7 @@ class EDPServerSUBListener; * Inherits from EDPSimple class. *@ingroup DISCOVERY_MODULE */ -class EDPServer : public fastrtps::rtps::EDPSimple +class EDPServer : public EDPSimple { friend class EDPServerPUBListener; friend class EDPServerSUBListener; @@ -54,9 +54,9 @@ class EDPServer : public fastrtps::rtps::EDPSimple * @param part Pointer to the RTPSParticipantImpl */ EDPServer( - fastrtps::rtps::PDP* p, - fastrtps::rtps::RTPSParticipantImpl* part, - fastrtps::rtps::DurabilityKind_t durability_kind) + PDP* p, + RTPSParticipantImpl* part, + DurabilityKind_t durability_kind) : EDPSimple(p, part) , durability_(durability_kind) { @@ -79,8 +79,8 @@ class EDPServer : public fastrtps::rtps::EDPSimple * @return true if correct. */ bool processLocalReaderProxyData( - fastrtps::rtps::RTPSReader* reader, - fastrtps::rtps::ReaderProxyData* rdata) override; + RTPSReader* reader, + ReaderProxyData* rdata) override; /** * This method generates the corresponding change in the publciations writer and send it to all known remote endpoints. * @param writer Pointer to the Writer object. @@ -88,22 +88,22 @@ class EDPServer : public fastrtps::rtps::EDPSimple * @return true if correct. */ bool processLocalWriterProxyData( - fastrtps::rtps::RTPSWriter* writer, - fastrtps::rtps::WriterProxyData* wdata) override; + RTPSWriter* writer, + WriterProxyData* wdata) override; /** * This methods generates the change disposing of the local Reader and calls the unpairing and removal methods of the base class. * @param R Pointer to the RTPSReader object. * @return True if correct. */ bool removeLocalReader( - fastrtps::rtps::RTPSReader* R) override; + RTPSReader* R) override; /** * This methods generates the change disposing of the local Writer and calls the unpairing and removal methods of the base class. * @param W Pointer to the RTPSWriter object. * @return True if correct. */ bool removeLocalWriter( - fastrtps::rtps::RTPSWriter* W) override; + RTPSWriter* W) override; /** * This method removes all changes from the correct data writer history with the same identity as the one in the disposal_change @@ -114,9 +114,9 @@ class EDPServer : public fastrtps::rtps::EDPSimple * @return True if successful. */ bool process_disposal( - fastrtps::rtps::CacheChange_t* disposal_change, - fastdds::rtps::ddb::DiscoveryDataBase& discovery_db, - fastrtps::rtps::GuidPrefix_t& change_guid_prefix, + CacheChange_t* disposal_change, + ddb::DiscoveryDataBase& discovery_db, + GuidPrefix_t& change_guid_prefix, bool should_publish_disposal); /** @@ -127,7 +127,7 @@ class EDPServer : public fastrtps::rtps::EDPSimple * @return True if successful. */ bool process_and_release_change( - fastrtps::rtps::CacheChange_t* change, + CacheChange_t* change, bool release_from_reader); private: @@ -139,7 +139,7 @@ class EDPServer : public fastrtps::rtps::EDPSimple virtual bool createSEDPEndpoints() override; //! TRANSIENT or TRANSIENT_LOCAL durability; - fastrtps::rtps::DurabilityKind_t durability_; + DurabilityKind_t durability_; }; diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPServerListeners.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPServerListeners.cpp index a944daaca5b..954d59a0259 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPServerListeners.cpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPServerListeners.cpp @@ -32,8 +32,6 @@ namespace eprosima { namespace fastdds { namespace rtps { -using namespace eprosima::fastrtps::rtps; - PDPServer* EDPServerPUBListener::get_pdp() { return sedp_->get_pdp(); diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPServerListeners.hpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPServerListeners.hpp index dfc1add7095..a0b4ad8565f 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPServerListeners.hpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPServerListeners.hpp @@ -24,20 +24,11 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSReader; struct CacheChange_t; - -} // namespace rtps -} // namespace fastdds -} // namespace eprosima - -namespace eprosima { -namespace fastdds { -namespace rtps { - class BaseReader; class PDPServer; class EDPServer; @@ -46,7 +37,7 @@ class EDPServer; * Class EDPServerPUBListener, used to define the behavior when a new WriterProxyData is received. * @ingroup DISCOVERY_MODULE */ -class EDPServerPUBListener : public fastrtps::rtps::EDPBasePUBListener +class EDPServerPUBListener : public fastdds::rtps::EDPBasePUBListener { public: @@ -70,22 +61,22 @@ class EDPServerPUBListener : public fastrtps::rtps::EDPBasePUBListener * @param change */ void on_new_cache_change_added( - fastrtps::rtps::RTPSReader* reader, - const fastrtps::rtps::CacheChange_t* const change) override; + fastdds::rtps::RTPSReader* reader, + const fastdds::rtps::CacheChange_t* const change) override; private: std::string get_writer_proxy_topic_name( - fastrtps::rtps::GUID_t auxGUID); + fastdds::rtps::GUID_t auxGUID); void notify_discoverydatabase( std::string topic_name, BaseReader* reader, - fastrtps::rtps::CacheChange_t* change); + fastdds::rtps::CacheChange_t* change); void continue_with_writer( BaseReader* reader, - fastrtps::rtps::CacheChange_t* change); + fastdds::rtps::CacheChange_t* change); //!Pointer to the EDPServer EDPServer* sedp_; @@ -95,7 +86,7 @@ class EDPServerPUBListener : public fastrtps::rtps::EDPBasePUBListener * Class EDPServerSUBListener, used to define the behavior when a new ReaderProxyData is received. * @ingroup DISCOVERY_MODULE */ -class EDPServerSUBListener : public fastrtps::rtps::EDPBaseSUBListener +class EDPServerSUBListener : public fastdds::rtps::EDPBaseSUBListener { public: @@ -116,22 +107,22 @@ class EDPServerSUBListener : public fastrtps::rtps::EDPBaseSUBListener * @param change */ void on_new_cache_change_added( - fastrtps::rtps::RTPSReader* reader, - const fastrtps::rtps::CacheChange_t* const change) override; + fastdds::rtps::RTPSReader* reader, + const fastdds::rtps::CacheChange_t* const change) override; private: std::string get_reader_proxy_topic_name( - fastrtps::rtps::GUID_t auxGUID); + fastdds::rtps::GUID_t auxGUID); void notify_discoverydatabase( std::string topic_name, BaseReader* reader, - fastrtps::rtps::CacheChange_t* change); + fastdds::rtps::CacheChange_t* change); void continue_with_reader( BaseReader* reader, - fastrtps::rtps::CacheChange_t* change); + fastdds::rtps::CacheChange_t* change); //!Pointer to the EDPServer EDPServer* sedp_; diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp index e1ee51b87e2..526a323394a 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp @@ -51,7 +51,7 @@ using ParameterList = eprosima::fastdds::dds::ParameterList; namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { // Default configuration values for EDP entities. @@ -1081,5 +1081,5 @@ bool EDPSimple::pairing_remote_reader_with_local_builtin_writer_after_security( #endif // if HAVE_SECURITY } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.h b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.h index fb9e3b7f819..ae0afef927b 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.h +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.h @@ -27,7 +27,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class StatefulReader; @@ -286,7 +286,7 @@ class EDPSimple : public EDP }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp index 36f29f24b6d..2362a8f4546 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp @@ -58,7 +58,7 @@ using ParameterList = eprosima::fastdds::dds::ParameterList; (void)seq_num namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { void EDPBasePUBListener::add_writer_from_change( @@ -86,7 +86,7 @@ void EDPBasePUBListener::add_writer_from_change( // Callback function to continue after typelookup is complete fastdds::dds::builtin::AsyncGetTypeWriterCallback after_typelookup_callback = [reader, change, edp, &network, writer_added_callback] - (eprosima::fastrtps::rtps::WriterProxyData* temp_writer_data) + (eprosima::fastdds::rtps::WriterProxyData* temp_writer_data) { //LOAD INFORMATION IN DESTINATION WRITER PROXY DATA auto copy_data_fun = [&temp_writer_data, &network]( @@ -226,7 +226,7 @@ void EDPBaseSUBListener::add_reader_from_change( // Callback function to continue after typelookup is complete fastdds::dds::builtin::AsyncGetTypeReaderCallback after_typelookup_callback = [reader, change, edp, &network, reader_added_callback] - (eprosima::fastrtps::rtps::ReaderProxyData* temp_reader_data) + (eprosima::fastdds::rtps::ReaderProxyData* temp_reader_data) { //LOAD INFORMATION IN DESTINATION READER PROXY DATA auto copy_data_fun = [&temp_reader_data, &network]( @@ -376,5 +376,5 @@ void EDPSimpleSUBListener::onWriterChangeReceivedByAll( } } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.h b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.h index c520794f548..dc8725430eb 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.h +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.h @@ -30,7 +30,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { using EndpointAddedCallback = std::function< @@ -200,7 +200,7 @@ class EDPSimpleSUBListener : public EDPBaseSUBListener }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.cpp index 15f2b7bcc3b..c655a8b938e 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.cpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.cpp @@ -36,7 +36,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { const char* exchange_format_property_name = "dds.discovery.static_edp.exchange_format"; @@ -620,5 +620,5 @@ bool EDPStatic::checkEntityId( } } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.h b/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.h index 1be2359d04b..164bf241bf1 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.h +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.h @@ -25,7 +25,7 @@ namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace xmlparser { class XMLEndpointParser; } // namespace xmlparser diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPUtils.hpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPUtils.hpp index bdb9e97095c..a71c583bc74 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPUtils.hpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPUtils.hpp @@ -38,7 +38,7 @@ namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class EDPUtils @@ -139,7 +139,7 @@ class EDPUtils }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif // _RTPS_BUILTIN_DISCOVERY_ENDPOINT_EDPUTILS_HPP_ diff --git a/src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpoints.hpp b/src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpoints.hpp index 5df4e44034b..265d43615bb 100644 --- a/src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpoints.hpp +++ b/src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpoints.hpp @@ -41,52 +41,52 @@ struct DiscoveryServerPDPEndpoints : public PDPEndpoints { ~DiscoveryServerPDPEndpoints() override = default; - fastrtps::rtps::BuiltinEndpointSet_t builtin_endpoints() const override + BuiltinEndpointSet_t builtin_endpoints() const override { return DISC_BUILTIN_ENDPOINT_PARTICIPANT_ANNOUNCER | DISC_BUILTIN_ENDPOINT_PARTICIPANT_DETECTOR; } - const std::unique_ptr& main_listener() const override + const std::unique_ptr& main_listener() const override { return reader.listener_; } bool enable_pdp_readers( - fastrtps::rtps::RTPSParticipantImpl* participant) override + RTPSParticipantImpl* participant) override { return participant->enableReader(reader.reader_); } void disable_pdp_readers( - fastrtps::rtps::RTPSParticipantImpl* participant) override + RTPSParticipantImpl* participant) override { participant->disableReader(reader.reader_); } void delete_pdp_endpoints( - fastrtps::rtps::RTPSParticipantImpl* participant) override + RTPSParticipantImpl* participant) override { participant->deleteUserEndpoint(writer.writer_->getGuid()); participant->deleteUserEndpoint(reader.reader_->getGuid()); } void remove_from_pdp_reader_history( - const fastrtps::rtps::InstanceHandle_t& remote_participant) override + const InstanceHandle_t& remote_participant) override { reader.remove_from_history(remote_participant); } void remove_from_pdp_reader_history( - fastrtps::rtps::CacheChange_t* change) override + CacheChange_t* change) override { reader.history_->remove_change(change); } //! Builtin Simple PDP reader - BuiltinReader reader; + BuiltinReader reader; //! Builtin Simple PDP writer - BuiltinWriter writer; + BuiltinWriter writer; }; } // namespace rtps diff --git a/src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpointsSecure.hpp b/src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpointsSecure.hpp index 5fdc48d0f97..90be0bc0f3c 100644 --- a/src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpointsSecure.hpp +++ b/src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpointsSecure.hpp @@ -38,45 +38,45 @@ struct DiscoveryServerPDPEndpointsSecure : public DiscoveryServerPDPEndpoints { ~DiscoveryServerPDPEndpointsSecure() override = default; - fastrtps::rtps::BuiltinEndpointSet_t builtin_endpoints() const override + BuiltinEndpointSet_t builtin_endpoints() const override { return DiscoveryServerPDPEndpoints::builtin_endpoints() | DISC_BUILTIN_ENDPOINT_PARTICIPANT_SECURE_ANNOUNCER | DISC_BUILTIN_ENDPOINT_PARTICIPANT_SECURE_DETECTOR; } bool enable_pdp_readers( - fastrtps::rtps::RTPSParticipantImpl* participant) override + RTPSParticipantImpl* participant) override { return DiscoveryServerPDPEndpoints::enable_pdp_readers(participant) && participant->enableReader(stateless_reader.reader_); } void disable_pdp_readers( - fastrtps::rtps::RTPSParticipantImpl* participant) override + RTPSParticipantImpl* participant) override { participant->disableReader(stateless_reader.reader_); DiscoveryServerPDPEndpoints::disable_pdp_readers(participant); } void delete_pdp_endpoints( - fastrtps::rtps::RTPSParticipantImpl* participant) override + RTPSParticipantImpl* participant) override { participant->deleteUserEndpoint(stateless_reader.reader_->getGuid()); DiscoveryServerPDPEndpoints::delete_pdp_endpoints(participant); } void remove_from_pdp_reader_history( - const fastrtps::rtps::InstanceHandle_t& remote_participant) override + const InstanceHandle_t& remote_participant) override { stateless_reader.remove_from_history(remote_participant); DiscoveryServerPDPEndpoints::remove_from_pdp_reader_history(remote_participant); } void remove_from_pdp_reader_history( - fastrtps::rtps::CacheChange_t* change) override + CacheChange_t* change) override { assert(nullptr != change); - if (change->writerGUID.entityId == fastrtps::rtps::c_EntityId_SPDPWriter) + if (change->writerGUID.entityId == c_EntityId_SPDPWriter) { stateless_reader.history_->remove_change(change); } @@ -87,7 +87,7 @@ struct DiscoveryServerPDPEndpointsSecure : public DiscoveryServerPDPEndpoints } //! Builtin Simple PDP reader - BuiltinReader stateless_reader; + BuiltinReader stateless_reader; }; } // namespace rtps diff --git a/src/cpp/rtps/builtin/discovery/participant/DS/FakeWriter.hpp b/src/cpp/rtps/builtin/discovery/participant/DS/FakeWriter.hpp index d23b17a21b4..feb1b9ae26d 100644 --- a/src/cpp/rtps/builtin/discovery/participant/DS/FakeWriter.hpp +++ b/src/cpp/rtps/builtin/discovery/participant/DS/FakeWriter.hpp @@ -30,16 +30,16 @@ namespace rtps { /** * An RTPS writer simulator used to send messages with a \ref DirectMessageSender. */ -class FakeWriter : public fastrtps::rtps::Endpoint +class FakeWriter : public Endpoint { public: FakeWriter( - fastrtps::rtps::RTPSParticipantImpl* participant, - const fastrtps::rtps::EntityId_t& entity_id) - : fastrtps::rtps::Endpoint(participant, { participant->getGuid().guidPrefix, entity_id }, {}) + RTPSParticipantImpl* participant, + const EntityId_t& entity_id) + : Endpoint(participant, { participant->getGuid().guidPrefix, entity_id }, {}) { - m_att.endpointKind = fastrtps::rtps::EndpointKind_t::WRITER; + m_att.endpointKind = EndpointKind_t::WRITER; #if HAVE_SECURITY participant->set_endpoint_rtps_protection_supports(this, false); #endif // HAVE_SECURITY diff --git a/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.cpp b/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.cpp index 0333ab49e9d..4db57655f2a 100644 --- a/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.cpp @@ -39,7 +39,7 @@ using ParameterList = eprosima::fastdds::dds::ParameterList; namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { PDPSecurityInitiatorListener::PDPSecurityInitiatorListener( @@ -98,5 +98,5 @@ bool PDPSecurityInitiatorListener::check_discovery_conditions( } } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.hpp b/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.hpp index 2301562bc30..b7ac5262526 100644 --- a/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.hpp +++ b/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.hpp @@ -28,7 +28,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class PDP; @@ -71,7 +71,7 @@ class PDPSecurityInitiatorListener : public PDPListener } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/src/cpp/rtps/builtin/discovery/participant/DirectMessageSender.cpp b/src/cpp/rtps/builtin/discovery/participant/DirectMessageSender.cpp index 6de9430e71c..d5171445b7f 100644 --- a/src/cpp/rtps/builtin/discovery/participant/DirectMessageSender.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/DirectMessageSender.cpp @@ -26,7 +26,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { @@ -107,5 +107,5 @@ bool DirectMessageSender::send( } } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/builtin/discovery/participant/DirectMessageSender.hpp b/src/cpp/rtps/builtin/discovery/participant/DirectMessageSender.hpp index 756f56b99bc..461070168b5 100644 --- a/src/cpp/rtps/builtin/discovery/participant/DirectMessageSender.hpp +++ b/src/cpp/rtps/builtin/discovery/participant/DirectMessageSender.hpp @@ -28,7 +28,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSParticipantImpl; @@ -112,7 +112,7 @@ class DirectMessageSender : public RTPSMessageSenderInterface }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/src/cpp/rtps/builtin/discovery/participant/PDP.cpp b/src/cpp/rtps/builtin/discovery/participant/PDP.cpp index 2d9e590bb33..33cb3f331fb 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDP.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/PDP.cpp @@ -58,7 +58,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { // Default configuration values for PDP reliable entities. @@ -1601,5 +1601,5 @@ void PDP::add_builtin_security_attributes( #endif // HAVE_SECURITY } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/builtin/discovery/participant/PDP.h b/src/cpp/rtps/builtin/discovery/participant/PDP.h index 5c809f2aba1..264e4ee2e23 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDP.h +++ b/src/cpp/rtps/builtin/discovery/participant/PDP.h @@ -68,7 +68,7 @@ class PDPEndpoints; } // namespace rtps } // namespace fastdds -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSWriter; @@ -666,7 +666,7 @@ extern const Duration_t pdp_heartbeat_response_delay; extern const int32_t pdp_initial_reserved_caches; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp index df3a2a1ad95..e96ca92677a 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp @@ -52,20 +52,16 @@ #include #include -using namespace eprosima::fastrtps; - namespace eprosima { namespace fastdds { namespace rtps { -using namespace fastrtps::rtps; - static void direct_send( RTPSParticipantImpl* participant, LocatorList& locators, std::vector& remote_readers, CacheChange_t& change, - fastrtps::rtps::Endpoint& sender_endpt) + fastdds::rtps::Endpoint& sender_endpt) { DirectMessageSender sender(participant, &remote_readers, &locators); RTPSMessageGroup group(participant, &sender_endpt, &sender); @@ -111,10 +107,10 @@ void PDPClient::initializeParticipantProxyData( if ( getRTPSParticipant()->getAttributes().builtin.discovery_config.discoveryProtocol - != DiscoveryProtocol_t::CLIENT + != DiscoveryProtocol::CLIENT && getRTPSParticipant()->getAttributes().builtin.discovery_config.discoveryProtocol - != DiscoveryProtocol_t::SUPER_CLIENT ) + != DiscoveryProtocol::SUPER_CLIENT ) { EPROSIMA_LOG_ERROR(RTPS_PDP, "Using a PDP client object with another user's settings"); } @@ -289,7 +285,7 @@ bool PDPClient::create_ds_pdp_best_effort_reader( if (mp_RTPSParticipant->createReader(&reader, ratt, endpoints.stateless_reader.history_.get(), endpoints.stateless_reader.listener_.get(), c_EntityId_SPDPReader, true, false)) { - endpoints.stateless_reader.reader_ = dynamic_cast(reader); + endpoints.stateless_reader.reader_ = dynamic_cast(reader); mp_RTPSParticipant->set_endpoint_rtps_protection_supports(reader, false); } // Could not create PDP Reader, so return false @@ -371,7 +367,7 @@ bool PDPClient::create_ds_pdp_reliable_endpoints( endpoints.reader.listener_.get(), reader_entity, true, false)) { - endpoints.reader.reader_ = dynamic_cast(reader); + endpoints.reader.reader_ = dynamic_cast(reader); #if HAVE_SECURITY mp_RTPSParticipant->set_endpoint_rtps_protection_supports(reader, false); @@ -431,7 +427,7 @@ bool PDPClient::create_ds_pdp_reliable_endpoints( #endif // if HAVE_SECURITY if (mp_RTPSParticipant->createWriter(&wout, watt, endpoints.writer.history_.get(), nullptr, writer_entity, true)) { - endpoints.writer.writer_ = dynamic_cast(wout); + endpoints.writer.writer_ = dynamic_cast(wout); #if HAVE_SECURITY mp_RTPSParticipant->set_endpoint_rtps_protection_supports(wout, false); @@ -712,7 +708,7 @@ void PDPClient::announceParticipantState( if (enabled_) { auto endpoints = static_cast(builtin_endpoints_.get()); - fastrtps::rtps::StatefulWriter& writer = *(endpoints->writer.writer_); + fastdds::rtps::StatefulWriter& writer = *(endpoints->writer.writer_); WriterHistory& history = *endpoints->writer.history_; /* diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPClient.h b/src/cpp/rtps/builtin/discovery/participant/PDPClient.h index a0a4387373a..96aecb2c4f1 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDPClient.h +++ b/src/cpp/rtps/builtin/discovery/participant/PDPClient.h @@ -31,8 +31,6 @@ namespace eprosima { namespace fastdds { namespace rtps { -using namespace fastrtps::rtps; - class StatefulWriter; class StatefulReader; diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPClientListener.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPClientListener.cpp index 4852d338955..cd5fb3d7f11 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDPClientListener.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/PDPClientListener.cpp @@ -38,7 +38,7 @@ using ParameterList = eprosima::fastdds::dds::ParameterList; namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { PDPClientListener::PDPClientListener( @@ -59,5 +59,5 @@ bool PDPClientListener::check_discovery_conditions( } } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPClientListener.hpp b/src/cpp/rtps/builtin/discovery/participant/PDPClientListener.hpp index 13f96980361..8f36462de7a 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDPClientListener.hpp +++ b/src/cpp/rtps/builtin/discovery/participant/PDPClientListener.hpp @@ -23,7 +23,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** @@ -53,7 +53,7 @@ class PDPClientListener : public PDPListener } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif /* _FASTDDS_RTPS_PDPCLIENTLISTENER_H_ */ diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPEndpoints.hpp b/src/cpp/rtps/builtin/discovery/participant/PDPEndpoints.hpp index ad775f1e720..e8b08e2aab9 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDPEndpoints.hpp +++ b/src/cpp/rtps/builtin/discovery/participant/PDPEndpoints.hpp @@ -43,20 +43,20 @@ class PDPEndpoints * * @return The list of builtin endpoints to announce. */ - virtual fastrtps::rtps::BuiltinEndpointSet_t builtin_endpoints() const = 0; + virtual fastdds::rtps::BuiltinEndpointSet_t builtin_endpoints() const = 0; - virtual const std::unique_ptr& main_listener() const = 0; + virtual const std::unique_ptr& main_listener() const = 0; virtual bool enable_pdp_readers( - fastrtps::rtps::RTPSParticipantImpl* participant) = 0; + fastdds::rtps::RTPSParticipantImpl* participant) = 0; virtual void disable_pdp_readers( - fastrtps::rtps::RTPSParticipantImpl* participant) = 0; + fastdds::rtps::RTPSParticipantImpl* participant) = 0; virtual void delete_pdp_endpoints( - fastrtps::rtps::RTPSParticipantImpl* participant) = 0; + fastdds::rtps::RTPSParticipantImpl* participant) = 0; virtual void remove_from_pdp_reader_history( - const fastrtps::rtps::InstanceHandle_t& remote_participant) = 0; + const fastdds::rtps::InstanceHandle_t& remote_participant) = 0; virtual void remove_from_pdp_reader_history( - fastrtps::rtps::CacheChange_t* change) = 0; + fastdds::rtps::CacheChange_t* change) = 0; protected: diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPListener.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPListener.cpp index 4369ba53111..e515a1bef9a 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDPListener.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/PDPListener.cpp @@ -41,7 +41,7 @@ using ParameterList = eprosima::fastdds::dds::ParameterList; namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { PDPListener::PDPListener( @@ -306,5 +306,5 @@ bool PDPListener::get_key( } } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPListener.h b/src/cpp/rtps/builtin/discovery/participant/PDPListener.h index 74256bf2d08..f685c91b7dc 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDPListener.h +++ b/src/cpp/rtps/builtin/discovery/participant/PDPListener.h @@ -27,7 +27,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class PDP; @@ -112,7 +112,7 @@ class PDPListener : public ReaderListener } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp index 9762d2b2f6c..8972676be3e 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp @@ -54,8 +54,6 @@ namespace eprosima { namespace fastdds { namespace rtps { -using namespace eprosima::fastrtps::rtps; - PDPServer::PDPServer( BuiltinProtocols* builtin, const RTPSParticipantAllocationAttributes& allocation, @@ -297,7 +295,7 @@ bool PDPServer::create_ds_pdp_best_effort_reader( [this](const ParticipantProxyData& participant_data) { auto endpoints = static_cast(builtin_endpoints_.get()); - std::lock_guard wlock(endpoints->writer.writer_->getMutex()); + std::lock_guard wlock(endpoints->writer.writer_->getMutex()); CacheChange_t* change = discovery_db().cache_change_own_participant(); if (change != nullptr) @@ -322,7 +320,7 @@ bool PDPServer::create_ds_pdp_best_effort_reader( if (mp_RTPSParticipant->createReader(&reader, ratt, endpoints.stateless_reader.history_.get(), endpoints.stateless_reader.listener_.get(), c_EntityId_SPDPReader, true, false)) { - endpoints.stateless_reader.reader_ = dynamic_cast(reader); + endpoints.stateless_reader.reader_ = dynamic_cast(reader); mp_RTPSParticipant->set_endpoint_rtps_protection_supports(reader, false); } // Could not create PDP Reader, so return false @@ -409,7 +407,7 @@ bool PDPServer::create_ds_pdp_reliable_endpoints( if (mp_RTPSParticipant->createReader(&reader, ratt, endpoints.reader.history_.get(), endpoints.reader.listener_.get(), reader_entity, true, false)) { - endpoints.reader.reader_ = dynamic_cast(reader); + endpoints.reader.reader_ = dynamic_cast(reader); // Enable unknown clients to reach this reader BaseReader::downcast(endpoints.reader.reader_)->allow_unknown_writers(); @@ -478,7 +476,7 @@ bool PDPServer::create_ds_pdp_reliable_endpoints( #endif // if HAVE_SECURITY if (mp_RTPSParticipant->createWriter(&wout, watt, endpoints.writer.history_.get(), nullptr, writer_entity, true)) { - endpoints.writer.writer_ = dynamic_cast(wout); + endpoints.writer.writer_ = dynamic_cast(wout); #if HAVE_SECURITY mp_RTPSParticipant->set_endpoint_rtps_protection_supports(wout, false); @@ -528,10 +526,10 @@ void PDPServer::initializeParticipantProxyData( PDP::initializeParticipantProxyData(participant_data); if (getRTPSParticipant()->getAttributes().builtin.discovery_config.discoveryProtocol != - DiscoveryProtocol_t::SERVER + DiscoveryProtocol::SERVER && getRTPSParticipant()->getAttributes().builtin.discovery_config.discoveryProtocol != - DiscoveryProtocol_t::BACKUP) + DiscoveryProtocol::BACKUP) { EPROSIMA_LOG_ERROR(RTPS_PDP_SERVER, "Using a PDP Server object with another user's settings"); } @@ -824,10 +822,10 @@ void PDPServer::announceParticipantState( auto endpoints = static_cast(builtin_endpoints_.get()); assert(endpoints->writer.writer_); - fastrtps::rtps::StatefulWriter& writer = *(endpoints->writer.writer_); + fastdds::rtps::StatefulWriter& writer = *(endpoints->writer.writer_); WriterHistory& history = *endpoints->writer.history_; - std::lock_guard wlock(writer.getMutex()); + std::lock_guard wlock(writer.getMutex()); if (!dispose) { @@ -885,7 +883,7 @@ void PDPServer::announceParticipantState( change->sequenceNumber = sn; // Create a RemoteLocatorList for metatraffic_locators - fastrtps::rtps::RemoteLocatorList metatraffic_locators( + fastdds::rtps::RemoteLocatorList metatraffic_locators( mp_builtin->m_metatrafficUnicastLocatorList.size(), mp_builtin->m_metatrafficMulticastLocatorList.size()); @@ -1232,10 +1230,10 @@ bool PDPServer::process_writers_acknowledgements() } bool PDPServer::process_history_acknowledgement( - fastrtps::rtps::StatefulWriter* writer, - fastrtps::rtps::WriterHistory* writer_history) + fastdds::rtps::StatefulWriter* writer, + fastdds::rtps::WriterHistory* writer_history) { - std::unique_lock lock(writer->getMutex()); + std::unique_lock lock(writer->getMutex()); // Iterate over changes in writer's history for (auto it = writer_history->changesBegin(); it != writer_history->changesEnd();) @@ -1249,14 +1247,14 @@ bool PDPServer::process_history_acknowledgement( } History::iterator PDPServer::process_change_acknowledgement( - fastrtps::rtps::History::iterator cit, - fastrtps::rtps::StatefulWriter* writer, - fastrtps::rtps::WriterHistory* writer_history) + fastdds::rtps::History::iterator cit, + fastdds::rtps::StatefulWriter* writer, + fastdds::rtps::WriterHistory* writer_history) { // DATA(p|w|r) case CacheChange_t* c = *cit; - if (c->kind == fastrtps::rtps::ChangeKind_t::ALIVE) + if (c->kind == fastdds::rtps::ChangeKind_t::ALIVE) { EPROSIMA_LOG_INFO(RTPS_PDP_SERVER, "Processing ack data alive " << c->instanceHandle); @@ -1323,7 +1321,7 @@ bool PDPServer::process_disposals() EDPServer* edp = static_cast(mp_EDP); // Get list of disposals from database - std::vector disposals = discovery_db_.changes_to_dispose(); + std::vector disposals = discovery_db_.changes_to_dispose(); // Iterate over disposals for (auto change: disposals) { @@ -1332,7 +1330,7 @@ bool PDPServer::process_disposals() // populating the disposals list to discovery_db_.process_data_queue(). // Get the identity of the participant from which the change came. - fastrtps::rtps::GuidPrefix_t change_guid_prefix = discovery_db_.guid_from_change(change).guidPrefix; + fastdds::rtps::GuidPrefix_t change_guid_prefix = discovery_db_.guid_from_change(change).guidPrefix; change->writerGUID.guidPrefix = endpoints->writer.writer_->getGuid().guidPrefix; @@ -1340,13 +1338,13 @@ bool PDPServer::process_disposals() if (discovery_db_.is_participant(change)) { // Lock PDP writer - std::unique_lock lock(endpoints->writer.writer_->getMutex()); + std::unique_lock lock(endpoints->writer.writer_->getMutex()); // Remove all DATA(p) with the same sample identity as the DATA(Up) from PDP writer's history. discovery_db_.remove_related_alive_from_history_nts(endpoints->writer.history_.get(), change_guid_prefix); // Add DATA(Up) to PDP writer's history - eprosima::fastrtps::rtps::WriteParams wp = change->write_params; + eprosima::fastdds::rtps::WriteParams wp = change->write_params; endpoints->writer.history_->add_change(change, wp); } // Check whether disposals contains a DATA(Up) from the same participant as the DATA(Uw) or DATA(Ur). @@ -1378,7 +1376,7 @@ bool PDPServer::process_changes_release() } void PDPServer::process_changes_release_( - const std::vector& changes) + const std::vector& changes) { // We will need the EDP publications/subscriptions writers, readers, and histories auto endpoints = static_cast(builtin_endpoints_.get()); @@ -1443,8 +1441,8 @@ void PDPServer::process_changes_release_( } bool PDPServer::announcement_from_same_participant_in_disposals( - const std::vector& disposals, - const fastrtps::rtps::GuidPrefix_t& participant) + const std::vector& disposals, + const fastdds::rtps::GuidPrefix_t& participant) { for (auto change_: disposals) { @@ -1512,12 +1510,12 @@ bool PDPServer::process_to_send_lists() } bool PDPServer::process_to_send_list( - const std::vector& send_list, - fastrtps::rtps::RTPSWriter* writer, - fastrtps::rtps::WriterHistory* history) + const std::vector& send_list, + fastdds::rtps::RTPSWriter* writer, + fastdds::rtps::WriterHistory* history) { // Iterate over DATAs in send_list - std::unique_lock lock(writer->getMutex()); + std::unique_lock lock(writer->getMutex()); for (auto change: send_list) { // If the DATA is already in the writer's history, then remove it, but do not release the change. @@ -1526,25 +1524,25 @@ bool PDPServer::process_to_send_list( change->writerGUID = writer->getGuid(); // Add DATA to writer's history. EPROSIMA_LOG_INFO(RTPS_PDP_SERVER, "Adding change from " << change->instanceHandle << " to history"); - eprosima::fastrtps::rtps::WriteParams wp = change->write_params; + eprosima::fastdds::rtps::WriteParams wp = change->write_params; history->add_change(change, wp); } return true; } bool PDPServer::remove_change_from_writer_history( - fastrtps::rtps::RTPSWriter* writer, - fastrtps::rtps::WriterHistory* history, - fastrtps::rtps::CacheChange_t* change, + fastdds::rtps::RTPSWriter* writer, + fastdds::rtps::WriterHistory* history, + fastdds::rtps::CacheChange_t* change, bool release_change /*= true*/) { - std::unique_lock lock(writer->getMutex()); + std::unique_lock lock(writer->getMutex()); return remove_change_from_history_nts(history, change, release_change); } bool PDPServer::remove_change_from_history_nts( - fastrtps::rtps::WriterHistory* history, - fastrtps::rtps::CacheChange_t* change, + fastdds::rtps::WriterHistory* history, + fastdds::rtps::CacheChange_t* change, bool release_change /*= true*/) { for (auto chit = history->changesRbegin(); chit != history->changesRend(); chit++) @@ -1585,7 +1583,7 @@ bool PDPServer::pending_ack() return ret; } -std::set PDPServer::servers_prefixes() +std::set PDPServer::servers_prefixes() { std::lock_guard lock(*getMutex()); std::set servers; @@ -1598,7 +1596,7 @@ std::set PDPServer::servers_prefixes() return servers; } -eprosima::fastrtps::rtps::ResourceEvent& PDPServer::get_resource_event_thread() +eprosima::fastdds::rtps::ResourceEvent& PDPServer::get_resource_event_thread() { return resource_event_thread_; } @@ -1658,7 +1656,7 @@ void PDPServer::send_announcement( if (dispose) { RTPSMessageGroup group(getRTPSParticipant(), endpoints->writer.writer_, &sender); - endpoints->writer.writer_->fastrtps::rtps::StatefulWriter::incrementHBCount(); + endpoints->writer.writer_->fastdds::rtps::StatefulWriter::incrementHBCount(); group.add_heartbeat( change->sequenceNumber, change->sequenceNumber, @@ -1736,15 +1734,15 @@ bool PDPServer::process_backup_discovery_database_restore( // These mutexes are necessary to send messages to the listeners auto endpoints = static_cast(builtin_endpoints_.get()); - std::unique_lock lock(endpoints->reader.reader_->getMutex()); - std::unique_lock lock_edpp(edp->publications_reader_.first->getMutex()); - std::unique_lock lock_edps(edp->subscriptions_reader_.first->getMutex()); + std::unique_lock lock(endpoints->reader.reader_->getMutex()); + std::unique_lock lock_edpp(edp->publications_reader_.first->getMutex()); + std::unique_lock lock_edps(edp->subscriptions_reader_.first->getMutex()); // Auxiliar variables to load info from json - std::map changes_map; - fastrtps::rtps::SampleIdentity sample_identity_aux; + std::map changes_map; + fastdds::rtps::SampleIdentity sample_identity_aux; uint32_t length = 0; - fastrtps::rtps::CacheChange_t* change_aux; + fastdds::rtps::CacheChange_t* change_aux; try { @@ -1773,7 +1771,7 @@ bool PDPServer::process_backup_discovery_database_restore( if (it.value()["is_local"].get() && change_aux->write_params.sample_identity().writer_guid().guidPrefix != endpoints->writer.writer_->getGuid().guidPrefix && - change_aux->kind == fastrtps::rtps::ALIVE) + change_aux->kind == fastdds::rtps::ALIVE) { change_aux->writerGUID = change_aux->write_params.sample_identity().writer_guid(); change_aux->sequenceNumber = change_aux->write_params.sample_identity().sequence_number(); @@ -1790,7 +1788,7 @@ bool PDPServer::process_backup_discovery_database_restore( if (it.value()["topic"] == discovery_db().virtual_topic()) { - change_aux = new fastrtps::rtps::CacheChange_t(); + change_aux = new fastdds::rtps::CacheChange_t(); } else { @@ -1814,7 +1812,7 @@ bool PDPServer::process_backup_discovery_database_restore( // call listener to create proxy info for other entities different than server if (change_aux->write_params.sample_identity().writer_guid().guidPrefix != endpoints->writer.writer_->getGuid().guidPrefix - && change_aux->kind == fastrtps::rtps::ALIVE + && change_aux->kind == fastdds::rtps::ALIVE && it.value()["topic"] != discovery_db().virtual_topic()) { edp_pub_listener->on_new_cache_change_added(edp->publications_reader_.first, change_aux); @@ -1829,7 +1827,7 @@ bool PDPServer::process_backup_discovery_database_restore( if (it.value()["topic"] == discovery_db().virtual_topic()) { - change_aux = new fastrtps::rtps::CacheChange_t(); + change_aux = new fastdds::rtps::CacheChange_t(); } else { @@ -1850,7 +1848,7 @@ bool PDPServer::process_backup_discovery_database_restore( // call listener to create proxy info for other entities different than server if (change_aux->write_params.sample_identity().writer_guid().guidPrefix != endpoints->writer.writer_->getGuid().guidPrefix - && change_aux->kind == fastrtps::rtps::ALIVE + && change_aux->kind == fastdds::rtps::ALIVE && it.value()["topic"] != discovery_db().virtual_topic()) { edp_sub_listener->on_new_cache_change_added(edp->subscriptions_reader_.first, change_aux); @@ -1872,17 +1870,17 @@ bool PDPServer::process_backup_discovery_database_restore( bool PDPServer::process_backup_restore_queue( std::vector& /* new_changes */) { - // fastrtps::rtps::SampleIdentity sample_identity_aux; - // fastrtps::rtps::InstanceHandle_t instance_handle_aux; + // fastdds::rtps::SampleIdentity sample_identity_aux; + // fastdds::rtps::InstanceHandle_t instance_handle_aux; // uint32_t length; // EDPServer* edp = static_cast(mp_EDP); // EDPServerPUBListener* edp_pub_listener = static_cast(edp->publications_listener_); // EDPServerSUBListener* edp_sub_listener = static_cast(edp->subscriptions_listener_); - // std::unique_lock lock(endpoints->reader.reader_->getMutex()); - // std::unique_lock lock_edpp(edp->publications_reader_.first->getMutex()); - // std::unique_lock lock_edps(edp->subscriptions_reader_.first->getMutex()); + // std::unique_lock lock(endpoints->reader.reader_->getMutex()); + // std::unique_lock lock_edpp(edp->publications_reader_.first->getMutex()); + // std::unique_lock lock_edps(edp->subscriptions_reader_.first->getMutex()); // TODO uncomment this funcionality and update with pools when queue functionality is implemented // try @@ -1891,7 +1889,7 @@ bool PDPServer::process_backup_restore_queue( // for (nlohmann::json& json_change : new_changes) // { // // std::cout << json_change << std::endl; - // fastrtps::rtps::CacheChange_t* change_aux; + // fastdds::rtps::CacheChange_t* change_aux; // length = json_change["serialized_payload"]["length"].get(); // (std::istringstream) json_change["sample_identity"].get() >> sample_identity_aux; // (std::istringstream) json_change["instance_handle"].get() >> instance_handle_aux; @@ -2052,7 +2050,7 @@ void PDPServer::match_pdp_reader_nts_( } void PDPServer::release_change_from_writer( - eprosima::fastrtps::rtps::CacheChange_t* change) + eprosima::fastdds::rtps::CacheChange_t* change) { auto endpoints = static_cast(builtin_endpoints_.get()); endpoints->writer.writer_->release_change(change); diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPServer.hpp b/src/cpp/rtps/builtin/discovery/participant/PDPServer.hpp index a2904ff6497..12def1ba732 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDPServer.hpp +++ b/src/cpp/rtps/builtin/discovery/participant/PDPServer.hpp @@ -45,7 +45,7 @@ namespace rtps { * Class PDPServer manages server side of the discovery server mechanism *@ingroup DISCOVERY_MODULE */ -class PDPServer : public fastrtps::rtps::PDP +class PDPServer : public fastdds::rtps::PDP { friend class DServerRoutineEvent; friend class DServerPingEvent; @@ -62,14 +62,14 @@ class PDPServer : public fastrtps::rtps::PDP * @param durability_kind the kind of persistence we want for the discovery data */ PDPServer( - fastrtps::rtps::BuiltinProtocols* builtin, - const fastrtps::rtps::RTPSParticipantAllocationAttributes& allocation, - fastrtps::rtps::DurabilityKind_t durability_kind = fastrtps::rtps::TRANSIENT_LOCAL); + fastdds::rtps::BuiltinProtocols* builtin, + const fastdds::rtps::RTPSParticipantAllocationAttributes& allocation, + fastdds::rtps::DurabilityKind_t durability_kind = fastdds::rtps::TRANSIENT_LOCAL); ~PDPServer(); void initializeParticipantProxyData( - fastrtps::rtps::ParticipantProxyData* participant_data) override; + fastdds::rtps::ParticipantProxyData* participant_data) override; /** * Initialize the PDP. @@ -77,11 +77,11 @@ class PDPServer : public fastrtps::rtps::PDP * @return True on success */ bool init( - fastrtps::rtps::RTPSParticipantImpl* part) override; + fastdds::rtps::RTPSParticipantImpl* part) override; /** * @brief Checks if a backup file needs to be restored for - * DiscoveryProtocol_t::BACKUP before enabling the Participant Discovery Protocol + * DiscoveryProtocol::BACKUP before enabling the Participant Discovery Protocol */ void pre_enable_actions() override; @@ -91,9 +91,9 @@ class PDPServer : public fastrtps::rtps::PDP * @param writer_guid GUID of originating writer * @return new ParticipantProxyData * or nullptr on failure */ - fastrtps::rtps::ParticipantProxyData* createParticipantProxyData( - const fastrtps::rtps::ParticipantProxyData& p, - const fastrtps::rtps::GUID_t& writer_guid) override; + fastdds::rtps::ParticipantProxyData* createParticipantProxyData( + const fastdds::rtps::ParticipantProxyData& p, + const fastdds::rtps::GUID_t& writer_guid) override; /** * Create the SPDP Writer and Reader @@ -108,8 +108,8 @@ class PDPServer : public fastrtps::rtps::PDP * @return true if correct. */ bool remove_remote_participant( - const fastrtps::rtps::GUID_t& participant_guid, - fastrtps::rtps::ParticipantDiscoveryInfo::DISCOVERY_STATUS reason) override; + const fastdds::rtps::GUID_t& participant_guid, + fastdds::rtps::ParticipantDiscoveryInfo::DISCOVERY_STATUS reason) override; /** * Force the sending of our local PDP to all servers @@ -125,15 +125,15 @@ class PDPServer : public fastrtps::rtps::PDP void announceParticipantState( bool new_change, bool dispose = false, - fastrtps::rtps::WriteParams& wparams = fastrtps::rtps::WriteParams::WRITE_PARAM_DEFAULT) override; + fastdds::rtps::WriteParams& wparams = fastdds::rtps::WriteParams::WRITE_PARAM_DEFAULT) override; // Force the sending of our DATA(p) to those servers that has not acked yet void ping_remote_servers(); // send a specific Data to specific locators void send_announcement( - fastrtps::rtps::CacheChange_t* change, - std::vector remote_readers, + fastdds::rtps::CacheChange_t* change, + std::vector remote_readers, LocatorList locators, bool dispose = false); @@ -143,21 +143,21 @@ class PDPServer : public fastrtps::rtps::PDP * @param pdata Pointer to the RTPSParticipantProxyData object. */ void assignRemoteEndpoints( - fastrtps::rtps::ParticipantProxyData* pdata) override; + fastdds::rtps::ParticipantProxyData* pdata) override; void removeRemoteEndpoints( - fastrtps::rtps::ParticipantProxyData* pdata) override; + fastdds::rtps::ParticipantProxyData* pdata) override; void notifyAboveRemoteEndpoints( - const fastrtps::rtps::ParticipantProxyData& pdata, + const fastdds::rtps::ParticipantProxyData& pdata, bool notify_secure_endpoints) override; #if HAVE_SECURITY bool pairing_remote_writer_with_local_reader_after_security( - const fastrtps::rtps::GUID_t& local_reader, - const fastrtps::rtps::WriterProxyData& remote_writer_data) override; + const fastdds::rtps::GUID_t& local_reader, + const fastdds::rtps::WriterProxyData& remote_writer_data) override; bool pairing_remote_reader_with_local_writer_after_security( - const fastrtps::rtps::GUID_t& local_reader, - const fastrtps::rtps::ReaderProxyData& remote_reader_data) override; + const fastdds::rtps::GUID_t& local_reader, + const fastdds::rtps::ReaderProxyData& remote_reader_data) override; #endif // HAVE_SECURITY //! Get filename for writer persistence database file @@ -216,20 +216,20 @@ class PDPServer : public fastrtps::rtps::PDP /* * Get Pointer to the server resource event thread. */ - eprosima::fastrtps::rtps::ResourceEvent& get_resource_event_thread(); + eprosima::fastdds::rtps::ResourceEvent& get_resource_event_thread(); // Check the messages in histories. Check which ones modify the database to unlock further messages // and clean them when not needed anymore bool process_writers_acknowledgements(); bool process_history_acknowledgement( - fastrtps::rtps::StatefulWriter* writer, - fastrtps::rtps::WriterHistory* writer_history); + fastdds::rtps::StatefulWriter* writer, + fastdds::rtps::WriterHistory* writer_history); - fastrtps::rtps::History::iterator process_change_acknowledgement( - fastrtps::rtps::History::iterator c, - fastrtps::rtps::StatefulWriter* writer, - fastrtps::rtps::WriterHistory* writer_history); + fastdds::rtps::History::iterator process_change_acknowledgement( + fastdds::rtps::History::iterator c, + fastdds::rtps::StatefulWriter* writer, + fastdds::rtps::WriterHistory* writer_history); bool process_data_queues(); @@ -238,28 +238,28 @@ class PDPServer : public fastrtps::rtps::PDP bool process_changes_release(); void process_changes_release_( - const std::vector& changes); + const std::vector& changes); bool remove_change_from_writer_history( - fastrtps::rtps::RTPSWriter* writer, - fastrtps::rtps::WriterHistory* history, - fastrtps::rtps::CacheChange_t* change, + fastdds::rtps::RTPSWriter* writer, + fastdds::rtps::WriterHistory* history, + fastdds::rtps::CacheChange_t* change, bool release_change = true); bool announcement_from_same_participant_in_disposals( - const std::vector& disposals, - const fastrtps::rtps::GuidPrefix_t& participant); + const std::vector& disposals, + const fastdds::rtps::GuidPrefix_t& participant); bool process_to_send_lists(); bool process_to_send_list( - const std::vector& send_list, - fastrtps::rtps::RTPSWriter* writer, - fastrtps::rtps::WriterHistory* history); + const std::vector& send_list, + fastdds::rtps::RTPSWriter* writer, + fastdds::rtps::WriterHistory* history); bool remove_change_from_history_nts( - fastrtps::rtps::WriterHistory* history, - fastrtps::rtps::CacheChange_t* change, + fastdds::rtps::WriterHistory* history, + fastdds::rtps::CacheChange_t* change, bool release_change = true); bool process_dirty_topics(); @@ -286,7 +286,7 @@ class PDPServer : public fastrtps::rtps::PDP nlohmann::json& ddb_json, std::vector& new_changes); - std::set servers_prefixes(); + std::set servers_prefixes(); // General file name for the prefix of every backup file std::ostringstream get_persistence_file_name_() const; @@ -320,11 +320,11 @@ class PDPServer : public fastrtps::rtps::PDP * @param change The CacheChange_t to be released. */ void release_change_from_writer( - eprosima::fastrtps::rtps::CacheChange_t* change); + eprosima::fastdds::rtps::CacheChange_t* change); private: - using fastrtps::rtps::PDP::announceParticipantState; + using PDP::announceParticipantState; #if HAVE_SECURITY /** @@ -369,13 +369,13 @@ class PDPServer : public fastrtps::rtps::PDP * Provides the functionality of notifyAboveRemoteEndpoints without being an override of that method. */ void perform_builtin_endpoints_matching( - const fastrtps::rtps::ParticipantProxyData& pdata); + const fastdds::rtps::ParticipantProxyData& pdata); void match_reliable_pdp_endpoints( - const fastrtps::rtps::ParticipantProxyData& pdata); + const fastdds::rtps::ParticipantProxyData& pdata); //! Server thread - eprosima::fastrtps::rtps::ResourceEvent resource_event_thread_; + eprosima::fastdds::rtps::ResourceEvent resource_event_thread_; /** * TimedEvent for server routine @@ -391,7 +391,7 @@ class PDPServer : public fastrtps::rtps::PDP fastdds::rtps::ddb::DiscoveryDataBase discovery_db_; //! TRANSIENT or TRANSIENT_LOCAL durability; - fastrtps::rtps::DurabilityKind_t durability_; + fastdds::rtps::DurabilityKind_t durability_; }; diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPServerListener.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPServerListener.cpp index 73ee72bbf2f..83a878df986 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDPServerListener.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/PDPServerListener.cpp @@ -37,8 +37,6 @@ namespace eprosima { namespace fastdds { namespace rtps { -using namespace eprosima::fastrtps::rtps; - PDPServerListener::PDPServerListener( PDPServer* in_PDP) : PDPListener(in_PDP) @@ -369,7 +367,7 @@ std::pair PDPServerListener::check_server_discovery_conditions( std::pair ret{true, true}; /* Check PID_VENDOR_ID */ - if (participant_data.m_VendorId != fastrtps::rtps::c_VendorId_eProsima) + if (participant_data.m_VendorId != fastdds::rtps::c_VendorId_eProsima) { EPROSIMA_LOG_INFO(RTPS_PDP_LISTENER, "DATA(p|Up) from different vendor is not supported for Discover-Server operation"); diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPServerListener.hpp b/src/cpp/rtps/builtin/discovery/participant/PDPServerListener.hpp index 467e19e9966..3343f4d3130 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDPServerListener.hpp +++ b/src/cpp/rtps/builtin/discovery/participant/PDPServerListener.hpp @@ -34,7 +34,7 @@ class PDPServer; * This class is implemented in order to use the same structure than with any other RTPSReader. *@ingroup DISCOVERY_MODULE */ -class PDPServerListener : public fastrtps::rtps::PDPListener +class PDPServerListener : public fastdds::rtps::PDPListener { public: @@ -56,8 +56,8 @@ class PDPServerListener : public fastrtps::rtps::PDPListener * @param change */ void on_new_cache_change_added( - fastrtps::rtps::RTPSReader* reader, - const fastrtps::rtps::CacheChange_t* const change) override; + fastdds::rtps::RTPSReader* reader, + const fastdds::rtps::CacheChange_t* const change) override; protected: @@ -70,7 +70,7 @@ class PDPServerListener : public fastrtps::rtps::PDPListener * The second one indicates if the remote participant data is a client. */ std::pair check_server_discovery_conditions( - fastrtps::rtps::ParticipantProxyData& participant_data); + fastdds::rtps::ParticipantProxyData& participant_data); }; diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp index 1e5312a9248..d479d6dd82b 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp @@ -48,7 +48,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { static HistoryAttributes pdp_reader_history_attributes( @@ -198,7 +198,7 @@ ParticipantProxyData* PDPSimple::createParticipantProxyData( std::unique_lock lock(*getMutex()); // decide if we dismiss the participant using the ParticipantFilteringFlags - const ParticipantFilteringFlags_t& flags = m_discovery.discovery_config.ignoreParticipantFlags; + const ParticipantFilteringFlags& flags = m_discovery.discovery_config.ignoreParticipantFlags; const GUID_t& remote = participant_data.m_guid; const GUID_t& local = getLocalParticipantProxyData()->m_guid; bool is_same_host = local.is_on_same_host_as(remote); @@ -212,7 +212,7 @@ ParticipantProxyData* PDPSimple::createParticipantProxyData( return nullptr; } - if (flags != ParticipantFilteringFlags_t::NO_FILTER) + if (flags != ParticipantFilteringFlags::NO_FILTER) { if (!is_same_host) { @@ -789,5 +789,5 @@ bool PDPSimple::newRemoteEndpointStaticallyDiscovered( } } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.h b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.h index 5065373e3f6..c6d77a5657b 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.h +++ b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.h @@ -24,7 +24,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class StatelessWriter; @@ -164,7 +164,7 @@ class PDPSimple : public PDP }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpoints.hpp b/src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpoints.hpp index 2717a82d6a3..791390abba5 100644 --- a/src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpoints.hpp +++ b/src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpoints.hpp @@ -41,52 +41,52 @@ struct SimplePDPEndpoints : public PDPEndpoints { ~SimplePDPEndpoints() override = default; - fastrtps::rtps::BuiltinEndpointSet_t builtin_endpoints() const override + BuiltinEndpointSet_t builtin_endpoints() const override { return DISC_BUILTIN_ENDPOINT_PARTICIPANT_ANNOUNCER | DISC_BUILTIN_ENDPOINT_PARTICIPANT_DETECTOR; } - const std::unique_ptr& main_listener() const override + const std::unique_ptr& main_listener() const override { return reader.listener_; } bool enable_pdp_readers( - fastrtps::rtps::RTPSParticipantImpl* participant) override + RTPSParticipantImpl* participant) override { return participant->enableReader(reader.reader_); } void disable_pdp_readers( - fastrtps::rtps::RTPSParticipantImpl* participant) override + RTPSParticipantImpl* participant) override { participant->disableReader(reader.reader_); } void delete_pdp_endpoints( - fastrtps::rtps::RTPSParticipantImpl* participant) override + RTPSParticipantImpl* participant) override { participant->deleteUserEndpoint(writer.writer_->getGuid()); participant->deleteUserEndpoint(reader.reader_->getGuid()); } void remove_from_pdp_reader_history( - const fastrtps::rtps::InstanceHandle_t& remote_participant) override + const InstanceHandle_t& remote_participant) override { reader.remove_from_history(remote_participant); } void remove_from_pdp_reader_history( - fastrtps::rtps::CacheChange_t* change) override + CacheChange_t* change) override { reader.history_->remove_change(change); } //! Builtin Simple PDP reader - BuiltinReader reader; + BuiltinReader reader; //! Builtin Simple PDP writer - BuiltinWriter writer; + BuiltinWriter writer; }; } // namespace rtps diff --git a/src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpointsSecure.hpp b/src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpointsSecure.hpp index d1493e3a2a9..6ea360d9d9c 100644 --- a/src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpointsSecure.hpp +++ b/src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpointsSecure.hpp @@ -41,33 +41,33 @@ struct SimplePDPEndpointsSecure : public SimplePDPEndpoints { ~SimplePDPEndpointsSecure() override = default; - fastrtps::rtps::BuiltinEndpointSet_t builtin_endpoints() const override + BuiltinEndpointSet_t builtin_endpoints() const override { return SimplePDPEndpoints::builtin_endpoints() | DISC_BUILTIN_ENDPOINT_PARTICIPANT_SECURE_ANNOUNCER | DISC_BUILTIN_ENDPOINT_PARTICIPANT_SECURE_DETECTOR; } - const std::unique_ptr& main_listener() const override + const std::unique_ptr& main_listener() const override { return secure_reader.listener_; } bool enable_pdp_readers( - fastrtps::rtps::RTPSParticipantImpl* participant) override + RTPSParticipantImpl* participant) override { return SimplePDPEndpoints::enable_pdp_readers(participant) && participant->enableReader(secure_reader.reader_); } void disable_pdp_readers( - fastrtps::rtps::RTPSParticipantImpl* participant) override + RTPSParticipantImpl* participant) override { participant->disableReader(secure_reader.reader_); SimplePDPEndpoints::disable_pdp_readers(participant); } void delete_pdp_endpoints( - fastrtps::rtps::RTPSParticipantImpl* participant) override + RTPSParticipantImpl* participant) override { participant->deleteUserEndpoint(secure_reader.reader_->getGuid()); participant->deleteUserEndpoint(secure_writer.writer_->getGuid()); @@ -75,17 +75,17 @@ struct SimplePDPEndpointsSecure : public SimplePDPEndpoints } void remove_from_pdp_reader_history( - const fastrtps::rtps::InstanceHandle_t& remote_participant) override + const InstanceHandle_t& remote_participant) override { secure_reader.remove_from_history(remote_participant); SimplePDPEndpoints::remove_from_pdp_reader_history(remote_participant); } void remove_from_pdp_reader_history( - fastrtps::rtps::CacheChange_t* change) override + CacheChange_t* change) override { assert(nullptr != change); - if (change->writerGUID.entityId == fastrtps::rtps::c_EntityId_SPDPWriter) + if (change->writerGUID.entityId == c_EntityId_SPDPWriter) { SimplePDPEndpoints::remove_from_pdp_reader_history(change); } @@ -96,10 +96,10 @@ struct SimplePDPEndpointsSecure : public SimplePDPEndpoints } //! Builtin Simple PDP secure reader - BuiltinReader secure_reader; + BuiltinReader secure_reader; //! Builtin Simple PDP secure writer - BuiltinWriter secure_writer; + BuiltinWriter secure_writer; }; } // namespace rtps diff --git a/src/cpp/rtps/builtin/discovery/participant/timedevent/DSClientEvent.h b/src/cpp/rtps/builtin/discovery/participant/timedevent/DSClientEvent.h index 06f95325635..ce35f780ff4 100644 --- a/src/cpp/rtps/builtin/discovery/participant/timedevent/DSClientEvent.h +++ b/src/cpp/rtps/builtin/discovery/participant/timedevent/DSClientEvent.h @@ -27,8 +27,6 @@ namespace eprosima { namespace fastdds { namespace rtps { -using namespace fastrtps::rtps; - class PDPClient; class EDPClient; diff --git a/src/cpp/rtps/builtin/discovery/participant/timedevent/DServerEvent.hpp b/src/cpp/rtps/builtin/discovery/participant/timedevent/DServerEvent.hpp index 425e69144da..5b3b91507a6 100644 --- a/src/cpp/rtps/builtin/discovery/participant/timedevent/DServerEvent.hpp +++ b/src/cpp/rtps/builtin/discovery/participant/timedevent/DServerEvent.hpp @@ -34,7 +34,7 @@ class PDPServer; * Class DServerRoutineEvent, TimedEvent used to synchronize discover-server servers *@ingroup DISCOVERY_MODULE */ -class DServerRoutineEvent : public fastrtps::rtps::TimedEvent +class DServerRoutineEvent : public TimedEvent { public: @@ -60,7 +60,7 @@ class DServerRoutineEvent : public fastrtps::rtps::TimedEvent double server_routine_period_; }; -class DServerPingEvent : public fastrtps::rtps::TimedEvent +class DServerPingEvent : public TimedEvent { public: diff --git a/src/cpp/rtps/builtin/liveliness/WLP.cpp b/src/cpp/rtps/builtin/liveliness/WLP.cpp index 39b9fa67090..c793ddb2567 100644 --- a/src/cpp/rtps/builtin/liveliness/WLP.cpp +++ b/src/cpp/rtps/builtin/liveliness/WLP.cpp @@ -44,7 +44,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { using BaseReader = fastdds::rtps::BaseReader; @@ -1107,5 +1107,5 @@ void WLP::update_liveliness_changed_status( } } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/builtin/liveliness/WLP.hpp b/src/cpp/rtps/builtin/liveliness/WLP.hpp index d5ffd4a59f4..f533b4f6487 100644 --- a/src/cpp/rtps/builtin/liveliness/WLP.hpp +++ b/src/cpp/rtps/builtin/liveliness/WLP.hpp @@ -42,7 +42,7 @@ class BaseReader; } // namespace rtps } // namespace fastdds -namespace fastrtps { +namespace fastdds { namespace rtps { class BuiltinProtocols; @@ -320,7 +320,7 @@ class WLP }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/src/cpp/rtps/builtin/liveliness/WLPListener.cpp b/src/cpp/rtps/builtin/liveliness/WLPListener.cpp index df6df7c69ec..8d25a5a3477 100644 --- a/src/cpp/rtps/builtin/liveliness/WLPListener.cpp +++ b/src/cpp/rtps/builtin/liveliness/WLPListener.cpp @@ -41,7 +41,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { WLPListener::WLPListener( diff --git a/src/cpp/rtps/builtin/liveliness/WLPListener.h b/src/cpp/rtps/builtin/liveliness/WLPListener.h index bc25d32fb7f..b23eaac878a 100644 --- a/src/cpp/rtps/builtin/liveliness/WLPListener.h +++ b/src/cpp/rtps/builtin/liveliness/WLPListener.h @@ -28,7 +28,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class WLP; diff --git a/src/cpp/rtps/common/ChangeComparison.hpp b/src/cpp/rtps/common/ChangeComparison.hpp index ccff53dfc3f..01843fadd3f 100644 --- a/src/cpp/rtps/common/ChangeComparison.hpp +++ b/src/cpp/rtps/common/ChangeComparison.hpp @@ -26,8 +26,8 @@ namespace fastdds { namespace rtps { inline bool history_order_cmp( - const eprosima::fastrtps::rtps::CacheChange_t* lhs, - const eprosima::fastrtps::rtps::CacheChange_t* rhs) + const CacheChange_t* lhs, + const CacheChange_t* rhs) { return lhs->writerGUID == rhs->writerGUID ? lhs->sequenceNumber < rhs->sequenceNumber : diff --git a/src/cpp/rtps/common/GuidPrefix_t.cpp b/src/cpp/rtps/common/GuidPrefix_t.cpp index 100c07912ee..b1231c8531b 100644 --- a/src/cpp/rtps/common/GuidPrefix_t.cpp +++ b/src/cpp/rtps/common/GuidPrefix_t.cpp @@ -21,7 +21,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { bool GuidPrefix_t::is_on_same_host_as( @@ -32,7 +32,7 @@ bool GuidPrefix_t::is_on_same_host_as( bool GuidPrefix_t::is_from_this_host() const { - return is_on_same_host_as(fastdds::rtps::GuidUtils::instance().prefix()); + return is_on_same_host_as(GuidUtils::instance().prefix()); } bool GuidPrefix_t::is_on_same_process_as( @@ -43,9 +43,9 @@ bool GuidPrefix_t::is_on_same_process_as( bool GuidPrefix_t::is_from_this_process() const { - return is_on_same_process_as(fastdds::rtps::GuidUtils::instance().prefix()); + return is_on_same_process_as(GuidUtils::instance().prefix()); } } // namsepace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/rtps/common/GuidUtils.hpp b/src/cpp/rtps/common/GuidUtils.hpp index e76d46440f2..61dca2b2913 100644 --- a/src/cpp/rtps/common/GuidUtils.hpp +++ b/src/cpp/rtps/common/GuidUtils.hpp @@ -37,8 +37,6 @@ namespace rtps { */ class GuidUtils { - using GuidPrefix_t = eprosima::fastrtps::rtps::GuidPrefix_t; - using octet = eprosima::fastrtps::rtps::octet; public: diff --git a/src/cpp/rtps/common/LocatorWithMask.cpp b/src/cpp/rtps/common/LocatorWithMask.cpp index 1496c9d4765..48de1780a6d 100644 --- a/src/cpp/rtps/common/LocatorWithMask.cpp +++ b/src/cpp/rtps/common/LocatorWithMask.cpp @@ -68,7 +68,7 @@ LocatorWithMask& LocatorWithMask::operator =( { kind = loc.kind; port = loc.port; - std::memcpy(address, loc.address, 16 * sizeof(fastrtps::rtps::octet)); + std::memcpy(address, loc.address, 16 * sizeof(octet)); return *this; } diff --git a/src/cpp/rtps/common/SerializedPayload.cpp b/src/cpp/rtps/common/SerializedPayload.cpp index e95e72a7e67..7d5064766a9 100644 --- a/src/cpp/rtps/common/SerializedPayload.cpp +++ b/src/cpp/rtps/common/SerializedPayload.cpp @@ -19,7 +19,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { SerializedPayload_t& SerializedPayload_t::operator = ( @@ -144,5 +144,5 @@ void SerializedPayload_t::reserve( } } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/common/Time_t.cpp b/src/cpp/rtps/common/Time_t.cpp index a6a32c1ca6e..020f073953d 100644 --- a/src/cpp/rtps/common/Time_t.cpp +++ b/src/cpp/rtps/common/Time_t.cpp @@ -59,7 +59,7 @@ static void current_time_since_unix_epoch( } // unnamed namespace namespace eprosima { -namespace fastrtps { +namespace fastdds { constexpr int32_t Time_t::INFINITE_SECONDS; constexpr uint32_t Time_t::INFINITE_NANOSECONDS; @@ -142,7 +142,7 @@ Time_t::Time_t( } Time_t::Time_t( - const eprosima::fastrtps::Time_t& time) + const eprosima::fastdds::Time_t& time) { seconds_ = time.seconds; set_nanosec(time.nanosec); @@ -284,5 +284,5 @@ void Time_t::now( } } // namsepace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/rtps/common/Token.cpp b/src/cpp/rtps/common/Token.cpp index dd5e8bbdb44..d0e761dac5e 100644 --- a/src/cpp/rtps/common/Token.cpp +++ b/src/cpp/rtps/common/Token.cpp @@ -18,15 +18,19 @@ #include -using namespace eprosima::fastrtps::rtps; +namespace eprosima { +namespace fastdds { +namespace rtps { -std::string* DataHolderHelper::find_property_value(DataHolder& data_holder, const std::string& name) +std::string* DataHolderHelper::find_property_value( + DataHolder& data_holder, + const std::string& name) { std::string* returnedValue = nullptr; - for(auto property = data_holder.properties().begin(); property != data_holder.properties().end(); ++property) + for (auto property = data_holder.properties().begin(); property != data_holder.properties().end(); ++property) { - if(property->name().compare(name) == 0) + if (property->name().compare(name) == 0) { returnedValue = &property->value(); break; @@ -36,13 +40,15 @@ std::string* DataHolderHelper::find_property_value(DataHolder& data_holder, cons return returnedValue; } -const std::string* DataHolderHelper::find_property_value(const DataHolder& data_holder, const std::string& name) +const std::string* DataHolderHelper::find_property_value( + const DataHolder& data_holder, + const std::string& name) { const std::string* returnedValue = nullptr; - for(auto property = data_holder.properties().begin(); property != data_holder.properties().end(); ++property) + for (auto property = data_holder.properties().begin(); property != data_holder.properties().end(); ++property) { - if(property->name().compare(name) == 0) + if (property->name().compare(name) == 0) { returnedValue = &property->value(); break; @@ -52,13 +58,15 @@ const std::string* DataHolderHelper::find_property_value(const DataHolder& data_ return returnedValue; } -Property* DataHolderHelper::find_property(DataHolder& data_holder, const std::string& name) +Property* DataHolderHelper::find_property( + DataHolder& data_holder, + const std::string& name) { Property* returnedValue = nullptr; - for(auto property = data_holder.properties().begin(); property != data_holder.properties().end(); ++property) + for (auto property = data_holder.properties().begin(); property != data_holder.properties().end(); ++property) { - if(property->name().compare(name) == 0) + if (property->name().compare(name) == 0) { returnedValue = &(*property); break; @@ -68,13 +76,15 @@ Property* DataHolderHelper::find_property(DataHolder& data_holder, const std::st return returnedValue; } -const Property* DataHolderHelper::find_property(const DataHolder& data_holder, const std::string& name) +const Property* DataHolderHelper::find_property( + const DataHolder& data_holder, + const std::string& name) { const Property* returnedValue = nullptr; - for(auto property = data_holder.properties().begin(); property != data_holder.properties().end(); ++property) + for (auto property = data_holder.properties().begin(); property != data_holder.properties().end(); ++property) { - if(property->name().compare(name) == 0) + if (property->name().compare(name) == 0) { returnedValue = &(*property); break; @@ -84,13 +94,16 @@ const Property* DataHolderHelper::find_property(const DataHolder& data_holder, c return returnedValue; } -std::vector* DataHolderHelper::find_binary_property_value(DataHolder& data_holder, const std::string& name) +std::vector* DataHolderHelper::find_binary_property_value( + DataHolder& data_holder, + const std::string& name) { std::vector* returnedValue = nullptr; - for(auto property = data_holder.binary_properties().begin(); property != data_holder.binary_properties().end(); ++property) + for (auto property = data_holder.binary_properties().begin(); property != data_holder.binary_properties().end(); + ++property) { - if(property->name().compare(name) == 0) + if (property->name().compare(name) == 0) { returnedValue = &property->value(); break; @@ -100,13 +113,16 @@ std::vector* DataHolderHelper::find_binary_property_value(DataHolder& d return returnedValue; } -const std::vector* DataHolderHelper::find_binary_property_value(const DataHolder& data_holder, const std::string& name) +const std::vector* DataHolderHelper::find_binary_property_value( + const DataHolder& data_holder, + const std::string& name) { const std::vector* returnedValue = nullptr; - for(auto property = data_holder.binary_properties().begin(); property != data_holder.binary_properties().end(); ++property) + for (auto property = data_holder.binary_properties().begin(); property != data_holder.binary_properties().end(); + ++property) { - if(property->name().compare(name) == 0) + if (property->name().compare(name) == 0) { returnedValue = &property->value(); break; @@ -116,13 +132,16 @@ const std::vector* DataHolderHelper::find_binary_property_value(const D return returnedValue; } -BinaryProperty* DataHolderHelper::find_binary_property(DataHolder& data_holder, const std::string& name) +BinaryProperty* DataHolderHelper::find_binary_property( + DataHolder& data_holder, + const std::string& name) { BinaryProperty* returnedValue = nullptr; - for(auto property = data_holder.binary_properties().begin(); property != data_holder.binary_properties().end(); ++property) + for (auto property = data_holder.binary_properties().begin(); property != data_holder.binary_properties().end(); + ++property) { - if(property->name().compare(name) == 0) + if (property->name().compare(name) == 0) { returnedValue = &(*property); break; @@ -132,13 +151,16 @@ BinaryProperty* DataHolderHelper::find_binary_property(DataHolder& data_holder, return returnedValue; } -const BinaryProperty* DataHolderHelper::find_binary_property(const DataHolder& data_holder, const std::string& name) +const BinaryProperty* DataHolderHelper::find_binary_property( + const DataHolder& data_holder, + const std::string& name) { const BinaryProperty* returnedValue = nullptr; - for(auto property = data_holder.binary_properties().begin(); property != data_holder.binary_properties().end(); ++property) + for (auto property = data_holder.binary_properties().begin(); property != data_holder.binary_properties().end(); + ++property) { - if(property->name().compare(name) == 0) + if (property->name().compare(name) == 0) { returnedValue = &(*property); break; @@ -148,7 +170,9 @@ const BinaryProperty* DataHolderHelper::find_binary_property(const DataHolder& d return returnedValue; } -size_t DataHolderHelper::serialized_size(const DataHolder& data_holder, size_t current_alignment) +size_t DataHolderHelper::serialized_size( + const DataHolder& data_holder, + size_t current_alignment) { size_t initial_alignment = current_alignment; @@ -159,13 +183,21 @@ size_t DataHolderHelper::serialized_size(const DataHolder& data_holder, size_t c return current_alignment - initial_alignment; } -size_t DataHolderHelper::serialized_size(const DataHolderSeq& data_holders, size_t current_alignment) +size_t DataHolderHelper::serialized_size( + const DataHolderSeq& data_holders, + size_t current_alignment) { size_t initial_alignment = current_alignment; current_alignment += 4 + alignment(current_alignment, 4); - for(auto data_holder = data_holders.begin(); data_holder != data_holders.end(); ++data_holder) + for (auto data_holder = data_holders.begin(); data_holder != data_holders.end(); ++data_holder) + { current_alignment += serialized_size(*data_holder, current_alignment); + } return current_alignment - initial_alignment; } + +} // namespace rtps +} // namespace fastdds +} // namespace eprosima diff --git a/src/cpp/rtps/exceptions/Exception.cpp b/src/cpp/rtps/exceptions/Exception.cpp index 9703069fe25..aa0f58803ad 100644 --- a/src/cpp/rtps/exceptions/Exception.cpp +++ b/src/cpp/rtps/exceptions/Exception.cpp @@ -14,7 +14,9 @@ #include "Exception.h" -using namespace eprosima::fastrtps::rtps; +namespace eprosima { +namespace fastdds { +namespace rtps { Exception::Exception( const char* const& message) @@ -80,3 +82,7 @@ const char* Exception::what() const throw() { return message_.c_str(); } + +} // namespace rtps +} // namespace fastdds +} // namespace eprosima diff --git a/src/cpp/rtps/exceptions/Exception.h b/src/cpp/rtps/exceptions/Exception.h index 81eefd68ed7..0c27200bfcb 100644 --- a/src/cpp/rtps/exceptions/Exception.h +++ b/src/cpp/rtps/exceptions/Exception.h @@ -23,7 +23,7 @@ #undef minor namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** @@ -116,7 +116,7 @@ class Exception : public std::exception }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _FASTDDS_RTPS_EXCEPTIONS_EXCEPTION_H_ diff --git a/src/cpp/rtps/flowcontrol/FlowController.hpp b/src/cpp/rtps/flowcontrol/FlowController.hpp index 0f4605956d6..959f10af07b 100644 --- a/src/cpp/rtps/flowcontrol/FlowController.hpp +++ b/src/cpp/rtps/flowcontrol/FlowController.hpp @@ -5,15 +5,10 @@ namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSWriter; struct CacheChange_t; -} // namespace rtps -} // namespace fastrtps - -namespace fastdds { -namespace rtps { /*! * Interface used by writers to control the usage of network bandwidth. @@ -38,7 +33,7 @@ class FlowController * @param writer Pointer to the writer to be registered. Cannot be nullptr. */ virtual void register_writer( - fastrtps::rtps::RTPSWriter* writer) = 0; + fastdds::rtps::RTPSWriter* writer) = 0; /*! * Unregister a writer. @@ -47,7 +42,7 @@ class FlowController * @param writer Pointer to the writer to be unregistered. Cannot be nullptr. */ virtual void unregister_writer( - fastrtps::rtps::RTPSWriter* writer) = 0; + fastdds::rtps::RTPSWriter* writer) = 0; /*! * Adds a CacheChange_t to be managed by this object. @@ -60,8 +55,8 @@ class FlowController * @return true if the sample could be added. false otherwise. */ virtual bool add_new_sample( - fastrtps::rtps::RTPSWriter* writer, - fastrtps::rtps::CacheChange_t* change, + fastdds::rtps::RTPSWriter* writer, + fastdds::rtps::CacheChange_t* change, const std::chrono::time_point& max_blocking_time) = 0; /*! @@ -74,8 +69,8 @@ class FlowController * @return true if the sample could be added. false otherwise. */ virtual bool add_old_sample( - fastrtps::rtps::RTPSWriter* writer, - fastrtps::rtps::CacheChange_t* change) = 0; + fastdds::rtps::RTPSWriter* writer, + fastdds::rtps::CacheChange_t* change) = 0; /*! * If the CacheChange_t is currently managed by this object, remove it. @@ -86,7 +81,7 @@ class FlowController * @return true if the sample could be removed. false otherwise. */ virtual bool remove_change( - fastrtps::rtps::CacheChange_t* change, + fastdds::rtps::CacheChange_t* change, const std::chrono::time_point& max_blocking_time) = 0; /*! diff --git a/src/cpp/rtps/flowcontrol/FlowControllerFactory.cpp b/src/cpp/rtps/flowcontrol/FlowControllerFactory.cpp index 80541158a1a..c92b4de796d 100644 --- a/src/cpp/rtps/flowcontrol/FlowControllerFactory.cpp +++ b/src/cpp/rtps/flowcontrol/FlowControllerFactory.cpp @@ -8,7 +8,7 @@ namespace fastdds { namespace rtps { void FlowControllerFactory::init( - fastrtps::rtps::RTPSParticipantImpl* participant) + fastdds::rtps::RTPSParticipantImpl* participant) { participant_ = participant; // Create default flow controllers. @@ -150,16 +150,16 @@ void FlowControllerFactory::register_flow_controller ( */ FlowController* FlowControllerFactory::retrieve_flow_controller( const std::string& flow_controller_name, - const fastrtps::rtps::WriterAttributes& writer_attributes) + const fastdds::rtps::WriterAttributes& writer_attributes) { FlowController* returned_flow = nullptr; // Detect it has to be returned a default flow_controller. if (0 == flow_controller_name.compare(FASTDDS_FLOW_CONTROLLER_DEFAULT)) { - if (fastrtps::rtps::SYNCHRONOUS_WRITER == writer_attributes.mode) + if (fastdds::rtps::SYNCHRONOUS_WRITER == writer_attributes.mode) { - if (fastrtps::rtps::BEST_EFFORT == writer_attributes.endpoint.reliabilityKind) + if (fastdds::rtps::BEST_EFFORT == writer_attributes.endpoint.reliabilityKind) { returned_flow = flow_controllers_[pure_sync_flow_controller_name].get(); } @@ -176,7 +176,7 @@ FlowController* FlowControllerFactory::retrieve_flow_controller( #ifdef FASTDDS_STATISTICS else if (0 == flow_controller_name.compare(FASTDDS_STATISTICS_FLOW_CONTROLLER_DEFAULT)) { - assert(fastrtps::rtps::ASYNCHRONOUS_WRITER == writer_attributes.mode); + assert(fastdds::rtps::ASYNCHRONOUS_WRITER == writer_attributes.mode); returned_flow = flow_controllers_[async_statistics_flow_controller_name].get(); } #endif // ifdef FASTDDS_STATISTICS diff --git a/src/cpp/rtps/flowcontrol/FlowControllerFactory.hpp b/src/cpp/rtps/flowcontrol/FlowControllerFactory.hpp index 34271a55ec0..db8ca8a2883 100644 --- a/src/cpp/rtps/flowcontrol/FlowControllerFactory.hpp +++ b/src/cpp/rtps/flowcontrol/FlowControllerFactory.hpp @@ -10,15 +10,9 @@ namespace eprosima { -namespace fastrtps { -namespace rtps { -class RTPSParticipantImpl; -} // namespace rtps -} // namespace fastrtps - namespace fastdds { namespace rtps { - +class RTPSParticipantImpl; class FlowController; const char* const pure_sync_flow_controller_name = "PureSyncFlowController"; @@ -45,7 +39,7 @@ class FlowControllerFactory * @param participant Pointer to the participant owner of this object. */ void init( - fastrtps::rtps::RTPSParticipantImpl* participant); + fastdds::rtps::RTPSParticipantImpl* participant); /*! * Registers a new flow controller. @@ -64,11 +58,11 @@ class FlowControllerFactory */ FlowController* retrieve_flow_controller( const std::string& flow_controller_name, - const fastrtps::rtps::WriterAttributes& writer_attributes); + const fastdds::rtps::WriterAttributes& writer_attributes); private: - fastrtps::rtps::RTPSParticipantImpl* participant_ = nullptr; + fastdds::rtps::RTPSParticipantImpl* participant_ = nullptr; //! Stores the created flow controllers. std::map> flow_controllers_; diff --git a/src/cpp/rtps/flowcontrol/FlowControllerImpl.hpp b/src/cpp/rtps/flowcontrol/FlowControllerImpl.hpp index bbe1af9d51d..6fe498e979c 100644 --- a/src/cpp/rtps/flowcontrol/FlowControllerImpl.hpp +++ b/src/cpp/rtps/flowcontrol/FlowControllerImpl.hpp @@ -64,18 +64,18 @@ struct FlowQueue } void add_new_sample( - fastrtps::rtps::CacheChange_t* change) noexcept + CacheChange_t* change) noexcept { new_interested_.add_change(change); } void add_old_sample( - fastrtps::rtps::CacheChange_t* change) noexcept + CacheChange_t* change) noexcept { old_interested_.add_change(change); } - fastrtps::rtps::CacheChange_t* get_next_change() noexcept + CacheChange_t* get_next_change() noexcept { if (!is_empty()) { @@ -133,7 +133,7 @@ struct FlowQueue } void add_change( - fastrtps::rtps::CacheChange_t* change) noexcept + CacheChange_t* change) noexcept { bool expected = false; if (change->writer_info.is_linked.compare_exchange_strong(expected, true)) @@ -150,8 +150,8 @@ struct FlowQueue { if (!list.is_empty()) { - fastrtps::rtps::CacheChange_t* first = list.head.writer_info.next; - fastrtps::rtps::CacheChange_t* last = list.tail.writer_info.previous; + CacheChange_t* first = list.head.writer_info.next; + CacheChange_t* last = list.tail.writer_info.previous; first->writer_info.previous = tail.writer_info.previous; first->writer_info.previous->writer_info.next = first; @@ -162,8 +162,8 @@ struct FlowQueue } } - fastrtps::rtps::CacheChange_t head; - fastrtps::rtps::CacheChange_t tail; + CacheChange_t head; + CacheChange_t tail; }; //! List of interested new changes to be included. @@ -190,7 +190,7 @@ struct FlowControllerPureSyncPublishMode { FlowControllerPureSyncPublishMode( - fastrtps::rtps::RTPSParticipantImpl*, + RTPSParticipantImpl*, const FlowControllerDescriptor*) { } @@ -201,7 +201,7 @@ struct FlowControllerPureSyncPublishMode struct FlowControllerAsyncPublishMode { FlowControllerAsyncPublishMode( - fastrtps::rtps::RTPSParticipantImpl* participant, + RTPSParticipantImpl* participant, const FlowControllerDescriptor*) : group(participant, true) { @@ -212,7 +212,7 @@ struct FlowControllerAsyncPublishMode if (running) { { - std::unique_lock lock(changes_interested_mutex); + std::unique_lock lock(changes_interested_mutex); running = false; cv.notify_one(); } @@ -221,13 +221,13 @@ struct FlowControllerAsyncPublishMode } bool fast_check_is_there_slot_for_change( - fastrtps::rtps::CacheChange_t*) const + CacheChange_t*) const { return true; } bool wait( - std::unique_lock& lock) + std::unique_lock& lock) { cv.wait(lock); return false; @@ -239,7 +239,7 @@ struct FlowControllerAsyncPublishMode } void process_deliver_retcode( - const fastrtps::rtps::DeliveryRetCode&) + const DeliveryRetCode&) { } @@ -247,12 +247,12 @@ struct FlowControllerAsyncPublishMode std::atomic_bool running {false}; - fastrtps::TimedConditionVariable cv; + fastdds::TimedConditionVariable cv; - fastrtps::rtps::RTPSMessageGroup group; + RTPSMessageGroup group; //! Mutex for interested samples to be added. - fastrtps::TimedMutex changes_interested_mutex; + fastdds::TimedMutex changes_interested_mutex; //! Used to warning async thread a writer wants to remove a sample. std::atomic writers_interested_in_remove = {0}; @@ -263,7 +263,7 @@ struct FlowControllerSyncPublishMode : public FlowControllerPureSyncPublishMode, { FlowControllerSyncPublishMode( - fastrtps::rtps::RTPSParticipantImpl* participant, + RTPSParticipantImpl* participant, const FlowControllerDescriptor* descriptor) : FlowControllerPureSyncPublishMode(participant, descriptor) , FlowControllerAsyncPublishMode(participant, descriptor) @@ -276,7 +276,7 @@ struct FlowControllerSyncPublishMode : public FlowControllerPureSyncPublishMode, struct FlowControllerLimitedAsyncPublishMode : public FlowControllerAsyncPublishMode { FlowControllerLimitedAsyncPublishMode( - fastrtps::rtps::RTPSParticipantImpl* participant, + RTPSParticipantImpl* participant, const FlowControllerDescriptor* descriptor) : FlowControllerAsyncPublishMode(participant, descriptor) { @@ -289,7 +289,7 @@ struct FlowControllerLimitedAsyncPublishMode : public FlowControllerAsyncPublish } bool fast_check_is_there_slot_for_change( - fastrtps::rtps::CacheChange_t* change) + CacheChange_t* change) { // Not fragmented sample, the fast check is if the serialized payload fit. uint32_t size_to_check = change->serializedPayload.length; @@ -324,7 +324,7 @@ struct FlowControllerLimitedAsyncPublishMode : public FlowControllerAsyncPublish * @return false if the condition_variable was awaken because a new change was added. true if the condition_variable was awaken because the bandwidth limitation has to be reset. */ bool wait( - std::unique_lock& lock) + std::unique_lock& lock) { auto lapse = std::chrono::steady_clock::now() - last_period_; bool reset_limit = true; @@ -353,9 +353,9 @@ struct FlowControllerLimitedAsyncPublishMode : public FlowControllerAsyncPublish } void process_deliver_retcode( - const fastrtps::rtps::DeliveryRetCode& ret_value) + const DeliveryRetCode& ret_value) { - if (fastrtps::rtps::DeliveryRetCode::EXCEEDED_LIMIT == ret_value) + if (DeliveryRetCode::EXCEEDED_LIMIT == ret_value) { force_wait_ = true; } @@ -379,12 +379,12 @@ struct FlowControllerLimitedAsyncPublishMode : public FlowControllerAsyncPublish struct FlowControllerFifoSchedule { void register_writer( - fastrtps::rtps::RTPSWriter*) const + RTPSWriter*) const { } void unregister_writer( - fastrtps::rtps::RTPSWriter*) const + RTPSWriter*) const { } @@ -394,15 +394,15 @@ struct FlowControllerFifoSchedule } void add_new_sample( - fastrtps::rtps::RTPSWriter*, - fastrtps::rtps::CacheChange_t* change) + RTPSWriter*, + CacheChange_t* change) { queue_.add_new_sample(change); } void add_old_sample( - fastrtps::rtps::RTPSWriter*, - fastrtps::rtps::CacheChange_t* change) + RTPSWriter*, + CacheChange_t* change) { queue_.add_old_sample(change); } @@ -415,7 +415,7 @@ struct FlowControllerFifoSchedule * @return Pointer to next change to be sent. nullptr implies there is no sample to be sent or is forbidden due to * bandwidth exceeded. */ - fastrtps::rtps::CacheChange_t* get_next_change_nts() + CacheChange_t* get_next_change_nts() { return queue_.get_next_change(); } @@ -449,7 +449,7 @@ struct FlowControllerFifoSchedule //! Round Robin scheduling struct FlowControllerRoundRobinSchedule { - using element = std::tuple; + using element = std::tuple; using container = std::vector; using iterator = container::iterator; @@ -459,9 +459,9 @@ struct FlowControllerRoundRobinSchedule } void register_writer( - fastrtps::rtps::RTPSWriter* writer) + RTPSWriter* writer) { - fastrtps::rtps::RTPSWriter* current_writer = nullptr; + RTPSWriter* current_writer = nullptr; if (writers_queue_.end() != next_writer_) { @@ -482,11 +482,11 @@ struct FlowControllerRoundRobinSchedule } void unregister_writer( - fastrtps::rtps::RTPSWriter* writer) + RTPSWriter* writer) { // Queue cannot be empty, as writer should be present assert(writers_queue_.end() != next_writer_); - fastrtps::rtps::RTPSWriter* current_writer = std::get<0>(*next_writer_); + RTPSWriter* current_writer = std::get<0>(*next_writer_); assert(nullptr != current_writer); auto it = find(writer); @@ -526,8 +526,8 @@ struct FlowControllerRoundRobinSchedule } void add_new_sample( - fastrtps::rtps::RTPSWriter* writer, - fastrtps::rtps::CacheChange_t* change) + RTPSWriter* writer, + CacheChange_t* change) { auto it = find(writer); assert(it != writers_queue_.end()); @@ -535,17 +535,17 @@ struct FlowControllerRoundRobinSchedule } void add_old_sample( - fastrtps::rtps::RTPSWriter* writer, - fastrtps::rtps::CacheChange_t* change) + RTPSWriter* writer, + CacheChange_t* change) { auto it = find(writer); assert(it != writers_queue_.end()); std::get<1>(*it).add_old_sample(change); } - fastrtps::rtps::CacheChange_t* get_next_change_nts() + CacheChange_t* get_next_change_nts() { - fastrtps::rtps::CacheChange_t* ret_change = nullptr; + CacheChange_t* ret_change = nullptr; if (0 < writers_queue_.size()) { @@ -581,7 +581,7 @@ struct FlowControllerRoundRobinSchedule private: iterator find( - const fastrtps::rtps::RTPSWriter* writer) + const RTPSWriter* writer) { return std::find_if(writers_queue_.begin(), writers_queue_.end(), [writer](const element& current_writer) -> bool @@ -599,11 +599,11 @@ struct FlowControllerRoundRobinSchedule struct FlowControllerHighPrioritySchedule { void register_writer( - fastrtps::rtps::RTPSWriter* writer) + RTPSWriter* writer) { assert(nullptr != writer); int32_t priority = 10; - auto property = fastrtps::rtps::PropertyPolicyHelper::find_property( + auto property = PropertyPolicyHelper::find_property( writer->getAttributes().properties, "fastdds.sfc.priority"); if (nullptr != property) @@ -638,7 +638,7 @@ struct FlowControllerHighPrioritySchedule } void unregister_writer( - fastrtps::rtps::RTPSWriter* writer) + RTPSWriter* writer) { auto it = priorities_.find(writer); assert(it != priorities_.end()); @@ -651,22 +651,22 @@ struct FlowControllerHighPrioritySchedule } void add_new_sample( - fastrtps::rtps::RTPSWriter* writer, - fastrtps::rtps::CacheChange_t* change) + RTPSWriter* writer, + CacheChange_t* change) { find_queue(writer).add_new_sample(change); } void add_old_sample( - fastrtps::rtps::RTPSWriter* writer, - fastrtps::rtps::CacheChange_t* change) + RTPSWriter* writer, + CacheChange_t* change) { find_queue(writer).add_old_sample(change); } - fastrtps::rtps::CacheChange_t* get_next_change_nts() + CacheChange_t* get_next_change_nts() { - fastrtps::rtps::CacheChange_t* ret_change = nullptr; + CacheChange_t* ret_change = nullptr; if (0 < writers_queue_.size()) { @@ -700,7 +700,7 @@ struct FlowControllerHighPrioritySchedule private: FlowQueue& find_queue( - fastrtps::rtps::RTPSWriter* writer) + RTPSWriter* writer) { // Find priority. auto priority_it = priorities_.find(writer); @@ -712,18 +712,18 @@ struct FlowControllerHighPrioritySchedule std::map writers_queue_; - std::unordered_map priorities_; + std::unordered_map priorities_; }; //! Priority with reservation scheduling struct FlowControllerPriorityWithReservationSchedule { void register_writer( - fastrtps::rtps::RTPSWriter* writer) + RTPSWriter* writer) { assert(nullptr != writer); int32_t priority = 10; - auto property = fastrtps::rtps::PropertyPolicyHelper::find_property( + auto property = PropertyPolicyHelper::find_property( writer->getAttributes().properties, "fastdds.sfc.priority"); if (nullptr != property) @@ -749,7 +749,7 @@ struct FlowControllerPriorityWithReservationSchedule } uint32_t reservation = 0; - property = fastrtps::rtps::PropertyPolicyHelper::find_property( + property = PropertyPolicyHelper::find_property( writer->getAttributes().properties, "fastdds.sfc.bandwidth_reservation"); if (nullptr != property) @@ -786,7 +786,7 @@ struct FlowControllerPriorityWithReservationSchedule } void unregister_writer( - fastrtps::rtps::RTPSWriter* writer) + RTPSWriter* writer) { auto it = writers_queue_.find(writer); assert(it != writers_queue_.end()); @@ -812,8 +812,8 @@ struct FlowControllerPriorityWithReservationSchedule } void add_new_sample( - fastrtps::rtps::RTPSWriter* writer, - fastrtps::rtps::CacheChange_t* change) + RTPSWriter* writer, + CacheChange_t* change) { // Find writer queue.. auto it = writers_queue_.find(writer); @@ -822,8 +822,8 @@ struct FlowControllerPriorityWithReservationSchedule } void add_old_sample( - fastrtps::rtps::RTPSWriter* writer, - fastrtps::rtps::CacheChange_t* change) + RTPSWriter* writer, + CacheChange_t* change) { // Find writer queue.. auto it = writers_queue_.find(writer); @@ -831,10 +831,10 @@ struct FlowControllerPriorityWithReservationSchedule std::get<0>(it->second).add_old_sample(change); } - fastrtps::rtps::CacheChange_t* get_next_change_nts() + CacheChange_t* get_next_change_nts() { - fastrtps::rtps::CacheChange_t* highest_priority = nullptr; - fastrtps::rtps::CacheChange_t* ret_change = nullptr; + CacheChange_t* highest_priority = nullptr; + CacheChange_t* ret_change = nullptr; if (0 < writers_queue_.size()) { @@ -843,7 +843,7 @@ struct FlowControllerPriorityWithReservationSchedule for (auto writer_it : priority.second) { auto writer = writers_queue_.find(writer_it); - fastrtps::rtps::CacheChange_t* change = std::get<0>(writer->second).get_next_change(); + CacheChange_t* change = std::get<0>(writer->second).get_next_change(); if (nullptr == highest_priority) { @@ -905,10 +905,10 @@ struct FlowControllerPriorityWithReservationSchedule private: - using map_writers = std::unordered_map>; - using map_priorities = std::map>; + using map_priorities = std::map>; map_writers writers_queue_; @@ -916,7 +916,7 @@ struct FlowControllerPriorityWithReservationSchedule uint32_t bandwidth_limit_ = 0; - fastrtps::rtps::RTPSWriter* writer_being_processed_ = nullptr; + RTPSWriter* writer_being_processed_ = nullptr; uint32_t size_being_processed_ = 0; }; @@ -930,7 +930,7 @@ class FlowControllerImpl : public FlowController public: FlowControllerImpl( - fastrtps::rtps::RTPSParticipantImpl* participant, + RTPSParticipantImpl* participant, const FlowControllerDescriptor* descriptor, uint32_t async_index, ThreadSettings thread_settings) @@ -972,9 +972,9 @@ class FlowControllerImpl : public FlowController * @param writer Pointer to the writer to be registered. Cannot be nullptr. */ void register_writer( - fastrtps::rtps::RTPSWriter* writer) override + RTPSWriter* writer) override { - std::unique_lock lock(mutex_); + std::unique_lock lock(mutex_); auto ret = writers_.insert({ writer->getGuid(), writer}); (void)ret; assert(ret.second); @@ -987,9 +987,9 @@ class FlowControllerImpl : public FlowController * @param writer Pointer to the writer to be unregistered. Cannot be nullptr. */ void unregister_writer( - fastrtps::rtps::RTPSWriter* writer) override + RTPSWriter* writer) override { - std::unique_lock lock(mutex_); + std::unique_lock lock(mutex_); writers_.erase(writer->getGuid()); unregister_writer_impl(writer); } @@ -1005,8 +1005,8 @@ class FlowControllerImpl : public FlowController * @return true if sample could be added. false in other case. */ bool add_new_sample( - fastrtps::rtps::RTPSWriter* writer, - fastrtps::rtps::CacheChange_t* change, + RTPSWriter* writer, + CacheChange_t* change, const std::chrono::time_point& max_blocking_time) override { return add_new_sample_impl(writer, change, max_blocking_time); @@ -1022,8 +1022,8 @@ class FlowControllerImpl : public FlowController * @return true if sample could be added. false in other case. */ bool add_old_sample( - fastrtps::rtps::RTPSWriter* writer, - fastrtps::rtps::CacheChange_t* change) override + RTPSWriter* writer, + CacheChange_t* change) override { return add_old_sample_impl(writer, change, std::chrono::steady_clock::now() + std::chrono::hours(24)); @@ -1038,7 +1038,7 @@ class FlowControllerImpl : public FlowController * @return true if the sample could be removed. false otherwise. */ bool remove_change( - fastrtps::rtps::CacheChange_t* change, + CacheChange_t* change, const std::chrono::time_point& max_blocking_time) override { assert(nullptr != change); @@ -1083,16 +1083,16 @@ class FlowControllerImpl : public FlowController template typename std::enable_if::value, void>::type register_writer_impl( - fastrtps::rtps::RTPSWriter* writer) + RTPSWriter* writer) { - std::unique_lock in_lock(async_mode.changes_interested_mutex); + std::unique_lock in_lock(async_mode.changes_interested_mutex); sched.register_writer(writer); } template typename std::enable_if::value, void>::type register_writer_impl( - fastrtps::rtps::RTPSWriter*) + RTPSWriter*) { // Do nothing. } @@ -1100,16 +1100,16 @@ class FlowControllerImpl : public FlowController template typename std::enable_if::value, void>::type unregister_writer_impl( - fastrtps::rtps::RTPSWriter* writer) + RTPSWriter* writer) { - std::unique_lock in_lock(async_mode.changes_interested_mutex); + std::unique_lock in_lock(async_mode.changes_interested_mutex); sched.unregister_writer(writer); } template typename std::enable_if::value, void>::type unregister_writer_impl( - fastrtps::rtps::RTPSWriter*) + RTPSWriter*) { // Do nothing. } @@ -1122,19 +1122,19 @@ class FlowControllerImpl : public FlowController template typename std::enable_if::value, bool>::type enqueue_new_sample_impl( - fastrtps::rtps::RTPSWriter* writer, - fastrtps::rtps::CacheChange_t* change, + RTPSWriter* writer, + CacheChange_t* change, const std::chrono::time_point& max_blocking_time) { bool ret_value = false; assert(!change->writer_info.is_linked.load()); // Sync delivery failed. Try to store for asynchronous delivery. #if HAVE_STRICT_REALTIME - std::unique_lock lock(async_mode.changes_interested_mutex, std::defer_lock); + std::unique_lock lock(async_mode.changes_interested_mutex, std::defer_lock); if (lock.try_lock_until(max_blocking_time)) #else static_cast(max_blocking_time); - std::unique_lock lock(async_mode.changes_interested_mutex); + std::unique_lock lock(async_mode.changes_interested_mutex); #endif // if HAVE_STRICT_REALTIME{ { sched.add_new_sample(writer, change); @@ -1151,8 +1151,8 @@ class FlowControllerImpl : public FlowController template typename std::enable_if::value, bool>::type constexpr enqueue_new_sample_impl( - fastrtps::rtps::RTPSWriter*, - fastrtps::rtps::CacheChange_t*, + RTPSWriter*, + CacheChange_t*, const std::chrono::time_point&) const { // Do nothing. Return false. @@ -1169,31 +1169,31 @@ class FlowControllerImpl : public FlowController template typename std::enable_if::value, bool>::type add_new_sample_impl( - fastrtps::rtps::RTPSWriter* writer, - fastrtps::rtps::CacheChange_t* change, + RTPSWriter* writer, + CacheChange_t* change, const std::chrono::time_point& max_blocking_time) { bool ret_value = false; // This call should be made with writer's mutex locked. - fastrtps::rtps::LocatorSelectorSender& locator_selector = writer->get_general_locator_selector(); + LocatorSelectorSender& locator_selector = writer->get_general_locator_selector(); #if HAVE_STRICT_REALTIME - std::unique_lock lock(locator_selector, std::defer_lock); + std::unique_lock lock(locator_selector, std::defer_lock); if (lock.try_lock_until(max_blocking_time)) #else - std::unique_lock lock(locator_selector); + std::unique_lock lock(locator_selector); #endif // if HAVE_STRICT_REALTIME{ { try { - fastrtps::rtps::RTPSMessageGroup group(participant_, writer, &locator_selector, max_blocking_time); + RTPSMessageGroup group(participant_, writer, &locator_selector, max_blocking_time); ret_value = true; - if (fastrtps::rtps::DeliveryRetCode::DELIVERED != + if (DeliveryRetCode::DELIVERED != writer->deliver_sample_nts(change, group, locator_selector, max_blocking_time)) { ret_value = enqueue_new_sample_impl(writer, change, max_blocking_time); } } - catch (fastrtps::rtps::RTPSMessageGroup::timeout&) + catch (RTPSMessageGroup::timeout&) { } } @@ -1207,8 +1207,8 @@ class FlowControllerImpl : public FlowController template typename std::enable_if::value, bool>::type add_new_sample_impl( - fastrtps::rtps::RTPSWriter* writer, - fastrtps::rtps::CacheChange_t* change, + RTPSWriter* writer, + CacheChange_t* change, const std::chrono::time_point& max_blocking_time) { return enqueue_new_sample_impl(writer, change, max_blocking_time); @@ -1222,8 +1222,8 @@ class FlowControllerImpl : public FlowController template typename std::enable_if::value, bool>::type add_old_sample_impl( - fastrtps::rtps::RTPSWriter* writer, - fastrtps::rtps::CacheChange_t* change, + RTPSWriter* writer, + CacheChange_t* change, const std::chrono::time_point& max_blocking_time) { bool ret_value = false; @@ -1231,11 +1231,11 @@ class FlowControllerImpl : public FlowController if (!change->writer_info.is_linked.load()) { #if HAVE_STRICT_REALTIME - std::unique_lock lock(async_mode.changes_interested_mutex, std::defer_lock); + std::unique_lock lock(async_mode.changes_interested_mutex, std::defer_lock); if (lock.try_lock_until(max_blocking_time)) #else static_cast(max_blocking_time); - std::unique_lock lock(async_mode.changes_interested_mutex); + std::unique_lock lock(async_mode.changes_interested_mutex); #endif // if HAVE_STRICT_REALTIME{ { sched.add_old_sample(writer, change); @@ -1253,8 +1253,8 @@ class FlowControllerImpl : public FlowController template typename std::enable_if::value, bool>::type constexpr add_old_sample_impl( - fastrtps::rtps::RTPSWriter*, - fastrtps::rtps::CacheChange_t*, + RTPSWriter*, + CacheChange_t*, const std::chrono::time_point&) const { return false; @@ -1268,7 +1268,7 @@ class FlowControllerImpl : public FlowController template typename std::enable_if::value, bool>::type remove_change_impl( - fastrtps::rtps::CacheChange_t* change, + CacheChange_t* change, const std::chrono::time_point& max_blocking_time) { bool ret_value = true; @@ -1276,19 +1276,19 @@ class FlowControllerImpl : public FlowController { ++async_mode.writers_interested_in_remove; #if HAVE_STRICT_REALTIME - std::unique_lock lock(mutex_, std::defer_lock); + std::unique_lock lock(mutex_, std::defer_lock); if (lock.try_lock_until(max_blocking_time)) #else static_cast(max_blocking_time); - std::unique_lock lock(mutex_); + std::unique_lock lock(mutex_); #endif // if HAVE_STRICT_REALTIME { #if HAVE_STRICT_REALTIME - std::unique_lock interested_lock(async_mode.changes_interested_mutex, + std::unique_lock interested_lock(async_mode.changes_interested_mutex, std::defer_lock); if (interested_lock.try_lock_until(max_blocking_time)) #else - std::unique_lock interested_lock(async_mode.changes_interested_mutex); + std::unique_lock interested_lock(async_mode.changes_interested_mutex); #endif // if HAVE_STRICT_REALTIME { @@ -1333,7 +1333,7 @@ class FlowControllerImpl : public FlowController template typename std::enable_if::value, bool>::type remove_change_impl( - fastrtps::rtps::CacheChange_t*, + CacheChange_t*, const std::chrono::time_point&) { // Do nothing. @@ -1353,12 +1353,12 @@ class FlowControllerImpl : public FlowController continue; } - std::unique_lock lock(mutex_); - fastrtps::rtps::CacheChange_t* change_to_process = nullptr; + std::unique_lock lock(mutex_); + CacheChange_t* change_to_process = nullptr; //Check if we have to sleep. { - std::unique_lock in_lock(async_mode.changes_interested_mutex); + std::unique_lock in_lock(async_mode.changes_interested_mutex); // Add interested changes into the queue. sched.add_interested_changes_to_queue_nts(); @@ -1381,7 +1381,7 @@ class FlowControllerImpl : public FlowController } } - fastrtps::rtps::RTPSWriter* current_writer = nullptr; + RTPSWriter* current_writer = nullptr; while (nullptr != change_to_process) { // Fast check if next change will enter. @@ -1403,26 +1403,26 @@ class FlowControllerImpl : public FlowController break; } - fastrtps::rtps::LocatorSelectorSender& locator_selector = + LocatorSelectorSender& locator_selector = current_writer->get_async_locator_selector(); async_mode.group.sender(current_writer, &locator_selector); locator_selector.lock(); // Remove previously from queue, because deliver_sample_nts could call FlowController::remove_sample() // provoking a deadlock. - fastrtps::rtps::CacheChange_t* previous = change_to_process->writer_info.previous; - fastrtps::rtps::CacheChange_t* next = change_to_process->writer_info.next; + CacheChange_t* previous = change_to_process->writer_info.previous; + CacheChange_t* next = change_to_process->writer_info.next; previous->writer_info.next = next; next->writer_info.previous = previous; change_to_process->writer_info.previous = nullptr; change_to_process->writer_info.next = nullptr; change_to_process->writer_info.is_linked.store(false); - fastrtps::rtps::DeliveryRetCode ret_delivery = current_writer->deliver_sample_nts( + DeliveryRetCode ret_delivery = current_writer->deliver_sample_nts( change_to_process, async_mode.group, locator_selector, std::chrono::steady_clock::now() + std::chrono::hours(24)); - if (fastrtps::rtps::DeliveryRetCode::DELIVERED != ret_delivery) + if (DeliveryRetCode::DELIVERED != ret_delivery) { // If delivery fails, put the change again in the queue. change_to_process->writer_info.is_linked.store(true); @@ -1452,7 +1452,7 @@ class FlowControllerImpl : public FlowController // Add interested changes into the queue. { - std::unique_lock in_lock(async_mode.changes_interested_mutex); + std::unique_lock in_lock(async_mode.changes_interested_mutex); sched.add_interested_changes_to_queue_nts(); } @@ -1477,11 +1477,11 @@ class FlowControllerImpl : public FlowController return (std::numeric_limits::max)(); } - fastrtps::TimedMutex mutex_; + fastdds::TimedMutex mutex_; - fastrtps::rtps::RTPSParticipantImpl* participant_ = nullptr; + RTPSParticipantImpl* participant_ = nullptr; - std::map writers_; + std::map writers_; scheduler sched; diff --git a/src/cpp/rtps/history/BasicPayloadPool.hpp b/src/cpp/rtps/history/BasicPayloadPool.hpp index 671f8ac7ad1..4a86ec36496 100644 --- a/src/cpp/rtps/history/BasicPayloadPool.hpp +++ b/src/cpp/rtps/history/BasicPayloadPool.hpp @@ -28,7 +28,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace detail { @@ -104,7 +104,7 @@ class BasicPayloadPool }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // RTPS_HISTORY_BASICPAYLOADPOOL_HPP diff --git a/src/cpp/rtps/history/CacheChangePool.cpp b/src/cpp/rtps/history/CacheChangePool.cpp index d18614d8a86..1257f407e43 100644 --- a/src/cpp/rtps/history/CacheChangePool.cpp +++ b/src/cpp/rtps/history/CacheChangePool.cpp @@ -28,7 +28,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { CacheChangePool::~CacheChangePool() @@ -259,5 +259,5 @@ bool CacheChangePool::release_cache( } } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/history/CacheChangePool.h b/src/cpp/rtps/history/CacheChangePool.h index b55ec239e35..ac7f6148b2c 100644 --- a/src/cpp/rtps/history/CacheChangePool.h +++ b/src/cpp/rtps/history/CacheChangePool.h @@ -31,7 +31,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** @@ -131,7 +131,7 @@ class CacheChangePool : public IChangePool }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif /* RTPS_HISTORY_CACHECHANGEPOOL_H_ */ diff --git a/src/cpp/rtps/history/History.cpp b/src/cpp/rtps/history/History.cpp index 8d87f2eab50..14e2e5f0085 100644 --- a/src/cpp/rtps/history/History.cpp +++ b/src/cpp/rtps/history/History.cpp @@ -29,7 +29,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { History::History( @@ -269,7 +269,7 @@ History::iterator History::remove_iterator_constness( } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima @@ -277,7 +277,7 @@ History::iterator History::remove_iterator_constness( #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { void History::print_changes_seqNum2() diff --git a/src/cpp/rtps/history/HistoryAttributesExtension.hpp b/src/cpp/rtps/history/HistoryAttributesExtension.hpp index 455473a1746..9043b93a056 100644 --- a/src/cpp/rtps/history/HistoryAttributesExtension.hpp +++ b/src/cpp/rtps/history/HistoryAttributesExtension.hpp @@ -26,7 +26,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { static inline ResourceLimitedContainerConfig resource_limits_from_history( @@ -50,7 +50,7 @@ static inline ResourceLimitedContainerConfig resource_limits_from_history( } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/src/cpp/rtps/history/ITopicPayloadPool.h b/src/cpp/rtps/history/ITopicPayloadPool.h index b09b52cdf95..c6679e99160 100644 --- a/src/cpp/rtps/history/ITopicPayloadPool.h +++ b/src/cpp/rtps/history/ITopicPayloadPool.h @@ -23,7 +23,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class ITopicPayloadPool : public IPayloadPool @@ -89,7 +89,7 @@ class ITopicPayloadPool : public IPayloadPool }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/rtps/history/PoolConfig.h b/src/cpp/rtps/history/PoolConfig.h index 878ce087b9c..8120bb27d5d 100644 --- a/src/cpp/rtps/history/PoolConfig.h +++ b/src/cpp/rtps/history/PoolConfig.h @@ -23,7 +23,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { struct BasicPoolConfig @@ -86,7 +86,7 @@ struct PoolConfig : public BasicPoolConfig }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif /* RTPS_HISTORY_POOLCONFIG_H_ */ diff --git a/src/cpp/rtps/history/ReaderHistory.cpp b/src/cpp/rtps/history/ReaderHistory.cpp index 4650b35965e..d7dedb2dd04 100644 --- a/src/cpp/rtps/history/ReaderHistory.cpp +++ b/src/cpp/rtps/history/ReaderHistory.cpp @@ -31,7 +31,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { using BaseReader = fastdds::rtps::BaseReader; @@ -270,5 +270,5 @@ void ReaderHistory::do_release_cache( } } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/history/TopicPayloadPool.cpp b/src/cpp/rtps/history/TopicPayloadPool.cpp index 98e6d6dbc02..65cbf282edf 100644 --- a/src/cpp/rtps/history/TopicPayloadPool.cpp +++ b/src/cpp/rtps/history/TopicPayloadPool.cpp @@ -27,7 +27,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { bool TopicPayloadPool::get_payload( @@ -298,5 +298,5 @@ std::unique_ptr TopicPayloadPool::get( } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/rtps/history/TopicPayloadPool.hpp b/src/cpp/rtps/history/TopicPayloadPool.hpp index 4b4d87d86d8..563fc899715 100644 --- a/src/cpp/rtps/history/TopicPayloadPool.hpp +++ b/src/cpp/rtps/history/TopicPayloadPool.hpp @@ -34,7 +34,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class TopicPayloadPool : public ITopicPayloadPool @@ -364,7 +364,7 @@ class TopicPayloadPool : public ITopicPayloadPool } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // RTPS_HISTORY_TOPICPAYLOADPOOL_HPP diff --git a/src/cpp/rtps/history/TopicPayloadPoolRegistry.cpp b/src/cpp/rtps/history/TopicPayloadPoolRegistry.cpp index defe03e8ab8..c1c8c0f6680 100644 --- a/src/cpp/rtps/history/TopicPayloadPoolRegistry.cpp +++ b/src/cpp/rtps/history/TopicPayloadPoolRegistry.cpp @@ -25,7 +25,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { const TopicPayloadPoolRegistry::reference& TopicPayloadPoolRegistry::instance() @@ -41,5 +41,5 @@ std::shared_ptr TopicPayloadPoolRegistry::get( } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/rtps/history/TopicPayloadPoolRegistry.hpp b/src/cpp/rtps/history/TopicPayloadPoolRegistry.hpp index 466f66866e2..c92a57b6b12 100644 --- a/src/cpp/rtps/history/TopicPayloadPoolRegistry.hpp +++ b/src/cpp/rtps/history/TopicPayloadPoolRegistry.hpp @@ -27,7 +27,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace detail { @@ -49,7 +49,7 @@ class TopicPayloadPoolRegistry }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // RTPS_HISTORY_TOPICPAYLOADPOOLREGISTRY_HPP diff --git a/src/cpp/rtps/history/TopicPayloadPoolRegistry_impl/TopicPayloadPoolProxy.hpp b/src/cpp/rtps/history/TopicPayloadPoolRegistry_impl/TopicPayloadPoolProxy.hpp index 1fa5e297d1c..7420d781a6c 100644 --- a/src/cpp/rtps/history/TopicPayloadPoolRegistry_impl/TopicPayloadPoolProxy.hpp +++ b/src/cpp/rtps/history/TopicPayloadPoolRegistry_impl/TopicPayloadPoolProxy.hpp @@ -23,7 +23,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace detail { @@ -109,7 +109,7 @@ class TopicPayloadPoolProxy : public ITopicPayloadPool } // namespace detail } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // RTPS_HISTORY_TOPICPAYLOADPOOLREGISTRY_IMPL_TOPICPAYLOADPOOLPROXY_HPP diff --git a/src/cpp/rtps/history/TopicPayloadPoolRegistry_impl/TopicPayloadPoolRegistry.hpp b/src/cpp/rtps/history/TopicPayloadPoolRegistry_impl/TopicPayloadPoolRegistry.hpp index d55dfb7ce22..a93131c4b44 100644 --- a/src/cpp/rtps/history/TopicPayloadPoolRegistry_impl/TopicPayloadPoolRegistry.hpp +++ b/src/cpp/rtps/history/TopicPayloadPoolRegistry_impl/TopicPayloadPoolRegistry.hpp @@ -25,7 +25,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace detail { @@ -95,7 +95,7 @@ class TopicPayloadPoolRegistry } // namespace detail } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // RTPS_HISTORY_TOPICPAYLOADPOOLREGISTRY_IMPL_TOPICPAYLOADPOOLREGISTRY_HPP diff --git a/src/cpp/rtps/history/TopicPayloadPoolRegistry_impl/TopicPayloadPoolRegistryEntry.hpp b/src/cpp/rtps/history/TopicPayloadPoolRegistry_impl/TopicPayloadPoolRegistryEntry.hpp index 632e738e850..f41123f23df 100644 --- a/src/cpp/rtps/history/TopicPayloadPoolRegistry_impl/TopicPayloadPoolRegistryEntry.hpp +++ b/src/cpp/rtps/history/TopicPayloadPoolRegistry_impl/TopicPayloadPoolRegistryEntry.hpp @@ -23,7 +23,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace detail { @@ -37,7 +37,7 @@ struct TopicPayloadPoolRegistryEntry } // namespace detail } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // RTPS_HISTORY_TOPICPAYLOADPOOLREGISTRY_IMPL_TOPICPAYLOADPOOLREGISTRYENTRY_HPP diff --git a/src/cpp/rtps/history/TopicPayloadPool_impl/Dynamic.hpp b/src/cpp/rtps/history/TopicPayloadPool_impl/Dynamic.hpp index 609a8635bf1..629972582c0 100644 --- a/src/cpp/rtps/history/TopicPayloadPool_impl/Dynamic.hpp +++ b/src/cpp/rtps/history/TopicPayloadPool_impl/Dynamic.hpp @@ -22,7 +22,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class DynamicTopicPayloadPool : public TopicPayloadPool @@ -93,7 +93,7 @@ class DynamicTopicPayloadPool : public TopicPayloadPool }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // RTPS_HISTORY_TOPICPAYLOADPOOLIMPL_DYNAMIC_HPP diff --git a/src/cpp/rtps/history/TopicPayloadPool_impl/DynamicReusable.hpp b/src/cpp/rtps/history/TopicPayloadPool_impl/DynamicReusable.hpp index 69268595532..e6bd54e2f48 100644 --- a/src/cpp/rtps/history/TopicPayloadPool_impl/DynamicReusable.hpp +++ b/src/cpp/rtps/history/TopicPayloadPool_impl/DynamicReusable.hpp @@ -22,7 +22,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class DynamicReusableTopicPayloadPool : public TopicPayloadPool @@ -48,7 +48,7 @@ class DynamicReusableTopicPayloadPool : public TopicPayloadPool }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // RTPS_HISTORY_TOPICPAYLOADPOOLIMPL_DYNAMIC_REUSABLE_HPP diff --git a/src/cpp/rtps/history/TopicPayloadPool_impl/Preallocated.hpp b/src/cpp/rtps/history/TopicPayloadPool_impl/Preallocated.hpp index 4be53e161cc..f840f19f531 100644 --- a/src/cpp/rtps/history/TopicPayloadPool_impl/Preallocated.hpp +++ b/src/cpp/rtps/history/TopicPayloadPool_impl/Preallocated.hpp @@ -22,7 +22,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class PreallocatedTopicPayloadPool : public TopicPayloadPool @@ -87,7 +87,7 @@ class PreallocatedTopicPayloadPool : public TopicPayloadPool }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // RTPS_HISTORY_TOPICPAYLOADPOOLIMPL_PREALLOCATED_HPP diff --git a/src/cpp/rtps/history/TopicPayloadPool_impl/PreallocatedWithRealloc.hpp b/src/cpp/rtps/history/TopicPayloadPool_impl/PreallocatedWithRealloc.hpp index f7d7fb12132..a54a1eb1d91 100644 --- a/src/cpp/rtps/history/TopicPayloadPool_impl/PreallocatedWithRealloc.hpp +++ b/src/cpp/rtps/history/TopicPayloadPool_impl/PreallocatedWithRealloc.hpp @@ -22,7 +22,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class PreallocatedReallocTopicPayloadPool : public TopicPayloadPool @@ -87,7 +87,7 @@ class PreallocatedReallocTopicPayloadPool : public TopicPayloadPool }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // RTPS_HISTORY_TOPICPAYLOADPOOLIMPL_PREALLOCATED_REALLOC_HPP diff --git a/src/cpp/rtps/history/WriterHistory.cpp b/src/cpp/rtps/history/WriterHistory.cpp index 6d520bf4f3f..f1e65d60613 100644 --- a/src/cpp/rtps/history/WriterHistory.cpp +++ b/src/cpp/rtps/history/WriterHistory.cpp @@ -27,7 +27,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { WriteParams WriteParams::WRITE_PARAM_DEFAULT; @@ -373,5 +373,5 @@ void WriterHistory::set_fragments( } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/rtps/messages/CDRMessage.cpp b/src/cpp/rtps/messages/CDRMessage.cpp index aaaa8dd21d1..0435aeb7959 100644 --- a/src/cpp/rtps/messages/CDRMessage.cpp +++ b/src/cpp/rtps/messages/CDRMessage.cpp @@ -30,7 +30,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { bool CDRMessage::initCDRMsg( @@ -1262,7 +1262,7 @@ bool CDRMessage::skip( } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif /* DOXYGEN_SHOULD_SKIP_THIS */ diff --git a/src/cpp/rtps/messages/CDRMessage.hpp b/src/cpp/rtps/messages/CDRMessage.hpp index 7609a65605e..1810280efd2 100644 --- a/src/cpp/rtps/messages/CDRMessage.hpp +++ b/src/cpp/rtps/messages/CDRMessage.hpp @@ -34,7 +34,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { class ParticipantGenericMessage; @@ -348,7 +348,7 @@ bool skip( } /* namespace CDRMessage */ } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #ifndef DOXYGEN_SHOULD_SKIP_THIS diff --git a/src/cpp/rtps/messages/MessageReceiver.cpp b/src/cpp/rtps/messages/MessageReceiver.cpp index 83e7e40cab2..c751472b67f 100644 --- a/src/cpp/rtps/messages/MessageReceiver.cpp +++ b/src/cpp/rtps/messages/MessageReceiver.cpp @@ -43,7 +43,7 @@ using ParameterList = eprosima::fastdds::dds::ParameterList; namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { using BaseReader = fastdds::rtps::BaseReader; @@ -1505,5 +1505,5 @@ void MessageReceiver::notify_network_statistics( } } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/messages/MessageReceiver.h b/src/cpp/rtps/messages/MessageReceiver.h index 86f34a31cfa..7c7ac1ec300 100644 --- a/src/cpp/rtps/messages/MessageReceiver.h +++ b/src/cpp/rtps/messages/MessageReceiver.h @@ -43,7 +43,7 @@ class BaseReader; } // namespace rtps } // namespace fastdds -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSParticipantImpl; @@ -302,7 +302,7 @@ class MessageReceiver }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/src/cpp/rtps/messages/RTPSGapBuilder.cpp b/src/cpp/rtps/messages/RTPSGapBuilder.cpp index f5e8a5e17d3..d614d256cf9 100644 --- a/src/cpp/rtps/messages/RTPSGapBuilder.cpp +++ b/src/cpp/rtps/messages/RTPSGapBuilder.cpp @@ -20,7 +20,7 @@ #include "RTPSGapBuilder.hpp" namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { RTPSGapBuilder::~RTPSGapBuilder() @@ -69,8 +69,8 @@ bool RTPSGapBuilder::flush() if (is_gap_pending_) { bool ok = with_specific_destination_ ? - group_.add_gap(initial_sequence_, gap_bitmap_, reader_guid_) : - group_.add_gap(initial_sequence_, gap_bitmap_); + group_.add_gap(initial_sequence_, gap_bitmap_, reader_guid_) : + group_.add_gap(initial_sequence_, gap_bitmap_); if (!ok) { return false; @@ -82,5 +82,5 @@ bool RTPSGapBuilder::flush() } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/rtps/messages/RTPSGapBuilder.hpp b/src/cpp/rtps/messages/RTPSGapBuilder.hpp index 429f3d34506..441c978a194 100644 --- a/src/cpp/rtps/messages/RTPSGapBuilder.hpp +++ b/src/cpp/rtps/messages/RTPSGapBuilder.hpp @@ -24,7 +24,7 @@ #include "RTPSMessageGroup.hpp" namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** @@ -100,7 +100,7 @@ class RTPSGapBuilder }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/src/cpp/rtps/messages/RTPSMessageCreator.cpp b/src/cpp/rtps/messages/RTPSMessageCreator.cpp index 5751d21303a..0125ebebad9 100644 --- a/src/cpp/rtps/messages/RTPSMessageCreator.cpp +++ b/src/cpp/rtps/messages/RTPSMessageCreator.cpp @@ -23,11 +23,10 @@ #include #include -using namespace eprosima::fastrtps; using ParameterList = eprosima::fastdds::dds::ParameterList; namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { bool RTPSMessageCreator::addHeader( diff --git a/src/cpp/rtps/messages/RTPSMessageCreator.hpp b/src/cpp/rtps/messages/RTPSMessageCreator.hpp index f586130ac61..53ffbfe0a40 100644 --- a/src/cpp/rtps/messages/RTPSMessageCreator.hpp +++ b/src/cpp/rtps/messages/RTPSMessageCreator.hpp @@ -29,7 +29,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { using NetworkBuffer = eprosima::fastdds::rtps::NetworkBuffer; diff --git a/src/cpp/rtps/messages/RTPSMessageGroup.cpp b/src/cpp/rtps/messages/RTPSMessageGroup.cpp index 4b81a6d5e5f..1880aaeedcf 100644 --- a/src/cpp/rtps/messages/RTPSMessageGroup.cpp +++ b/src/cpp/rtps/messages/RTPSMessageGroup.cpp @@ -34,7 +34,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { using BaseReader = fastdds::rtps::BaseReader; @@ -356,7 +356,6 @@ void RTPSMessageGroup::send() { if (endpoint_ && sender_) { - if (header_msg_->length > RTPSMESSAGE_HEADER_SIZE) { std::lock_guard lock(*sender_); @@ -1080,5 +1079,5 @@ bool RTPSMessageGroup::add_nackfrag( } } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/messages/RTPSMessageGroup.hpp b/src/cpp/rtps/messages/RTPSMessageGroup.hpp index 3823721237c..71a23f184db 100644 --- a/src/cpp/rtps/messages/RTPSMessageGroup.hpp +++ b/src/cpp/rtps/messages/RTPSMessageGroup.hpp @@ -35,7 +35,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSParticipantImpl; @@ -361,7 +361,7 @@ class RTPSMessageGroup ResourceLimitedVector* buffers_to_send_ = nullptr; // Vector of payloads of which the RTPSMessageGroup is the owner - ResourceLimitedVector* payloads_to_send_ = nullptr; + ResourceLimitedVector* payloads_to_send_ = nullptr; // Bytes to send in the next list of buffers uint32_t buffers_bytes_ = 0; @@ -374,7 +374,7 @@ class RTPSMessageGroup }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/src/cpp/rtps/messages/RTPSMessageGroup_t.hpp b/src/cpp/rtps/messages/RTPSMessageGroup_t.hpp index e74e235a7b6..5895ab57c8b 100644 --- a/src/cpp/rtps/messages/RTPSMessageGroup_t.hpp +++ b/src/cpp/rtps/messages/RTPSMessageGroup_t.hpp @@ -28,7 +28,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** @@ -113,14 +113,14 @@ class RTPSMessageGroup_t #endif // if HAVE_SECURITY //! Vector to store the NetworkBuffers that will be used to form the RTPS message. - eprosima::fastrtps::ResourceLimitedVector buffers_; + eprosima::fastdds::ResourceLimitedVector buffers_; //! Mirror vector of buffers_ to store the serialized payloads. - eprosima::fastrtps::ResourceLimitedVector payloads_; + eprosima::fastdds::ResourceLimitedVector payloads_; }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/src/cpp/rtps/messages/SendBuffersManager.cpp b/src/cpp/rtps/messages/SendBuffersManager.cpp index d327fea0495..38f52c66870 100644 --- a/src/cpp/rtps/messages/SendBuffersManager.cpp +++ b/src/cpp/rtps/messages/SendBuffersManager.cpp @@ -22,7 +22,7 @@ #include "../participant/RTPSParticipantImpl.h" namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { SendBuffersManager::SendBuffersManager( @@ -136,5 +136,5 @@ void SendBuffersManager::add_one_buffer( } } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/messages/SendBuffersManager.hpp b/src/cpp/rtps/messages/SendBuffersManager.hpp index 4b9cb97e433..f68f1c77024 100644 --- a/src/cpp/rtps/messages/SendBuffersManager.hpp +++ b/src/cpp/rtps/messages/SendBuffersManager.hpp @@ -30,7 +30,7 @@ namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSParticipantImpl; @@ -109,7 +109,7 @@ class SendBuffersManager }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/src/cpp/rtps/messages/submessages/AckNackMsg.hpp b/src/cpp/rtps/messages/submessages/AckNackMsg.hpp index 0a07b5bc0db..746fe58e25b 100644 --- a/src/cpp/rtps/messages/submessages/AckNackMsg.hpp +++ b/src/cpp/rtps/messages/submessages/AckNackMsg.hpp @@ -18,7 +18,7 @@ */ namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { bool RTPSMessageCreator::addMessageAcknack( @@ -163,5 +163,5 @@ bool RTPSMessageCreator::addSubmessageNackFrag( } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/rtps/messages/submessages/DataMsg.hpp b/src/cpp/rtps/messages/submessages/DataMsg.hpp index 359b142a244..c8a816bddb5 100644 --- a/src/cpp/rtps/messages/submessages/DataMsg.hpp +++ b/src/cpp/rtps/messages/submessages/DataMsg.hpp @@ -26,7 +26,7 @@ using NetworkBuffer = eprosima::fastdds::rtps::NetworkBuffer; namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace { @@ -507,5 +507,5 @@ bool RTPSMessageCreator::addSubmessageDataFrag( } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/rtps/messages/submessages/GapMsg.hpp b/src/cpp/rtps/messages/submessages/GapMsg.hpp index 20f35cd6cc1..dcb1938f56b 100644 --- a/src/cpp/rtps/messages/submessages/GapMsg.hpp +++ b/src/cpp/rtps/messages/submessages/GapMsg.hpp @@ -18,7 +18,7 @@ */ namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { bool RTPSMessageCreator::addMessageGap( @@ -87,5 +87,5 @@ bool RTPSMessageCreator::addSubmessageGap( } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/rtps/messages/submessages/HeartbeatMsg.hpp b/src/cpp/rtps/messages/submessages/HeartbeatMsg.hpp index 44b40f46fd2..45ddd0ee71d 100644 --- a/src/cpp/rtps/messages/submessages/HeartbeatMsg.hpp +++ b/src/cpp/rtps/messages/submessages/HeartbeatMsg.hpp @@ -18,7 +18,7 @@ */ namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { bool RTPSMessageCreator::addMessageHeartbeat( @@ -189,5 +189,5 @@ bool RTPSMessageCreator::addSubmessageHeartbeatFrag( } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/rtps/network/NetworkFactory.cpp b/src/cpp/rtps/network/NetworkFactory.cpp index 47a46b95fe9..0ae1fdc03f5 100644 --- a/src/cpp/rtps/network/NetworkFactory.cpp +++ b/src/cpp/rtps/network/NetworkFactory.cpp @@ -27,10 +27,9 @@ #include using namespace std; -using namespace eprosima::fastdds::rtps; namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { using SendResourceList = fastdds::rtps::SendResourceList; @@ -132,7 +131,7 @@ bool NetworkFactory::BuildReceiverResources( bool NetworkFactory::RegisterTransport( const TransportDescriptorInterface* descriptor, - const fastrtps::rtps::PropertyPolicy* properties, + const fastdds::rtps::PropertyPolicy* properties, const uint32_t& max_msg_size_no_frag) { bool wasRegistered = false; @@ -558,5 +557,5 @@ std::vector NetworkFactory::netmask_filter_info() co } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/rtps/network/NetworkFactory.h b/src/cpp/rtps/network/NetworkFactory.h index 50ac606ed7a..1ab878ff970 100644 --- a/src/cpp/rtps/network/NetworkFactory.h +++ b/src/cpp/rtps/network/NetworkFactory.h @@ -28,7 +28,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSParticipantAttributes; @@ -72,7 +72,7 @@ class NetworkFactory */ bool RegisterTransport( const fastdds::rtps::TransportDescriptorInterface* descriptor, - const fastrtps::rtps::PropertyPolicy* properties = nullptr, + const fastdds::rtps::PropertyPolicy* properties = nullptr, const uint32_t& max_msg_size_no_frag = 0); /** @@ -347,7 +347,7 @@ class NetworkFactory }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif /* _RTPS_NETWORK_NETWORKFACTORY_H_ */ diff --git a/src/cpp/rtps/network/ReceiverResource.cpp b/src/cpp/rtps/network/ReceiverResource.cpp index d65601cfc1b..d184dedc23f 100644 --- a/src/cpp/rtps/network/ReceiverResource.cpp +++ b/src/cpp/rtps/network/ReceiverResource.cpp @@ -24,10 +24,9 @@ #define IDSTRING "(ID:" << std::this_thread::get_id() << ") " << using namespace std; -using namespace eprosima::fastdds::rtps; namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { ReceiverResource::ReceiverResource( @@ -165,5 +164,5 @@ ReceiverResource::~ReceiverResource() } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/rtps/network/ReceiverResource.h b/src/cpp/rtps/network/ReceiverResource.h index 62ad7219b02..7471bad7391 100644 --- a/src/cpp/rtps/network/ReceiverResource.h +++ b/src/cpp/rtps/network/ReceiverResource.h @@ -25,7 +25,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** @@ -121,7 +121,7 @@ class ReceiverResource : public fastdds::rtps::TransportReceiverInterface }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif /* _RTPS_NETWORK_RECEIVERRESOURCE_H_ */ diff --git a/src/cpp/rtps/network/utils/external_locators.cpp b/src/cpp/rtps/network/utils/external_locators.cpp index f5626da63b6..52d9dc40e13 100644 --- a/src/cpp/rtps/network/utils/external_locators.cpp +++ b/src/cpp/rtps/network/utils/external_locators.cpp @@ -44,9 +44,9 @@ static uint8_t get_locator_mask( { uint8_t ret = 24; - std::vector infoIPs; + std::vector infoIPs; SystemInfo::get_ips(infoIPs, true, false); - for (const fastrtps::rtps::IPFinder::info_IP& infoIP : infoIPs) + for (const fastdds::rtps::IPFinder::info_IP& infoIP : infoIPs) { if (infoIP.locator.kind == locator.kind && std::equal(infoIP.locator.address, infoIP.locator.address + 16, locator.address)) @@ -206,7 +206,7 @@ static uint64_t heuristic( return heuristic_value(0, 0); } - if (fastrtps::rtps::IPLocator::isLocal(remote_locator)) + if (fastdds::rtps::IPLocator::isLocal(remote_locator)) { return heuristic_value(0, 1); } @@ -229,7 +229,7 @@ static uint64_t heuristic( } static void filter_remote_locators( - fastrtps::ResourceLimitedVector& locators, + fastdds::ResourceLimitedVector& locators, const ExternalLocators& external_locators, bool ignore_non_matching) { diff --git a/src/cpp/rtps/network/utils/external_locators.hpp b/src/cpp/rtps/network/utils/external_locators.hpp index e0dcbcce61a..e56b1a38c43 100644 --- a/src/cpp/rtps/network/utils/external_locators.hpp +++ b/src/cpp/rtps/network/utils/external_locators.hpp @@ -32,10 +32,6 @@ namespace rtps { namespace network { namespace external_locators { -using eprosima::fastrtps::rtps::LocatorSelectorEntry; -using eprosima::fastrtps::rtps::ParticipantProxyData; -using eprosima::fastrtps::rtps::ReaderProxyData; -using eprosima::fastrtps::rtps::WriterProxyData; /** * Sets the external locators entry for externality index 0 to a list of listening locators. diff --git a/src/cpp/rtps/participant/RTPSParticipant.cpp b/src/cpp/rtps/participant/RTPSParticipant.cpp index 460a899c5b7..71fda7a3537 100644 --- a/src/cpp/rtps/participant/RTPSParticipant.cpp +++ b/src/cpp/rtps/participant/RTPSParticipant.cpp @@ -22,7 +22,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { RTPSParticipant::RTPSParticipant( @@ -261,21 +261,21 @@ bool RTPSParticipant::disable_monitor_service() const } bool RTPSParticipant::fill_discovery_data_from_cdr_message( - fastrtps::rtps::ParticipantProxyData& data, + fastdds::rtps::ParticipantProxyData& data, fastdds::statistics::MonitorServiceStatusData& msg) { return mp_impl->fill_discovery_data_from_cdr_message(data, msg); } bool RTPSParticipant::fill_discovery_data_from_cdr_message( - fastrtps::rtps::WriterProxyData& data, + fastdds::rtps::WriterProxyData& data, fastdds::statistics::MonitorServiceStatusData& msg) { return mp_impl->fill_discovery_data_from_cdr_message(data, msg); } bool RTPSParticipant::fill_discovery_data_from_cdr_message( - fastrtps::rtps::ReaderProxyData& data, + fastdds::rtps::ReaderProxyData& data, fastdds::statistics::MonitorServiceStatusData& msg) { return mp_impl->fill_discovery_data_from_cdr_message(data, msg); @@ -284,6 +284,6 @@ bool RTPSParticipant::fill_discovery_data_from_cdr_message( #endif // FASTDDS_STATISTICS } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp index 44302cad1e2..d2f5f62e2b4 100644 --- a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp +++ b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp @@ -79,15 +79,8 @@ #endif // HAVE_SECURITY namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { - -using UDPv4TransportDescriptor = fastdds::rtps::UDPv4TransportDescriptor; -using TCPTransportDescriptor = fastdds::rtps::TCPTransportDescriptor; -using SharedMemTransportDescriptor = fastdds::rtps::SharedMemTransportDescriptor; -using BuiltinTransports = fastdds::rtps::BuiltinTransports; -using BaseReader = fastdds::rtps::BaseReader; - /** * Parse the environment variable specifying the transports to instantiate and optional configuration options * if the transport selected is LARGE_DATA. @@ -2224,7 +2217,7 @@ void RTPSParticipantImpl::deleteAllUserEndpoints() }; #if HAVE_SECURITY - bool (eprosima::fastrtps::rtps::security::SecurityManager::* unregister_endpoint[2])( + bool (eprosima::fastdds::rtps::security::SecurityManager::* unregister_endpoint[2])( const GUID_t& writer_guid); unregister_endpoint[WRITER] = &security::SecurityManager::unregister_local_writer; unregister_endpoint[READER] = &security::SecurityManager::unregister_local_reader; @@ -2606,7 +2599,6 @@ bool RTPSParticipantImpl::did_mutation_took_place_on_meta( const LocatorList_t& UnicastLocatorList) const { using namespace std; - using namespace eprosima::fastdds::rtps; if (m_att.builtin.metatrafficMulticastLocatorList == MulticastLocatorList && m_att.builtin.metatrafficUnicastLocatorList == UnicastLocatorList) @@ -2790,8 +2782,8 @@ void RTPSParticipantImpl::environment_file_has_changed() { RTPSParticipantAttributes patt = m_att; // Only if it is a server/backup or a client override - if (DiscoveryProtocol_t::SERVER == m_att.builtin.discovery_config.discoveryProtocol || - DiscoveryProtocol_t::BACKUP == m_att.builtin.discovery_config.discoveryProtocol || + if (DiscoveryProtocol::SERVER == m_att.builtin.discovery_config.discoveryProtocol || + DiscoveryProtocol::BACKUP == m_att.builtin.discovery_config.discoveryProtocol || client_override_) { if (load_environment_server_info(patt.builtin.discovery_config.m_DiscoveryServers)) @@ -3022,7 +3014,7 @@ const fastdds::statistics::rtps::IStatusObserver* RTPSParticipantImpl::create_mo return this->createWriter(WriterOut, param, payload_pool, hist, listen, entityId, isBuiltin); }, [&](RTPSWriter* w, - const fastrtps::TopicAttributes& topicAtt, + const fastdds::TopicAttributes& topicAtt, const fastdds::dds::WriterQos& wqos) -> bool { return this->registerWriter(w, topicAtt, wqos); @@ -3086,7 +3078,7 @@ bool RTPSParticipantImpl::disable_monitor_service() const } bool RTPSParticipantImpl::fill_discovery_data_from_cdr_message( - fastrtps::rtps::ParticipantProxyData& data, + fastdds::rtps::ParticipantProxyData& data, fastdds::statistics::MonitorServiceStatusData& msg) { bool ret = true; @@ -3108,7 +3100,7 @@ bool RTPSParticipantImpl::fill_discovery_data_from_cdr_message( } bool RTPSParticipantImpl::fill_discovery_data_from_cdr_message( - fastrtps::rtps::WriterProxyData& data, + fastdds::rtps::WriterProxyData& data, fastdds::statistics::MonitorServiceStatusData& msg) { bool ret = true; @@ -3129,7 +3121,7 @@ bool RTPSParticipantImpl::fill_discovery_data_from_cdr_message( } bool RTPSParticipantImpl::fill_discovery_data_from_cdr_message( - fastrtps::rtps::ReaderProxyData& data, + fastdds::rtps::ReaderProxyData& data, fastdds::statistics::MonitorServiceStatusData& msg) { bool ret = true; @@ -3275,5 +3267,5 @@ void RTPSParticipantImpl::update_removed_participant( } } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.h b/src/cpp/rtps/participant/RTPSParticipantImpl.h index b28c9d16132..f82757c7a33 100644 --- a/src/cpp/rtps/participant/RTPSParticipantImpl.h +++ b/src/cpp/rtps/participant/RTPSParticipantImpl.h @@ -103,7 +103,7 @@ class TypeLookupManager; } // namespace dds } // namespace fastdds -namespace fastrtps { +namespace fastdds { class TopicAttributes; class MessageReceiver; @@ -1253,7 +1253,7 @@ class RTPSParticipantImpl * @return true if the operation succeeds. */ bool fill_discovery_data_from_cdr_message( - fastrtps::rtps::ParticipantProxyData& data, + fastdds::rtps::ParticipantProxyData& data, fastdds::statistics::MonitorServiceStatusData& msg); /** @@ -1265,7 +1265,7 @@ class RTPSParticipantImpl * @return true if the operation succeeds. */ bool fill_discovery_data_from_cdr_message( - fastrtps::rtps::WriterProxyData& data, + fastdds::rtps::WriterProxyData& data, fastdds::statistics::MonitorServiceStatusData& msg); /** @@ -1277,7 +1277,7 @@ class RTPSParticipantImpl * @return true if the operation succeeds. */ bool fill_discovery_data_from_cdr_message( - fastrtps::rtps::ReaderProxyData& data, + fastdds::rtps::ReaderProxyData& data, fastdds::statistics::MonitorServiceStatusData& msg); bool get_entity_connections( diff --git a/src/cpp/rtps/persistence/PersistenceFactory.cpp b/src/cpp/rtps/persistence/PersistenceFactory.cpp index f7e8985724f..a1b8d3ee3c6 100644 --- a/src/cpp/rtps/persistence/PersistenceFactory.cpp +++ b/src/cpp/rtps/persistence/PersistenceFactory.cpp @@ -27,7 +27,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { std::vector& IPersistenceService::get_changes( @@ -81,5 +81,5 @@ IPersistenceService* PersistenceFactory::create_persistence_service( } } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/persistence/PersistenceService.h b/src/cpp/rtps/persistence/PersistenceService.h index f6badbf1727..3d05aa0fe2c 100644 --- a/src/cpp/rtps/persistence/PersistenceService.h +++ b/src/cpp/rtps/persistence/PersistenceService.h @@ -31,7 +31,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class WriterHistory; @@ -137,7 +137,7 @@ class PersistenceFactory } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif /* PERSISTENCESERVICE_H_ */ diff --git a/src/cpp/rtps/persistence/SQLite3PersistenceService.cpp b/src/cpp/rtps/persistence/SQLite3PersistenceService.cpp index b4afb540c5a..e6f273d6d9d 100644 --- a/src/cpp/rtps/persistence/SQLite3PersistenceService.cpp +++ b/src/cpp/rtps/persistence/SQLite3PersistenceService.cpp @@ -27,7 +27,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** @@ -571,5 +571,5 @@ int64_t SQLite3PersistenceServiceSchemaV3::now() } } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/persistence/SQLite3PersistenceService.h b/src/cpp/rtps/persistence/SQLite3PersistenceService.h index 8d6a28fe212..0fc476e67c1 100644 --- a/src/cpp/rtps/persistence/SQLite3PersistenceService.h +++ b/src/cpp/rtps/persistence/SQLite3PersistenceService.h @@ -23,7 +23,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** @@ -115,7 +115,7 @@ class SQLite3PersistenceService : public IPersistenceService }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif /* */ diff --git a/src/cpp/rtps/persistence/SQLite3PersistenceServiceStatements.h b/src/cpp/rtps/persistence/SQLite3PersistenceServiceStatements.h index f1aa401e038..45a7041a769 100644 --- a/src/cpp/rtps/persistence/SQLite3PersistenceServiceStatements.h +++ b/src/cpp/rtps/persistence/SQLite3PersistenceServiceStatements.h @@ -25,7 +25,7 @@ struct sqlite3; namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { @@ -248,7 +248,7 @@ class SQLite3PersistenceServiceSchemaV3 }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif /* SQLITE3PERSISTENCESERVICESTATEMENTS_H_ */ diff --git a/src/cpp/rtps/reader/BaseReader.cpp b/src/cpp/rtps/reader/BaseReader.cpp index 1e9f5d1e4f2..4feaee1bbe7 100644 --- a/src/cpp/rtps/reader/BaseReader.cpp +++ b/src/cpp/rtps/reader/BaseReader.cpp @@ -47,19 +47,17 @@ namespace eprosima { namespace fastdds { namespace rtps { -using namespace fastrtps::rtps; - BaseReader::BaseReader( - fastrtps::rtps::RTPSParticipantImpl* pimpl, - const fastrtps::rtps::GUID_t& guid, - const fastrtps::rtps::ReaderAttributes& att, - fastrtps::rtps::ReaderHistory* hist, - fastrtps::rtps::ReaderListener* listen) - : fastrtps::rtps::RTPSReader(pimpl, guid, att, hist) + fastdds::rtps::RTPSParticipantImpl* pimpl, + const fastdds::rtps::GUID_t& guid, + const fastdds::rtps::ReaderAttributes& att, + fastdds::rtps::ReaderHistory* hist, + fastdds::rtps::ReaderListener* listen) + : fastdds::rtps::RTPSReader(pimpl, guid, att, hist) , listener_(listen) , accept_messages_from_unkown_writers_(att.accept_messages_from_unkown_writers) , expects_inline_qos_(att.expects_inline_qos) - , history_state_(new fastrtps::rtps::ReaderHistoryState(att.matched_writers_allocation.initial)) + , history_state_(new fastdds::rtps::ReaderHistoryState(att.matched_writers_allocation.initial)) , liveliness_kind_(att.liveliness_kind) , liveliness_lease_duration_(att.liveliness_lease_duration) { @@ -73,12 +71,12 @@ BaseReader::BaseReader( } BaseReader::BaseReader( - fastrtps::rtps::RTPSParticipantImpl* pimpl, - const fastrtps::rtps::GUID_t& guid, - const fastrtps::rtps::ReaderAttributes& att, - const std::shared_ptr& payload_pool, - fastrtps::rtps::ReaderHistory* hist, - fastrtps::rtps::ReaderListener* listen) + fastdds::rtps::RTPSParticipantImpl* pimpl, + const fastdds::rtps::GUID_t& guid, + const fastdds::rtps::ReaderAttributes& att, + const std::shared_ptr& payload_pool, + fastdds::rtps::ReaderHistory* hist, + fastdds::rtps::ReaderListener* listen) : BaseReader( pimpl, guid, att, payload_pool, std::make_shared(PoolConfig::from_history_attributes(hist->m_att)), @@ -87,18 +85,18 @@ BaseReader::BaseReader( } BaseReader::BaseReader( - fastrtps::rtps::RTPSParticipantImpl* pimpl, - const fastrtps::rtps::GUID_t& guid, - const fastrtps::rtps::ReaderAttributes& att, - const std::shared_ptr& payload_pool, - const std::shared_ptr& change_pool, - fastrtps::rtps::ReaderHistory* hist, - fastrtps::rtps::ReaderListener* listen) - : fastrtps::rtps::RTPSReader(pimpl, guid, att, hist) + fastdds::rtps::RTPSParticipantImpl* pimpl, + const fastdds::rtps::GUID_t& guid, + const fastdds::rtps::ReaderAttributes& att, + const std::shared_ptr& payload_pool, + const std::shared_ptr& change_pool, + fastdds::rtps::ReaderHistory* hist, + fastdds::rtps::ReaderListener* listen) + : fastdds::rtps::RTPSReader(pimpl, guid, att, hist) , listener_(listen) , accept_messages_from_unkown_writers_(att.accept_messages_from_unkown_writers) , expects_inline_qos_(att.expects_inline_qos) - , history_state_(new fastrtps::rtps::ReaderHistoryState(att.matched_writers_allocation.initial)) + , history_state_(new fastdds::rtps::ReaderHistoryState(att.matched_writers_allocation.initial)) , liveliness_kind_(att.liveliness_kind) , liveliness_lease_duration_(att.liveliness_lease_duration) { @@ -173,7 +171,7 @@ uint64_t BaseReader::get_unread_count( { for (auto it = history_->changesBegin(); 0 < total_unread_ && it != history_->changesEnd(); ++it) { - fastrtps::rtps::CacheChange_t* change = *it; + fastdds::rtps::CacheChange_t* change = *it; if (!change->isRead && get_last_notified(change->writerGUID) >= change->sequenceNumber) { change->isRead = true; @@ -187,7 +185,7 @@ uint64_t BaseReader::get_unread_count( } bool BaseReader::wait_for_unread_cache( - const eprosima::fastrtps::Duration_t& timeout) + const eprosima::fastdds::Duration_t& timeout) { auto time_out = std::chrono::steady_clock::now() + std::chrono::seconds(timeout.seconds) + std::chrono::nanoseconds(timeout.nanosec); @@ -215,16 +213,16 @@ bool BaseReader::wait_for_unread_cache( bool BaseReader::is_sample_valid( const void* data, - const fastrtps::rtps::GUID_t& writer, - const fastrtps::rtps::SequenceNumber_t& sn) const + const fastdds::rtps::GUID_t& writer, + const fastdds::rtps::SequenceNumber_t& sn) const { if (is_datasharing_compatible_ && datasharing_listener_->writer_is_matched(writer)) { // Check if the payload is dirty // Note the Payloads used in loans include a mandatory RTPS 2.3 extra header - auto payload = static_cast(data); - payload -= fastrtps::rtps::SerializedPayload_t::representation_header_size; - if (!fastrtps::rtps::DataSharingPayloadPool::check_sequence_number(payload, sn)) + auto payload = static_cast(data); + payload -= fastdds::rtps::SerializedPayload_t::representation_header_size; + if (!fastdds::rtps::DataSharingPayloadPool::check_sequence_number(payload, sn)) { return false; } @@ -233,14 +231,14 @@ bool BaseReader::is_sample_valid( } BaseReader* BaseReader::downcast( - fastrtps::rtps::RTPSReader* reader) + fastdds::rtps::RTPSReader* reader) { assert(nullptr != dynamic_cast(reader)); return static_cast(reader); } BaseReader* BaseReader::downcast( - fastrtps::rtps::Endpoint* endpoint) + fastdds::rtps::Endpoint* endpoint) { assert(nullptr != dynamic_cast(endpoint)); return static_cast(endpoint); @@ -248,19 +246,19 @@ BaseReader* BaseReader::downcast( void BaseReader::allow_unknown_writers() { - assert(fastrtps::rtps::EntityId_t::unknown() != trusted_writer_entity_id_); + assert(fastdds::rtps::EntityId_t::unknown() != trusted_writer_entity_id_); accept_messages_from_unkown_writers_ = true; } bool BaseReader::reserve_cache( uint32_t cdr_payload_size, - fastrtps::rtps::CacheChange_t*& change) + fastdds::rtps::CacheChange_t*& change) { std::lock_guard guard(mp_mutex); change = nullptr; - fastrtps::rtps::CacheChange_t* reserved_change = nullptr; + fastdds::rtps::CacheChange_t* reserved_change = nullptr; if (!change_pool_->reserve_cache(reserved_change)) { EPROSIMA_LOG_WARNING(RTPS_READER, "Problem reserving cache from pool"); @@ -280,11 +278,11 @@ bool BaseReader::reserve_cache( } void BaseReader::release_cache( - fastrtps::rtps::CacheChange_t* change) + fastdds::rtps::CacheChange_t* change) { std::lock_guard guard(mp_mutex); - fastrtps::rtps::IPayloadPool* pool = change->serializedPayload.payload_owner; + fastdds::rtps::IPayloadPool* pool = change->serializedPayload.payload_owner; if (pool) { pool->release_payload(change->serializedPayload); @@ -293,7 +291,7 @@ void BaseReader::release_cache( } void BaseReader::update_liveliness_changed_status( - const fastrtps::rtps::GUID_t& writer, + const fastdds::rtps::GUID_t& writer, int32_t alive_change, int32_t not_alive_change) { @@ -343,10 +341,10 @@ bool BaseReader::may_remove_history_record( } void BaseReader::add_persistence_guid( - const fastrtps::rtps::GUID_t& guid, - const fastrtps::rtps::GUID_t& persistence_guid) + const fastdds::rtps::GUID_t& guid, + const fastdds::rtps::GUID_t& persistence_guid) { - if (fastrtps::rtps::c_Guid_Unknown == persistence_guid || persistence_guid == guid) + if (fastdds::rtps::c_Guid_Unknown == persistence_guid || persistence_guid == guid) { std::lock_guard guard(mp_mutex); history_state_->persistence_guid_map[guid] = guid; @@ -373,12 +371,12 @@ void BaseReader::add_persistence_guid( } void BaseReader::remove_persistence_guid( - const fastrtps::rtps::GUID_t& guid, - const fastrtps::rtps::GUID_t& persistence_guid, + const fastdds::rtps::GUID_t& guid, + const fastdds::rtps::GUID_t& persistence_guid, bool removed_by_lease) { std::lock_guard guard(mp_mutex); - auto persistence_guid_stored = (fastrtps::rtps::c_Guid_Unknown == persistence_guid) ? guid : persistence_guid; + auto persistence_guid_stored = (fastdds::rtps::c_Guid_Unknown == persistence_guid) ? guid : persistence_guid; history_state_->persistence_guid_map.erase(guid); auto count = --history_state_->persistence_guid_count[persistence_guid_stored]; if (count <= 0 && may_remove_history_record(removed_by_lease)) @@ -388,12 +386,12 @@ void BaseReader::remove_persistence_guid( } } -fastrtps::rtps::SequenceNumber_t BaseReader::get_last_notified( - const fastrtps::rtps::GUID_t& guid) +fastdds::rtps::SequenceNumber_t BaseReader::get_last_notified( + const fastdds::rtps::GUID_t& guid) { - fastrtps::rtps::SequenceNumber_t ret_val; + fastdds::rtps::SequenceNumber_t ret_val; std::lock_guard guard(mp_mutex); - fastrtps::rtps::GUID_t guid_to_look = guid; + fastdds::rtps::GUID_t guid_to_look = guid; auto p_guid = history_state_->persistence_guid_map.find(guid); if (p_guid != history_state_->persistence_guid_map.end()) { @@ -409,13 +407,13 @@ fastrtps::rtps::SequenceNumber_t BaseReader::get_last_notified( return ret_val; } -fastrtps::rtps::SequenceNumber_t BaseReader::update_last_notified( - const fastrtps::rtps::GUID_t& guid, - const fastrtps::rtps::SequenceNumber_t& seq) +fastdds::rtps::SequenceNumber_t BaseReader::update_last_notified( + const fastdds::rtps::GUID_t& guid, + const fastdds::rtps::SequenceNumber_t& seq) { - fastrtps::rtps::SequenceNumber_t ret_val; + fastdds::rtps::SequenceNumber_t ret_val; std::lock_guard guard(mp_mutex); - fastrtps::rtps::GUID_t guid_to_look = guid; + fastdds::rtps::GUID_t guid_to_look = guid; auto p_guid = history_state_->persistence_guid_map.find(guid); if (p_guid != history_state_->persistence_guid_map.end()) { @@ -439,8 +437,8 @@ fastrtps::rtps::SequenceNumber_t BaseReader::update_last_notified( } void BaseReader::persist_last_notified_nts( - const fastrtps::rtps::GUID_t& peristence_guid, - const fastrtps::rtps::SequenceNumber_t& seq) + const fastdds::rtps::GUID_t& peristence_guid, + const fastdds::rtps::SequenceNumber_t& seq) { // Empty base implementation since base behavior is to not persist data static_cast(peristence_guid); @@ -448,7 +446,7 @@ void BaseReader::persist_last_notified_nts( } bool BaseReader::is_datasharing_compatible_with( - const fastrtps::rtps::WriterProxyData& wdata) + const fastdds::rtps::WriterProxyData& wdata) { if (!is_datasharing_compatible_ || wdata.m_qos.data_sharing.kind() == fastdds::dds::DataSharingKind::OFF) @@ -485,9 +483,8 @@ void BaseReader::init( } void BaseReader::setup_datasharing( - const fastrtps::rtps::ReaderAttributes& att) + const fastdds::rtps::ReaderAttributes& att) { - using namespace fastrtps::rtps; if (att.endpoint.data_sharing_configuration().kind() != fastdds::dds::DataSharingKind::OFF) { diff --git a/src/cpp/rtps/reader/BaseReader.hpp b/src/cpp/rtps/reader/BaseReader.hpp index 98df820b900..7003e6eb33e 100644 --- a/src/cpp/rtps/reader/BaseReader.hpp +++ b/src/cpp/rtps/reader/BaseReader.hpp @@ -43,7 +43,7 @@ namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { struct CacheChange_t; @@ -54,27 +54,21 @@ class RTPSParticipantImpl; class WriterProxy; class WriterProxyData; -} // namespace rtps -} // namespace fastrtps - -namespace fastdds { -namespace rtps { - class BaseReader - : public fastrtps::rtps::RTPSReader + : public fastdds::rtps::RTPSReader , public fastdds::statistics::StatisticsReaderImpl { public: - fastrtps::rtps::ReaderListener* get_listener() const override; + fastdds::rtps::ReaderListener* get_listener() const override; void set_listener( - fastrtps::rtps::ReaderListener* listener) override; + fastdds::rtps::ReaderListener* listener) override; bool expects_inline_qos() const override; - fastrtps::rtps::ReaderHistory* get_history() const override; + fastdds::rtps::ReaderHistory* get_history() const override; IReaderDataFilter* get_content_filter() const override; @@ -87,12 +81,12 @@ class BaseReader bool mark_as_read) override; bool wait_for_unread_cache( - const fastrtps::Duration_t& timeout) override; + const fastdds::Duration_t& timeout) override; bool is_sample_valid( const void* data, - const fastrtps::rtps::GUID_t& writer, - const fastrtps::rtps::SequenceNumber_t& sn) const override; + const fastdds::rtps::GUID_t& writer, + const fastdds::rtps::SequenceNumber_t& sn) const override; /** * @brief Get a pointer to a BaseReader object from a RTPSReader pointer. @@ -102,7 +96,7 @@ class BaseReader * @return Pointer to the BaseReader object. */ static BaseReader* downcast( - fastrtps::rtps::RTPSReader* reader); + fastdds::rtps::RTPSReader* reader); /** * @brief Get a pointer to a BaseReader object from a Endpoint pointer. @@ -112,7 +106,7 @@ class BaseReader * @return Pointer to the BaseReader object. */ static BaseReader* downcast( - fastrtps::rtps::Endpoint* endpoint); + fastdds::rtps::Endpoint* endpoint); /** * @brief Set the entity ID of the trusted writer. @@ -120,7 +114,7 @@ class BaseReader * @param writer Entity ID of the trusted writer. */ void set_trusted_writer( - const fastrtps::rtps::EntityId_t& writer) + const fastdds::rtps::EntityId_t& writer) { accept_messages_from_unkown_writers_ = false; trusted_writer_entity_id_ = writer; @@ -142,7 +136,7 @@ class BaseReader /** * @return The liveliness lease duration of this reader */ - fastrtps::Duration_t liveliness_lease_duration() const + fastdds::Duration_t liveliness_lease_duration() const { return liveliness_lease_duration_; } @@ -150,7 +144,7 @@ class BaseReader /** * @return the datasharing listener associated with this reader. */ - const std::unique_ptr& datasharing_listener() const + const std::unique_ptr& datasharing_listener() const { return datasharing_listener_; } @@ -165,7 +159,7 @@ class BaseReader */ bool reserve_cache( uint32_t cdr_payload_size, - fastrtps::rtps::CacheChange_t*& change); + fastdds::rtps::CacheChange_t*& change); /** * @brief Release a CacheChange_t. @@ -173,7 +167,7 @@ class BaseReader * @param change Pointer to the change to release. */ void release_cache( - fastrtps::rtps::CacheChange_t* change); + fastdds::rtps::CacheChange_t* change); /** * @brief Method to notify the reader that a change has been removed from its history. @@ -183,7 +177,7 @@ class BaseReader * @return True if correctly removed. */ virtual bool change_removed_by_history( - fastrtps::rtps::CacheChange_t* change) = 0; + fastdds::rtps::CacheChange_t* change) = 0; /** * @brief Called just before a change is going to be deserialized. @@ -196,8 +190,8 @@ class BaseReader * @return Whether the change is still valid or not. */ virtual bool begin_sample_access_nts( - fastrtps::rtps::CacheChange_t* change, - fastrtps::rtps::WriterProxy*& writer, + fastdds::rtps::CacheChange_t* change, + fastdds::rtps::WriterProxy*& writer, bool& is_future_change) = 0; /** @@ -208,8 +202,8 @@ class BaseReader * @param [in] mark_as_read Whether the @c change should be marked as read or not. */ virtual void end_sample_access_nts( - fastrtps::rtps::CacheChange_t* change, - fastrtps::rtps::WriterProxy*& writer, + fastdds::rtps::CacheChange_t* change, + fastdds::rtps::WriterProxy*& writer, bool mark_as_read) = 0; /** @@ -220,7 +214,7 @@ class BaseReader * @param not_alive_change The change requested for not alive count. Should be -1, 0 or +1 */ void update_liveliness_changed_status( - const fastrtps::rtps::GUID_t& writer, + const fastdds::rtps::GUID_t& writer, int32_t alive_change, int32_t not_alive_change); @@ -232,7 +226,7 @@ class BaseReader * @return true if the reader accepts message. */ virtual bool process_data_msg( - fastrtps::rtps::CacheChange_t* change) = 0; + fastdds::rtps::CacheChange_t* change) = 0; /** * @brief Process an incoming DATA_FRAG message. @@ -245,7 +239,7 @@ class BaseReader * @return true if the reader accepts message. */ virtual bool process_data_frag_msg( - fastrtps::rtps::CacheChange_t* change, + fastdds::rtps::CacheChange_t* change, uint32_t sampleSize, uint32_t fragmentStartingNum, uint16_t fragmentsInSubmessage) = 0; @@ -264,10 +258,10 @@ class BaseReader * @return true if the reader accepts message. */ virtual bool process_heartbeat_msg( - const fastrtps::rtps::GUID_t& writerGUID, + const fastdds::rtps::GUID_t& writerGUID, uint32_t hbCount, - const fastrtps::rtps::SequenceNumber_t& firstSN, - const fastrtps::rtps::SequenceNumber_t& lastSN, + const fastdds::rtps::SequenceNumber_t& firstSN, + const fastdds::rtps::SequenceNumber_t& lastSN, bool finalFlag, bool livelinessFlag, VendorId_t origin_vendor_id = c_VendorId_Unknown) = 0; @@ -283,9 +277,9 @@ class BaseReader * @return true if the reader accepts message. */ virtual bool process_gap_msg( - const fastrtps::rtps::GUID_t& writerGUID, - const fastrtps::rtps::SequenceNumber_t& gapStart, - const fastrtps::rtps::SequenceNumberSet_t& gapList, + const fastdds::rtps::GUID_t& writerGUID, + const fastdds::rtps::SequenceNumber_t& gapStart, + const fastdds::rtps::SequenceNumberSet_t& gapList, VendorId_t origin_vendor_id = c_VendorId_Unknown) = 0; #ifdef FASTDDS_STATISTICS @@ -306,28 +300,28 @@ class BaseReader protected: BaseReader( - fastrtps::rtps::RTPSParticipantImpl* pimpl, - const fastrtps::rtps::GUID_t& guid, - const fastrtps::rtps::ReaderAttributes& att, - fastrtps::rtps::ReaderHistory* hist, - fastrtps::rtps::ReaderListener* listen); + fastdds::rtps::RTPSParticipantImpl* pimpl, + const fastdds::rtps::GUID_t& guid, + const fastdds::rtps::ReaderAttributes& att, + fastdds::rtps::ReaderHistory* hist, + fastdds::rtps::ReaderListener* listen); BaseReader( - fastrtps::rtps::RTPSParticipantImpl* pimpl, - const fastrtps::rtps::GUID_t& guid, - const fastrtps::rtps::ReaderAttributes& att, - const std::shared_ptr& payload_pool, - fastrtps::rtps::ReaderHistory* hist, - fastrtps::rtps::ReaderListener* listen); + fastdds::rtps::RTPSParticipantImpl* pimpl, + const fastdds::rtps::GUID_t& guid, + const fastdds::rtps::ReaderAttributes& att, + const std::shared_ptr& payload_pool, + fastdds::rtps::ReaderHistory* hist, + fastdds::rtps::ReaderListener* listen); BaseReader( - fastrtps::rtps::RTPSParticipantImpl* pimpl, - const fastrtps::rtps::GUID_t& guid, - const fastrtps::rtps::ReaderAttributes& att, - const std::shared_ptr& payload_pool, - const std::shared_ptr& change_pool, - fastrtps::rtps::ReaderHistory* hist, - fastrtps::rtps::ReaderListener* listen); + fastdds::rtps::RTPSParticipantImpl* pimpl, + const fastdds::rtps::GUID_t& guid, + const fastdds::rtps::ReaderAttributes& att, + const std::shared_ptr& payload_pool, + const std::shared_ptr& change_pool, + fastdds::rtps::ReaderHistory* hist, + fastdds::rtps::ReaderListener* listen); /** * @brief Whether a history record may be removed. @@ -346,8 +340,8 @@ class BaseReader * @param persistence_guid Persistence GUID of the remote writer. */ void add_persistence_guid( - const fastrtps::rtps::GUID_t& guid, - const fastrtps::rtps::GUID_t& persistence_guid); + const fastdds::rtps::GUID_t& guid, + const fastdds::rtps::GUID_t& persistence_guid); /** * @brief Remove a remote writer from the persistence_guid map. @@ -357,8 +351,8 @@ class BaseReader * @param removed_by_lease Whether the GUIDs are being removed due to a participant drop. */ void remove_persistence_guid( - const fastrtps::rtps::GUID_t& guid, - const fastrtps::rtps::GUID_t& persistence_guid, + const fastdds::rtps::GUID_t& guid, + const fastdds::rtps::GUID_t& persistence_guid, bool removed_by_lease); /** @@ -369,8 +363,8 @@ class BaseReader * @return Last notified sequence number for input guid. * @remarks Takes persistence_guid into consideration. */ - fastrtps::rtps::SequenceNumber_t get_last_notified( - const fastrtps::rtps::GUID_t& guid); + fastdds::rtps::SequenceNumber_t get_last_notified( + const fastdds::rtps::GUID_t& guid); /** * @brief Update the last notified sequence for a writer's GUID. @@ -381,9 +375,9 @@ class BaseReader * @return Previous value of last notified sequence number for input GUID. * @remarks Takes persistence_guid into consideration. */ - fastrtps::rtps::SequenceNumber_t update_last_notified( - const fastrtps::rtps::GUID_t& guid, - const fastrtps::rtps::SequenceNumber_t& seq); + fastdds::rtps::SequenceNumber_t update_last_notified( + const fastdds::rtps::GUID_t& guid, + const fastdds::rtps::SequenceNumber_t& seq); /** * @brief Persist the last notified sequence for a persistence guid. @@ -394,8 +388,8 @@ class BaseReader * @param seq Sequence number to set for input guid. */ virtual void persist_last_notified_nts( - const fastrtps::rtps::GUID_t& persistence_guid, - const fastrtps::rtps::SequenceNumber_t& seq); + const fastdds::rtps::GUID_t& persistence_guid, + const fastdds::rtps::SequenceNumber_t& seq); /** * @brief Check if a writer can communicate with this reader using data-sharing. @@ -405,10 +399,10 @@ class BaseReader * @return Whether the writer is datasharing compatible with this reader or not. */ bool is_datasharing_compatible_with( - const fastrtps::rtps::WriterProxyData& wdata); + const fastdds::rtps::WriterProxyData& wdata); /// Pointer to the listener associated with this reader. - fastrtps::rtps::ReaderListener* listener_; + fastdds::rtps::ReaderListener* listener_; /// Whether the reader accepts messages from unmatched writers. bool accept_messages_from_unkown_writers_; /// Whether the reader expects inline QoS. @@ -418,28 +412,28 @@ class BaseReader IReaderDataFilter* data_filter_ = nullptr; /// The history record associated with this reader. - fastrtps::rtps::ReaderHistoryState* history_state_; + fastdds::rtps::ReaderHistoryState* history_state_; /// Total number of unread samples in the history. uint64_t total_unread_ = 0; /// Condition variable to wait for unread samples. - fastrtps::TimedConditionVariable new_notification_cv_; + fastdds::TimedConditionVariable new_notification_cv_; /// The liveliness kind of this reader. fastdds::dds::LivelinessQosPolicyKind liveliness_kind_; /// The liveliness lease duration of this reader. - fastrtps::Duration_t liveliness_lease_duration_; + fastdds::Duration_t liveliness_lease_duration_; /// Whether the reader is datasharing compatible. bool is_datasharing_compatible_ = false; /// The listener for the datasharing notifications. - std::unique_ptr datasharing_listener_; + std::unique_ptr datasharing_listener_; /// The liveliness changed status struct as defined in the DDS standard. fastdds::dds::LivelinessChangedStatus liveliness_changed_status_; /// Trusted writer (for Builtin) - fastrtps::rtps::EntityId_t trusted_writer_entity_id_; + fastdds::rtps::EntityId_t trusted_writer_entity_id_; private: @@ -451,8 +445,8 @@ class BaseReader * @param change_pool Change pool to use. */ void init( - const std::shared_ptr& payload_pool, - const std::shared_ptr& change_pool); + const std::shared_ptr& payload_pool, + const std::shared_ptr& change_pool); /** * @brief Perform datasharing related setup. @@ -463,7 +457,7 @@ class BaseReader * @param att Attributes of the reader. */ void setup_datasharing( - const fastrtps::rtps::ReaderAttributes& att); + const fastdds::rtps::ReaderAttributes& att); }; diff --git a/src/cpp/rtps/reader/RTPSReader.cpp b/src/cpp/rtps/reader/RTPSReader.cpp index d502f85eaf8..e96d4e1244e 100644 --- a/src/cpp/rtps/reader/RTPSReader.cpp +++ b/src/cpp/rtps/reader/RTPSReader.cpp @@ -27,7 +27,7 @@ namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { RTPSReader::RTPSReader( @@ -49,5 +49,5 @@ RTPSReader::~RTPSReader() } } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/reader/ReaderHistoryState.hpp b/src/cpp/rtps/reader/ReaderHistoryState.hpp index cdac9749cb6..88ccf420305 100644 --- a/src/cpp/rtps/reader/ReaderHistoryState.hpp +++ b/src/cpp/rtps/reader/ReaderHistoryState.hpp @@ -30,7 +30,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { using guid_map_helper = utilities::collections::map_size_helper; @@ -76,7 +76,7 @@ struct ReaderHistoryState }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif /* FASTDDS_RTPS_READER_READERHISTORYSTATE_HPP_ */ diff --git a/src/cpp/rtps/reader/StatefulPersistentReader.cpp b/src/cpp/rtps/reader/StatefulPersistentReader.cpp index 943c41a7f82..16172e064fd 100644 --- a/src/cpp/rtps/reader/StatefulPersistentReader.cpp +++ b/src/cpp/rtps/reader/StatefulPersistentReader.cpp @@ -25,7 +25,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { StatefulPersistentReader::StatefulPersistentReader( @@ -105,5 +105,5 @@ bool StatefulPersistentReader::may_remove_history_record( } } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/reader/StatefulPersistentReader.hpp b/src/cpp/rtps/reader/StatefulPersistentReader.hpp index 855352725af..181c48de101 100644 --- a/src/cpp/rtps/reader/StatefulPersistentReader.hpp +++ b/src/cpp/rtps/reader/StatefulPersistentReader.hpp @@ -24,7 +24,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class IPersistenceService; @@ -88,7 +88,7 @@ class StatefulPersistentReader : public StatefulReader }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/src/cpp/rtps/reader/StatefulReader.cpp b/src/cpp/rtps/reader/StatefulReader.cpp index 4033be9b608..25eda711134 100644 --- a/src/cpp/rtps/reader/StatefulReader.cpp +++ b/src/cpp/rtps/reader/StatefulReader.cpp @@ -45,7 +45,10 @@ #define IDSTRING "(ID:" << std::this_thread::get_id() << ") " << -using namespace eprosima::fastrtps::rtps; +namespace eprosima { +namespace fastdds { +namespace rtps { + using BaseReader = eprosima::fastdds::rtps::BaseReader; static void send_datasharing_ack( @@ -1089,7 +1092,7 @@ bool StatefulReader::change_received( "Writer Proxy " << a_change->writerGUID << " not matched to this Reader " << m_guid.entityId); return false; } - else if (a_change->kind != eprosima::fastrtps::rtps::ChangeKind_t::ALIVE) + else if (a_change->kind != eprosima::fastdds::rtps::ChangeKind_t::ALIVE) { EPROSIMA_LOG_INFO(RTPS_READER, "Not alive change " << a_change->writerGUID << " has not WriterProxy"); return false; @@ -1644,3 +1647,7 @@ bool StatefulReader::send_sync_nts( return mp_RTPSParticipant->sendSync(buffers, total_bytes, m_guid, locators_begin, locators_end, max_blocking_time_point); } + +} // namespace rtps +} // namespace fastdds +} // namespace eprosima diff --git a/src/cpp/rtps/reader/StatefulReader.hpp b/src/cpp/rtps/reader/StatefulReader.hpp index fc9d6b74ac7..de2b73a0f11 100644 --- a/src/cpp/rtps/reader/StatefulReader.hpp +++ b/src/cpp/rtps/reader/StatefulReader.hpp @@ -32,7 +32,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class WriterProxy; @@ -330,11 +330,11 @@ class StatefulReader : public fastdds::rtps::BaseReader * @return Iterator pointing to the position were the change was found. * It can be used to improve the following call to this same method. */ - fastrtps::rtps::History::const_iterator find_cache_in_fragmented_process( - const fastrtps::rtps::SequenceNumber_t& sequence_number, - const fastrtps::rtps::GUID_t& writer_guid, - fastrtps::rtps::CacheChange_t*& change, - fastrtps::rtps::History::const_iterator hint) const; + fastdds::rtps::History::const_iterator find_cache_in_fragmented_process( + const fastdds::rtps::SequenceNumber_t& sequence_number, + const fastdds::rtps::GUID_t& writer_guid, + fastdds::rtps::CacheChange_t*& change, + fastdds::rtps::History::const_iterator hint) const; /*! * @remarks Non thread-safe. @@ -369,7 +369,7 @@ class StatefulReader : public fastdds::rtps::BaseReader }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/src/cpp/rtps/reader/StatelessPersistentReader.cpp b/src/cpp/rtps/reader/StatelessPersistentReader.cpp index ced2fb31f3f..afd126eb815 100644 --- a/src/cpp/rtps/reader/StatelessPersistentReader.cpp +++ b/src/cpp/rtps/reader/StatelessPersistentReader.cpp @@ -25,7 +25,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { StatelessPersistentReader::StatelessPersistentReader( @@ -105,5 +105,5 @@ bool StatelessPersistentReader::may_remove_history_record( } } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/reader/StatelessPersistentReader.hpp b/src/cpp/rtps/reader/StatelessPersistentReader.hpp index 3e05868f632..5261646d13f 100644 --- a/src/cpp/rtps/reader/StatelessPersistentReader.hpp +++ b/src/cpp/rtps/reader/StatelessPersistentReader.hpp @@ -24,7 +24,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class IPersistenceService; @@ -88,7 +88,7 @@ class StatelessPersistentReader : public StatelessReader }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/src/cpp/rtps/reader/StatelessReader.cpp b/src/cpp/rtps/reader/StatelessReader.cpp index 1878c3637f8..ebcda902449 100644 --- a/src/cpp/rtps/reader/StatelessReader.cpp +++ b/src/cpp/rtps/reader/StatelessReader.cpp @@ -42,7 +42,10 @@ #define IDSTRING "(ID:" << std::this_thread::get_id() << ") " << -using namespace eprosima::fastrtps::rtps; +namespace eprosima { +namespace fastdds { +namespace rtps { + using BaseReader = eprosima::fastdds::rtps::BaseReader; StatelessReader::~StatelessReader() @@ -910,3 +913,7 @@ bool StatelessReader::writer_has_manual_liveliness( } return false; } + +} // namespace rtps +} // namespace fastdds +} // namespace eprosima diff --git a/src/cpp/rtps/reader/StatelessReader.hpp b/src/cpp/rtps/reader/StatelessReader.hpp index ebfb77e7549..07d857b8f01 100644 --- a/src/cpp/rtps/reader/StatelessReader.hpp +++ b/src/cpp/rtps/reader/StatelessReader.hpp @@ -32,7 +32,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** @@ -271,7 +271,7 @@ class StatelessReader : public fastdds::rtps::BaseReader }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/src/cpp/rtps/reader/WriterProxy.cpp b/src/cpp/rtps/reader/WriterProxy.cpp index a52b95702fb..4e48ba87fbc 100644 --- a/src/cpp/rtps/reader/WriterProxy.cpp +++ b/src/cpp/rtps/reader/WriterProxy.cpp @@ -45,7 +45,7 @@ #endif // SHOULD_DEBUG_LINUX namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { WriterProxy::~WriterProxy() @@ -121,7 +121,7 @@ void WriterProxy::start( const SequenceNumber_t& initial_sequence, bool is_datasharing) { - using fastdds::rtps::network::external_locators::filter_remote_locators; + using network::external_locators::filter_remote_locators; #ifdef SHOULD_DEBUG_LINUX assert(get_mutex_owner() == get_thread_id()); @@ -152,7 +152,7 @@ void WriterProxy::start( void WriterProxy::update( const WriterProxyData& attributes) { - using fastdds::rtps::network::external_locators::filter_remote_locators; + using network::external_locators::filter_remote_locators; #ifdef SHOULD_DEBUG_LINUX assert(get_mutex_owner() == get_thread_id()); @@ -653,5 +653,5 @@ int WriterProxy::get_thread_id() const #endif // SHOULD_DEBUG_LINUX } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/reader/WriterProxy.h b/src/cpp/rtps/reader/WriterProxy.h index c641690dddb..6f447268764 100644 --- a/src/cpp/rtps/reader/WriterProxy.h +++ b/src/cpp/rtps/reader/WriterProxy.h @@ -42,7 +42,7 @@ #endif // TEST_FRIENDS namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSParticipantImpl; @@ -431,7 +431,7 @@ class WriterProxy : public RTPSMessageSenderInterface }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/src/cpp/rtps/reader/reader_utils.cpp b/src/cpp/rtps/reader/reader_utils.cpp index ed7a024f498..bf08fb3e6b5 100644 --- a/src/cpp/rtps/reader/reader_utils.cpp +++ b/src/cpp/rtps/reader/reader_utils.cpp @@ -32,7 +32,7 @@ bool change_is_relevant_for_filter( bool ret = true; // Only evaluate filter on ALIVE changes, as UNREGISTERED and DISPOSED are always relevant - if ((nullptr != filter) && (fastrtps::rtps::ALIVE == change.kind) && (!filter->is_relevant(change, reader_guid))) + if ((nullptr != filter) && (fastdds::rtps::ALIVE == change.kind) && (!filter->is_relevant(change, reader_guid))) { ret = false; } diff --git a/src/cpp/rtps/reader/reader_utils.hpp b/src/cpp/rtps/reader/reader_utils.hpp index bd2d2f9bad9..5df85633a88 100644 --- a/src/cpp/rtps/reader/reader_utils.hpp +++ b/src/cpp/rtps/reader/reader_utils.hpp @@ -28,8 +28,8 @@ namespace eprosima { namespace fastdds { namespace rtps { -using CacheChange = fastrtps::rtps::CacheChange_t; -using GUID = fastrtps::rtps::GUID_t; +using CacheChange = fastdds::rtps::CacheChange_t; +using GUID = fastdds::rtps::GUID_t; /** * @brief Check if a change is relevant for a reader. diff --git a/src/cpp/rtps/resources/ResourceEvent.cpp b/src/cpp/rtps/resources/ResourceEvent.cpp index fe2aa99f635..954f63c645f 100644 --- a/src/cpp/rtps/resources/ResourceEvent.cpp +++ b/src/cpp/rtps/resources/ResourceEvent.cpp @@ -27,7 +27,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { static bool event_compare( @@ -328,5 +328,5 @@ void ResourceEvent::init_thread( } } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/resources/ResourceEvent.h b/src/cpp/rtps/resources/ResourceEvent.h index 6016232d1e7..735e3725d19 100644 --- a/src/cpp/rtps/resources/ResourceEvent.h +++ b/src/cpp/rtps/resources/ResourceEvent.h @@ -35,7 +35,7 @@ namespace eprosima { class thread; -namespace fastrtps { +namespace fastdds { namespace rtps { class TimedEventImpl; @@ -176,7 +176,7 @@ class ResourceEvent }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif //DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/src/cpp/rtps/resources/TimedEvent.cpp b/src/cpp/rtps/resources/TimedEvent.cpp index c3beb3d4c0d..f2e5023af98 100644 --- a/src/cpp/rtps/resources/TimedEvent.cpp +++ b/src/cpp/rtps/resources/TimedEvent.cpp @@ -23,7 +23,7 @@ #include "TimedEventImpl.h" namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { TimedEvent::TimedEvent( @@ -100,5 +100,5 @@ double TimedEvent::getRemainingTimeMilliSec() } } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/resources/TimedEvent.h b/src/cpp/rtps/resources/TimedEvent.h index 686a5f5d297..54951fb8ce0 100644 --- a/src/cpp/rtps/resources/TimedEvent.h +++ b/src/cpp/rtps/resources/TimedEvent.h @@ -29,7 +29,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class TimedEventImpl; @@ -178,7 +178,7 @@ class TimedEvent }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif //DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/src/cpp/rtps/resources/TimedEventImpl.cpp b/src/cpp/rtps/resources/TimedEventImpl.cpp index 0249b500083..ca013c5b8a6 100644 --- a/src/cpp/rtps/resources/TimedEventImpl.cpp +++ b/src/cpp/rtps/resources/TimedEventImpl.cpp @@ -24,7 +24,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { TimedEventImpl::TimedEventImpl( @@ -111,7 +111,7 @@ void TimedEventImpl::trigger( } bool TimedEventImpl::update_interval( - const eprosima::fastrtps::Duration_t& interval) + const eprosima::fastdds::Duration_t& interval) { interval_microsec_ = std::chrono::microseconds(fastdds::rtps::TimeConv::Duration_t2MicroSecondsInt64(interval)); return true; @@ -125,5 +125,5 @@ bool TimedEventImpl::update_interval_millisec( } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/rtps/resources/TimedEventImpl.h b/src/cpp/rtps/resources/TimedEventImpl.h index a36f767c279..2185731a885 100644 --- a/src/cpp/rtps/resources/TimedEventImpl.h +++ b/src/cpp/rtps/resources/TimedEventImpl.h @@ -29,7 +29,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /*! @@ -159,7 +159,7 @@ class TimedEventImpl }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif //DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/src/cpp/rtps/security/ISecurityPluginFactory.h b/src/cpp/rtps/security/ISecurityPluginFactory.h index 6e694c37007..f5edda15400 100644 --- a/src/cpp/rtps/security/ISecurityPluginFactory.h +++ b/src/cpp/rtps/security/ISecurityPluginFactory.h @@ -25,7 +25,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -72,7 +72,7 @@ class ISecurityPluginFactory } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _RTPS_SECURITY_SECURITYPLUGINFACTORY_H_ diff --git a/src/cpp/rtps/security/SecurityManager.cpp b/src/cpp/rtps/security/SecurityManager.cpp index b07b93c74cf..f1198114746 100644 --- a/src/cpp/rtps/security/SecurityManager.cpp +++ b/src/cpp/rtps/security/SecurityManager.cpp @@ -64,9 +64,11 @@ // TODO(Ricardo) Add event because stateless messages can be not received. -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; -using namespace eprosima::fastrtps::rtps::security; +namespace eprosima { +namespace fastdds { +namespace rtps { + +using namespace security; inline bool usleep_bool() { @@ -85,14 +87,14 @@ SecurityManager::SecurityManager( , auth_last_sequence_number_(1) , crypto_last_sequence_number_(1) , temp_reader_proxies_({ - participant->getRTPSParticipantAttributes().allocation.locators.max_unicast_locators, - participant->getRTPSParticipantAttributes().allocation.locators.max_multicast_locators, - participant->getRTPSParticipantAttributes().allocation.data_limits, - participant->getRTPSParticipantAttributes().allocation.content_filter}) + participant->getRTPSParticipantAttributes().allocation.locators.max_unicast_locators, + participant->getRTPSParticipantAttributes().allocation.locators.max_multicast_locators, + participant->getRTPSParticipantAttributes().allocation.data_limits, + participant->getRTPSParticipantAttributes().allocation.content_filter}) , temp_writer_proxies_({ - participant->getRTPSParticipantAttributes().allocation.locators.max_unicast_locators, - participant->getRTPSParticipantAttributes().allocation.locators.max_multicast_locators, - participant->getRTPSParticipantAttributes().allocation.data_limits}) + participant->getRTPSParticipantAttributes().allocation.locators.max_unicast_locators, + participant->getRTPSParticipantAttributes().allocation.locators.max_multicast_locators, + participant->getRTPSParticipantAttributes().allocation.data_limits}) { assert(participant != nullptr); static OpenSSLInit openssl_init; @@ -4357,3 +4359,7 @@ void SecurityManager::onWriterChangeReceivedByAll( participant_volatile_message_secure_writer_history_->remove_change(change); } } + +} // namespace rtps +} // namespace fastdds +} // namespace eprosima diff --git a/src/cpp/rtps/security/SecurityManager.h b/src/cpp/rtps/security/SecurityManager.h index b47f79a540d..eb5b82cac07 100644 --- a/src/cpp/rtps/security/SecurityManager.h +++ b/src/cpp/rtps/security/SecurityManager.h @@ -42,7 +42,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSParticipantImpl; @@ -559,7 +559,7 @@ class SecurityManager : private WriterListener }; - class ParticipantStatelessMessageListener : public eprosima::fastrtps::rtps::ReaderListener + class ParticipantStatelessMessageListener : public eprosima::fastdds::rtps::ReaderListener { public: @@ -586,7 +586,7 @@ class SecurityManager : private WriterListener } participant_stateless_message_listener_; - class ParticipantVolatileMessageListener : public eprosima::fastrtps::rtps::ReaderListener + class ParticipantVolatileMessageListener : public eprosima::fastdds::rtps::ReaderListener { public: @@ -946,7 +946,7 @@ class SecurityManager : private WriterListener } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _RTPS_SECURITY_SECURITYMANAGER_H_ diff --git a/src/cpp/rtps/security/SecurityPluginFactory.cpp b/src/cpp/rtps/security/SecurityPluginFactory.cpp index c5f07d83878..482c9d80e7d 100644 --- a/src/cpp/rtps/security/SecurityPluginFactory.cpp +++ b/src/cpp/rtps/security/SecurityPluginFactory.cpp @@ -22,8 +22,11 @@ #include #include -using namespace eprosima::fastrtps::rtps; -using namespace eprosima::fastrtps::rtps::security; +namespace eprosima { +namespace fastdds { +namespace rtps { + +using namespace security; Authentication* SecurityPluginFactory::create_authentication_plugin( const PropertyPolicy& property_policy) @@ -117,3 +120,7 @@ Logging* SecurityPluginFactory::create_builtin_logging_plugin() { return new LogTopic(); } + +} // namespace rtps +} // namespace fastdds +} // namespace eprosima diff --git a/src/cpp/rtps/security/SecurityPluginFactory.h b/src/cpp/rtps/security/SecurityPluginFactory.h index 16daa9ae020..7107d32dbe4 100644 --- a/src/cpp/rtps/security/SecurityPluginFactory.h +++ b/src/cpp/rtps/security/SecurityPluginFactory.h @@ -26,7 +26,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -59,7 +59,7 @@ class SecurityPluginFactory : public ISecurityPluginFactory } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _RTPS_SECURITY_SECURITYPLUGINFACTORY_H_ diff --git a/src/cpp/rtps/security/accesscontrol/AccessControl.h b/src/cpp/rtps/security/accesscontrol/AccessControl.h index a80aa893313..9df6715f458 100644 --- a/src/cpp/rtps/security/accesscontrol/AccessControl.h +++ b/src/cpp/rtps/security/accesscontrol/AccessControl.h @@ -22,7 +22,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSParticipantAttributes; @@ -178,7 +178,7 @@ class AccessControl } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _FASTDDS_RTPS_SECURITY_ACCESSCONTROL_ACCESSCONTROL_H_ diff --git a/src/cpp/rtps/security/accesscontrol/ParticipantSecurityAttributes.h b/src/cpp/rtps/security/accesscontrol/ParticipantSecurityAttributes.h index 5cb1cef7370..2aaf9ec22b7 100644 --- a/src/cpp/rtps/security/accesscontrol/ParticipantSecurityAttributes.h +++ b/src/cpp/rtps/security/accesscontrol/ParticipantSecurityAttributes.h @@ -21,7 +21,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -178,7 +178,7 @@ struct ParticipantSecurityAttributes } // namespace security } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _FASTDDS_RTPS_SECURITY_ACCESSCONTROL_PARTICIPANTSECURITYATTRIBUTES_H_ diff --git a/src/cpp/rtps/security/accesscontrol/SecurityMaskUtilities.h b/src/cpp/rtps/security/accesscontrol/SecurityMaskUtilities.h index 8c3de5257a1..cb7848af6ac 100644 --- a/src/cpp/rtps/security/accesscontrol/SecurityMaskUtilities.h +++ b/src/cpp/rtps/security/accesscontrol/SecurityMaskUtilities.h @@ -19,7 +19,7 @@ #define _FASTDDS_RTPS_SECURITY_ACCESSCONTROL_SECURITYMASKUTILITIES_H_ namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -37,7 +37,7 @@ inline bool security_mask_matches( } // namespace security } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _FASTDDS_RTPS_SECURITY_ACCESSCONTROL_SECURITYMASKUTILITIES_H_ diff --git a/src/cpp/rtps/security/authentication/Authentication.h b/src/cpp/rtps/security/authentication/Authentication.h index 33a46918ef8..5efa5034dfd 100644 --- a/src/cpp/rtps/security/authentication/Authentication.h +++ b/src/cpp/rtps/security/authentication/Authentication.h @@ -30,7 +30,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -290,7 +290,7 @@ class Authentication } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _FASTDDS_RTPS_SECURITY_AUTHENTICATION_AUTHENTICATION_H_ diff --git a/src/cpp/rtps/security/authentication/Handshake.h b/src/cpp/rtps/security/authentication/Handshake.h index c976c9b198e..7b000e899ee 100644 --- a/src/cpp/rtps/security/authentication/Handshake.h +++ b/src/cpp/rtps/security/authentication/Handshake.h @@ -22,7 +22,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -31,7 +31,7 @@ typedef Handle HandshakeHandle; typedef Token HandshakeMessageToken; } //namespace eprosima -} //namespace fastrtps +} //namespace fastdds } //namespace rtps } //namespace security diff --git a/src/cpp/rtps/security/common/Handle.h b/src/cpp/rtps/security/common/Handle.h index 7efb54ab639..5ce33d9ce7e 100644 --- a/src/cpp/rtps/security/common/Handle.h +++ b/src/cpp/rtps/security/common/Handle.h @@ -22,7 +22,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -169,7 +169,7 @@ typedef Handle DatareaderCryptoHandle; } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _FASTDDS_RTPS_SECURITY_COMMON_HANDLE_H_ diff --git a/src/cpp/rtps/security/common/ParticipantGenericMessage.h b/src/cpp/rtps/security/common/ParticipantGenericMessage.h index 64f6072f46c..2effdaa0a7f 100644 --- a/src/cpp/rtps/security/common/ParticipantGenericMessage.h +++ b/src/cpp/rtps/security/common/ParticipantGenericMessage.h @@ -22,7 +22,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -392,7 +392,7 @@ class ParticipantGenericMessageHelper } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _FASTDDS_RTPS_SECURITY_COMMON_PARTICIPANTGENERICMESSAGE_H_ diff --git a/src/cpp/rtps/security/common/SharedSecretHandle.cpp b/src/cpp/rtps/security/common/SharedSecretHandle.cpp index 63fbc4cbd56..655a700348c 100644 --- a/src/cpp/rtps/security/common/SharedSecretHandle.cpp +++ b/src/cpp/rtps/security/common/SharedSecretHandle.cpp @@ -18,7 +18,7 @@ #include -using namespace eprosima::fastrtps::rtps::security; +using namespace eprosima::fastdds::rtps::security; const char* const SharedSecret::class_id_ = "SharedSecret"; diff --git a/src/cpp/rtps/security/common/SharedSecretHandle.h b/src/cpp/rtps/security/common/SharedSecretHandle.h index d91f1cfe843..c53b153d0e2 100644 --- a/src/cpp/rtps/security/common/SharedSecretHandle.h +++ b/src/cpp/rtps/security/common/SharedSecretHandle.h @@ -23,7 +23,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -156,7 +156,7 @@ class SharedSecretHelper } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _FASTDDS_RTPS_SECURITY_COMMON_SHAREDSECRETHANDLE_H_ diff --git a/src/cpp/rtps/security/cryptography/CryptoKeyExchange.h b/src/cpp/rtps/security/cryptography/CryptoKeyExchange.h index ce23d648be5..425dc74873e 100644 --- a/src/cpp/rtps/security/cryptography/CryptoKeyExchange.h +++ b/src/cpp/rtps/security/cryptography/CryptoKeyExchange.h @@ -21,7 +21,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -134,7 +134,7 @@ class CryptoKeyExchange }; } //namespace eprosima -} //namespace fastrtps +} //namespace fastdds } //namespace rtps } //namespace security diff --git a/src/cpp/rtps/security/cryptography/CryptoKeyFactory.h b/src/cpp/rtps/security/cryptography/CryptoKeyFactory.h index 12eb371423e..72e60f831ce 100644 --- a/src/cpp/rtps/security/cryptography/CryptoKeyFactory.h +++ b/src/cpp/rtps/security/cryptography/CryptoKeyFactory.h @@ -26,7 +26,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -224,7 +224,7 @@ class CryptoKeyFactory } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif //_FASTDDS_RTPS_SECURITY_CRYPTOGRAPHY_CRYPTOKEYFACTORY_H_ diff --git a/src/cpp/rtps/security/cryptography/CryptoTransform.h b/src/cpp/rtps/security/cryptography/CryptoTransform.h index 5b6ef61d238..0ca561a491a 100644 --- a/src/cpp/rtps/security/cryptography/CryptoTransform.h +++ b/src/cpp/rtps/security/cryptography/CryptoTransform.h @@ -25,7 +25,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -199,7 +199,7 @@ class CryptoTransform }; } //namespace eprosima -} //namespace fastrtps +} //namespace fastdds } //namespace rtps } //namespace security diff --git a/src/cpp/rtps/security/cryptography/CryptoTypes.h b/src/cpp/rtps/security/cryptography/CryptoTypes.h index 81ebeac0baf..4e8056dd177 100644 --- a/src/cpp/rtps/security/cryptography/CryptoTypes.h +++ b/src/cpp/rtps/security/cryptography/CryptoTypes.h @@ -41,7 +41,7 @@ const uint8_t SRTPS_POSTFIX = _SRTPS_POSTFIX_; const uint8_t SecureBodySubmessage = _SecureBodySubmessage_; namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -80,7 +80,7 @@ enum SecureSubmessageCategory_t : uint8_t } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif //_FASTDDS_RTPS_SECURITY_CRYPTOGRAPHY_CRYPTOTYPES_H_ diff --git a/src/cpp/rtps/security/cryptography/Cryptography.h b/src/cpp/rtps/security/cryptography/Cryptography.h index 3515d0f10b6..071faea352f 100644 --- a/src/cpp/rtps/security/cryptography/Cryptography.h +++ b/src/cpp/rtps/security/cryptography/Cryptography.h @@ -24,7 +24,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -64,7 +64,7 @@ class Cryptography } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif //_FASTDDS_RTPS_SECURITY_CRYPTOGRAPHY_CRYPTOGRAPHY_H_ diff --git a/src/cpp/rtps/security/exceptions/SecurityException.cpp b/src/cpp/rtps/security/exceptions/SecurityException.cpp index b2c5482f5fd..f24f197e889 100644 --- a/src/cpp/rtps/security/exceptions/SecurityException.cpp +++ b/src/cpp/rtps/security/exceptions/SecurityException.cpp @@ -14,7 +14,7 @@ #include "SecurityException.h" -using namespace eprosima::fastrtps::rtps::security; +using namespace eprosima::fastdds::rtps::security; SecurityException::SecurityException( const SecurityException& ex) diff --git a/src/cpp/rtps/security/exceptions/SecurityException.h b/src/cpp/rtps/security/exceptions/SecurityException.h index 7fb8bb07fb2..03a4fbad568 100644 --- a/src/cpp/rtps/security/exceptions/SecurityException.h +++ b/src/cpp/rtps/security/exceptions/SecurityException.h @@ -21,7 +21,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -83,7 +83,7 @@ class SecurityException : public Exception }; } // namespace security } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _FASTDDS_RTPS_SECURITY_EXCEPTIONS_SECURITYEXCEPTION_H_ diff --git a/src/cpp/rtps/security/logging/BuiltinLoggingType.h b/src/cpp/rtps/security/logging/BuiltinLoggingType.h index 4fc4c8203d7..c4d30b0a54e 100644 --- a/src/cpp/rtps/security/logging/BuiltinLoggingType.h +++ b/src/cpp/rtps/security/logging/BuiltinLoggingType.h @@ -26,7 +26,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -52,7 +52,7 @@ struct BuiltinLoggingType final } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _FASTDDS_RTPS_SECURITY_LOGGING_BUILTINLOGGINGTYPE_H_ diff --git a/src/cpp/rtps/security/logging/LogOptions.h b/src/cpp/rtps/security/logging/LogOptions.h index e66608bfda9..5ef1c9b6453 100644 --- a/src/cpp/rtps/security/logging/LogOptions.h +++ b/src/cpp/rtps/security/logging/LogOptions.h @@ -23,7 +23,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -46,7 +46,7 @@ struct LogOptions } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _FASTDDS_RTPS_SECURITY_LOGGING_LOGOPTIONS_H_ diff --git a/src/cpp/rtps/security/logging/Logging.cpp b/src/cpp/rtps/security/logging/Logging.cpp index 18831bb5bfa..1a869e6a5cc 100644 --- a/src/cpp/rtps/security/logging/Logging.cpp +++ b/src/cpp/rtps/security/logging/Logging.cpp @@ -3,7 +3,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -195,5 +195,5 @@ bool Logging::set_domain_id( } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima diff --git a/src/cpp/rtps/security/logging/Logging.h b/src/cpp/rtps/security/logging/Logging.h index edb95a2091c..77f63983aea 100644 --- a/src/cpp/rtps/security/logging/Logging.h +++ b/src/cpp/rtps/security/logging/Logging.h @@ -28,7 +28,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -228,7 +228,7 @@ bool Logging::compose_header( } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima @@ -268,7 +268,7 @@ bool Logging::compose_header( #define __FASTDDS_SECURITY_LOGGING_EX(LEVEL, CLASS, MESSAGE) \ do { \ - eprosima::fastrtps::rtps::security::SecurityException lexception; \ + eprosima::fastdds::rtps::security::SecurityException lexception; \ __FASTDDS_SECURITY_LOGGING(LEVEL, CLASS, MESSAGE, lexception); \ } while (0); diff --git a/src/cpp/rtps/security/logging/LoggingLevel.cpp b/src/cpp/rtps/security/logging/LoggingLevel.cpp index b494c51f610..4c5a70a1e66 100644 --- a/src/cpp/rtps/security/logging/LoggingLevel.cpp +++ b/src/cpp/rtps/security/logging/LoggingLevel.cpp @@ -20,7 +20,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -116,5 +116,5 @@ bool LogLevel_to_string( } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima \ No newline at end of file diff --git a/src/cpp/rtps/security/logging/LoggingLevel.h b/src/cpp/rtps/security/logging/LoggingLevel.h index 025d80d9164..32f4866039f 100644 --- a/src/cpp/rtps/security/logging/LoggingLevel.h +++ b/src/cpp/rtps/security/logging/LoggingLevel.h @@ -23,7 +23,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -58,7 +58,7 @@ bool LogLevel_to_string( } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _FASTDDS_RTPS_SECURITY_LOGGING_LOGGINGLEVEL_H_ diff --git a/src/cpp/rtps/security/logging/NameValuePair.h b/src/cpp/rtps/security/logging/NameValuePair.h index fd1c5a9cf0b..189fc43b3e2 100644 --- a/src/cpp/rtps/security/logging/NameValuePair.h +++ b/src/cpp/rtps/security/logging/NameValuePair.h @@ -22,7 +22,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -41,7 +41,7 @@ using NameValuePairSeq = std::vector; } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _FASTDDS_RTPS_SECURITY_LOGGING_NAMEVALUEPAIR_H_ diff --git a/src/cpp/rtps/transport/ChainingReceiverResource.hpp b/src/cpp/rtps/transport/ChainingReceiverResource.hpp index e78c235a1dc..1a60db12b30 100644 --- a/src/cpp/rtps/transport/ChainingReceiverResource.hpp +++ b/src/cpp/rtps/transport/ChainingReceiverResource.hpp @@ -45,10 +45,10 @@ class ChainingReceiverResource : public TransportReceiverInterface * @param remote_locator Locator identifying the remote endpoint. */ void OnDataReceived( - const fastrtps::rtps::octet* data, + const octet* data, const uint32_t size, - const fastrtps::rtps::Locator_t& local_locator, - const fastrtps::rtps::Locator_t& remote_locator) override + const Locator_t& local_locator, + const Locator_t& remote_locator) override { transport_.receive(low_receiver_resource_, data, size, local_locator, remote_locator); } diff --git a/src/cpp/rtps/transport/ChainingSenderResource.hpp b/src/cpp/rtps/transport/ChainingSenderResource.hpp index cafbf917561..6754ced617a 100644 --- a/src/cpp/rtps/transport/ChainingSenderResource.hpp +++ b/src/cpp/rtps/transport/ChainingSenderResource.hpp @@ -22,7 +22,7 @@ namespace eprosima { namespace fastdds { namespace rtps { -class ChainingSenderResource : public fastrtps::rtps::SenderResource +class ChainingSenderResource : public SenderResource { public: @@ -42,8 +42,8 @@ class ChainingSenderResource : public fastrtps::rtps::SenderResource send_buffers_lambda_ = [this, &transport]( const std::vector& buffers, uint32_t total_bytes, - fastrtps::rtps::LocatorsIterator* destination_locators_begin, - fastrtps::rtps::LocatorsIterator* destination_locators_end, + LocatorsIterator* destination_locators_begin, + LocatorsIterator* destination_locators_end, const std::chrono::steady_clock::time_point& timeout) -> bool { if (low_sender_resource_) @@ -56,13 +56,13 @@ class ChainingSenderResource : public fastrtps::rtps::SenderResource }; } - fastrtps::rtps::SenderResource* lower_sender_cast() + SenderResource* lower_sender_cast() { - fastrtps::rtps::SenderResource* lower_sender_cast = nullptr; + SenderResource* lower_sender_cast = nullptr; if (low_sender_resource_) { - lower_sender_cast = static_cast(low_sender_resource_.get()); + lower_sender_cast = static_cast(low_sender_resource_.get()); } return lower_sender_cast; @@ -90,7 +90,7 @@ class ChainingSenderResource : public fastrtps::rtps::SenderResource }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _RTPS_TRANSPORT_CHAININGSENDERRESOURCE_HPP_ diff --git a/src/cpp/rtps/transport/ChainingTransport.cpp b/src/cpp/rtps/transport/ChainingTransport.cpp index 0c229fd8db0..3b7e7625b39 100644 --- a/src/cpp/rtps/transport/ChainingTransport.cpp +++ b/src/cpp/rtps/transport/ChainingTransport.cpp @@ -27,7 +27,7 @@ void ChainingReceiverResourceDeleter::operator ()( } bool ChainingTransport::OpenInputChannel( - const fastrtps::rtps::Locator_t& loc, + const Locator_t& loc, TransportReceiverInterface* receiver_interface, uint32_t max_message_size) { @@ -45,7 +45,7 @@ bool ChainingTransport::OpenInputChannel( bool ChainingTransport::OpenOutputChannel( SendResourceList& sender_resource_list, - const fastrtps::rtps::Locator_t& loc) + const Locator_t& loc) { size_t original_size = sender_resource_list.size(); bool returned_value = low_level_transport_->OpenOutputChannel(sender_resource_list, loc); diff --git a/src/cpp/rtps/transport/ChannelResource.h b/src/cpp/rtps/transport/ChannelResource.h index 58a25b2b764..cad309b1b58 100644 --- a/src/cpp/rtps/transport/ChannelResource.h +++ b/src/cpp/rtps/transport/ChannelResource.h @@ -60,7 +60,7 @@ class ChannelResource alive_.store(false); } - inline fastrtps::rtps::CDRMessage_t& message_buffer() + inline CDRMessage_t& message_buffer() { return message_buffer_; } @@ -68,7 +68,7 @@ class ChannelResource protected: //!Received message - fastrtps::rtps::CDRMessage_t message_buffer_; + CDRMessage_t message_buffer_; std::atomic alive_; eprosima::thread thread_; diff --git a/src/cpp/rtps/transport/PortBasedTransportDescriptor.cpp b/src/cpp/rtps/transport/PortBasedTransportDescriptor.cpp index 91640346586..fa51945c801 100644 --- a/src/cpp/rtps/transport/PortBasedTransportDescriptor.cpp +++ b/src/cpp/rtps/transport/PortBasedTransportDescriptor.cpp @@ -16,8 +16,6 @@ #include -using namespace eprosima::fastdds::rtps; - namespace eprosima { namespace fastdds { namespace rtps { diff --git a/src/cpp/rtps/transport/TCPAcceptor.cpp b/src/cpp/rtps/transport/TCPAcceptor.cpp index 65f35a2441d..d20146b2b73 100644 --- a/src/cpp/rtps/transport/TCPAcceptor.cpp +++ b/src/cpp/rtps/transport/TCPAcceptor.cpp @@ -21,7 +21,7 @@ namespace eprosima { namespace fastdds { namespace rtps { -using IPLocator = fastrtps::rtps::IPLocator; +using IPLocator = fastdds::rtps::IPLocator; TCPAcceptor::TCPAcceptor( asio::io_service& io_service, diff --git a/src/cpp/rtps/transport/TCPAcceptorBasic.cpp b/src/cpp/rtps/transport/TCPAcceptorBasic.cpp index 1ea675c60da..1a80f1a3936 100644 --- a/src/cpp/rtps/transport/TCPAcceptorBasic.cpp +++ b/src/cpp/rtps/transport/TCPAcceptorBasic.cpp @@ -21,7 +21,7 @@ namespace eprosima { namespace fastdds { namespace rtps { -using IPLocator = fastrtps::rtps::IPLocator; +using IPLocator = fastdds::rtps::IPLocator; TCPAcceptorBasic::TCPAcceptorBasic( asio::io_service& io_service, diff --git a/src/cpp/rtps/transport/TCPAcceptorSecure.cpp b/src/cpp/rtps/transport/TCPAcceptorSecure.cpp index 8935092cdb5..58c2c8906d5 100644 --- a/src/cpp/rtps/transport/TCPAcceptorSecure.cpp +++ b/src/cpp/rtps/transport/TCPAcceptorSecure.cpp @@ -21,7 +21,7 @@ namespace eprosima { namespace fastdds { namespace rtps { -using Locator_t = fastrtps::rtps::Locator_t; +using Locator_t = fastdds::rtps::Locator_t; using Log = fastdds::dds::Log; using namespace asio; diff --git a/src/cpp/rtps/transport/TCPChannelResource.cpp b/src/cpp/rtps/transport/TCPChannelResource.cpp index 4f37eb72dfb..03598502afa 100644 --- a/src/cpp/rtps/transport/TCPChannelResource.cpp +++ b/src/cpp/rtps/transport/TCPChannelResource.cpp @@ -26,7 +26,6 @@ namespace eprosima { namespace fastdds { namespace rtps { -using IPLocator = fastrtps::rtps::IPLocator; using Log = fastdds::dds::Log; /** diff --git a/src/cpp/rtps/transport/TCPChannelResource.h b/src/cpp/rtps/transport/TCPChannelResource.h index 85d2e189428..d3ac03bce17 100644 --- a/src/cpp/rtps/transport/TCPChannelResource.h +++ b/src/cpp/rtps/transport/TCPChannelResource.h @@ -133,7 +133,7 @@ class TCPChannelResource : public ChannelResource virtual void disconnect() = 0; virtual uint32_t read( - fastrtps::rtps::octet* buffer, + octet* buffer, std::size_t size, asio::error_code& ec) = 0; @@ -149,9 +149,9 @@ class TCPChannelResource : public ChannelResource * @return The number of bytes actually sent. */ size_t send( - const fastrtps::rtps::octet* header, + const fastdds::rtps::octet* header, size_t header_size, - const fastrtps::rtps::octet* data, + const fastdds::rtps::octet* data, uint32_t data_size, asio::error_code& ec) { @@ -173,7 +173,7 @@ class TCPChannelResource : public ChannelResource * @return The number of bytes actually sent. */ virtual size_t send( - const fastrtps::rtps::octet* header, + const octet* header, size_t header_size, const std::vector& buffers, uint32_t total_bytes, diff --git a/src/cpp/rtps/transport/TCPChannelResourceBasic.cpp b/src/cpp/rtps/transport/TCPChannelResourceBasic.cpp index ca1b5a56c7e..f00e38b698e 100644 --- a/src/cpp/rtps/transport/TCPChannelResourceBasic.cpp +++ b/src/cpp/rtps/transport/TCPChannelResourceBasic.cpp @@ -27,8 +27,6 @@ namespace eprosima { namespace fastdds { namespace rtps { -using octet = fastrtps::rtps::octet; -using IPLocator = fastrtps::rtps::IPLocator; using Log = fastdds::dds::Log; TCPChannelResourceBasic::TCPChannelResourceBasic( diff --git a/src/cpp/rtps/transport/TCPChannelResourceBasic.h b/src/cpp/rtps/transport/TCPChannelResourceBasic.h index 8d661d1da34..b1dd61575f5 100644 --- a/src/cpp/rtps/transport/TCPChannelResourceBasic.h +++ b/src/cpp/rtps/transport/TCPChannelResourceBasic.h @@ -54,12 +54,12 @@ class TCPChannelResourceBasic : public TCPChannelResource void disconnect() override; uint32_t read( - fastrtps::rtps::octet* buffer, + octet* buffer, std::size_t size, asio::error_code& ec) override; size_t send( - const fastrtps::rtps::octet* header, + const octet* header, size_t header_size, const std::vector& buffers, uint32_t total_bytes, diff --git a/src/cpp/rtps/transport/TCPChannelResourceSecure.cpp b/src/cpp/rtps/transport/TCPChannelResourceSecure.cpp index e415c025e1f..9967572724d 100644 --- a/src/cpp/rtps/transport/TCPChannelResourceSecure.cpp +++ b/src/cpp/rtps/transport/TCPChannelResourceSecure.cpp @@ -25,9 +25,6 @@ namespace eprosima { namespace fastdds { namespace rtps { -using Locator_t = fastrtps::rtps::Locator_t; -using IPLocator = fastrtps::rtps::IPLocator; -using octet = fastrtps::rtps::octet; using Log = fastdds::dds::Log; using namespace asio; diff --git a/src/cpp/rtps/transport/TCPChannelResourceSecure.h b/src/cpp/rtps/transport/TCPChannelResourceSecure.h index 8ed2abf2956..8d12d8ea219 100644 --- a/src/cpp/rtps/transport/TCPChannelResourceSecure.h +++ b/src/cpp/rtps/transport/TCPChannelResourceSecure.h @@ -54,12 +54,12 @@ class TCPChannelResourceSecure : public TCPChannelResource void disconnect() override; uint32_t read( - fastrtps::rtps::octet* buffer, + octet* buffer, std::size_t size, asio::error_code& ec) override; size_t send( - const fastrtps::rtps::octet* header, + const octet* header, size_t header_size, const std::vector& buffers, uint32_t total_bytes, diff --git a/src/cpp/rtps/transport/TCPSenderResource.hpp b/src/cpp/rtps/transport/TCPSenderResource.hpp index 65673836141..7c903a6d153 100644 --- a/src/cpp/rtps/transport/TCPSenderResource.hpp +++ b/src/cpp/rtps/transport/TCPSenderResource.hpp @@ -26,14 +26,14 @@ namespace eprosima { namespace fastdds { namespace rtps { -class TCPSenderResource : public fastrtps::rtps::SenderResource +class TCPSenderResource : public SenderResource { public: TCPSenderResource( TCPTransportInterface& transport, - eprosima::fastrtps::rtps::Locator_t& locator) - : fastrtps::rtps::SenderResource(transport.kind()) + Locator_t& locator) + : SenderResource(transport.kind()) , locator_(locator) { // Implementation functions are bound to the right transport parameters @@ -45,8 +45,8 @@ class TCPSenderResource : public fastrtps::rtps::SenderResource send_buffers_lambda_ = [this, &transport]( const std::vector& buffers, uint32_t total_bytes, - fastrtps::rtps::LocatorsIterator* destination_locators_begin, - fastrtps::rtps::LocatorsIterator* destination_locators_end, + LocatorsIterator* destination_locators_begin, + LocatorsIterator* destination_locators_end, const std::chrono::steady_clock::time_point&) -> bool { return transport.send(buffers, total_bytes, locator_, destination_locators_begin, @@ -62,7 +62,7 @@ class TCPSenderResource : public fastrtps::rtps::SenderResource } } - fastrtps::rtps::Locator_t& locator() + Locator_t& locator() { return locator_; } @@ -102,7 +102,7 @@ class TCPSenderResource : public fastrtps::rtps::SenderResource TCPSenderResource& operator =( const SenderResource&) = delete; - fastrtps::rtps::Locator_t locator_; + Locator_t locator_; }; } // namespace rtps diff --git a/src/cpp/rtps/transport/TCPTransportInterface.cpp b/src/cpp/rtps/transport/TCPTransportInterface.cpp index 2e215259927..1116ef0f4c4 100644 --- a/src/cpp/rtps/transport/TCPTransportInterface.cpp +++ b/src/cpp/rtps/transport/TCPTransportInterface.cpp @@ -76,13 +76,6 @@ namespace eprosima { namespace fastdds { namespace rtps { -using octet = fastrtps::rtps::octet; -using IPLocator = fastrtps::rtps::IPLocator; -using SenderResource = fastrtps::rtps::SenderResource; -using CDRMessage_t = fastrtps::rtps::CDRMessage_t; -using LocatorSelector = fastrtps::rtps::LocatorSelector; -using LocatorSelectorEntry = fastrtps::rtps::LocatorSelectorEntry; -using PortParameters = fastrtps::rtps::PortParameters; using Log = fastdds::dds::Log; static const int s_default_keep_alive_frequency = 5000; // 5 SECONDS @@ -439,7 +432,7 @@ bool TCPTransportInterface::DoInputLocatorsMatch( } bool TCPTransportInterface::init( - const fastrtps::rtps::PropertyPolicy*, + const fastdds::rtps::PropertyPolicy*, const uint32_t& max_msg_size_no_frag) { uint32_t maximumMessageSize = max_msg_size_no_frag == 0 ? s_maximumMessageSize : max_msg_size_no_frag; @@ -665,7 +658,7 @@ bool TCPTransportInterface::transform_remote_locator( } void TCPTransportInterface::SenderResourceHasBeenClosed( - fastrtps::rtps::Locator_t& locator) + fastdds::rtps::Locator_t& locator) { // The TCPSendResource associated channel cannot be removed from the channel_resources_ map. On transport's destruction // this map is consulted to send the unbind requests. If not sending it, the other participant wouldn't disconnect the @@ -825,7 +818,7 @@ bool TCPTransportInterface::OpenOutputChannel( if (IPLocator::getPhysicalPort(physical_locator) == listening_port) { std::vector list; - std::vector local_interfaces; + std::vector local_interfaces; get_ips(local_interfaces, false, false); for (const auto& interface_it : local_interfaces) { @@ -890,7 +883,7 @@ bool TCPTransportInterface::OpenOutputChannels( const LocatorSelectorEntry& locator_selector_entry) { bool success = false; - if (locator_selector_entry.remote_guid == fastrtps::rtps::c_Guid_Unknown) + if (locator_selector_entry.remote_guid == fastdds::rtps::c_Guid_Unknown) { // Only unicast is used in TCP for (size_t i = 0; i < locator_selector_entry.state.unicast.size(); ++i) @@ -1137,7 +1130,7 @@ void TCPTransportInterface::perform_listen_operation( { // Blocking receive. CDRMessage_t& msg = channel->message_buffer(); - fastrtps::rtps::CDRMessage::initCDRMsg(&msg); + fastdds::rtps::CDRMessage::initCDRMsg(&msg); if (!Receive(rtcp_manager, channel, msg.buffer, msg.max_size, msg.length, msg.msg_endian, remote_locator)) { continue; @@ -1278,7 +1271,7 @@ bool TCPTransportInterface::Receive( octet* receive_buffer, uint32_t receive_buffer_capacity, uint32_t& receive_buffer_size, - fastrtps::rtps::Endianness_t msg_endian, + fastdds::rtps::Endianness_t msg_endian, Locator& remote_locator) { bool success = false; @@ -1427,11 +1420,11 @@ bool TCPTransportInterface::Receive( bool TCPTransportInterface::send( const std::vector& buffers, uint32_t total_bytes, - const fastrtps::rtps::Locator_t& locator, - fastrtps::rtps::LocatorsIterator* destination_locators_begin, - fastrtps::rtps::LocatorsIterator* destination_locators_end) + const fastdds::rtps::Locator_t& locator, + fastdds::rtps::LocatorsIterator* destination_locators_begin, + fastdds::rtps::LocatorsIterator* destination_locators_end) { - fastrtps::rtps::LocatorsIterator& it = *destination_locators_begin; + fastdds::rtps::LocatorsIterator& it = *destination_locators_begin; bool ret = true; @@ -1451,7 +1444,7 @@ bool TCPTransportInterface::send( bool TCPTransportInterface::send( const std::vector& buffers, uint32_t total_bytes, - const fastrtps::rtps::Locator_t& locator, + const fastdds::rtps::Locator_t& locator, const Locator& remote_locator) { using namespace eprosima::fastdds::statistics::rtps; @@ -1568,7 +1561,7 @@ bool TCPTransportInterface::send( void TCPTransportInterface::select_locators( LocatorSelector& selector) const { - fastrtps::ResourceLimitedVector& entries = selector.transport_starts(); + fastdds::ResourceLimitedVector& entries = selector.transport_starts(); for (size_t i = 0; i < entries.size(); ++i) { diff --git a/src/cpp/rtps/transport/TCPTransportInterface.h b/src/cpp/rtps/transport/TCPTransportInterface.h index 6f95c4d874e..b4649f1b872 100644 --- a/src/cpp/rtps/transport/TCPTransportInterface.h +++ b/src/cpp/rtps/transport/TCPTransportInterface.h @@ -138,7 +138,7 @@ class TCPTransportInterface : public TransportInterface //! Methods to manage the TCP headers and their CRC values. bool check_crc( const TCPHeader& header, - const fastrtps::rtps::octet* data, + const octet* data, uint32_t size) const; void calculate_crc( @@ -160,7 +160,7 @@ class TCPTransportInterface : public TransportInterface const Locator& locator); virtual bool get_ips( - std::vector& loc_names, + std::vector& loc_names, bool return_loopback, bool force_lookup) const = 0; @@ -173,7 +173,7 @@ class TCPTransportInterface : public TransportInterface std::weak_ptr rtcp_manager); bool read_body( - fastrtps::rtps::octet* receive_buffer, + octet* receive_buffer, uint32_t receive_buffer_capacity, uint32_t* bytes_received, std::shared_ptr& channel, @@ -226,7 +226,7 @@ class TCPTransportInterface : public TransportInterface bool send( const std::vector& buffers, uint32_t total_bytes, - const eprosima::fastrtps::rtps::Locator_t& locator, + const eprosima::fastdds::rtps::Locator_t& locator, const Locator& remote_locator); void create_listening_thread( @@ -248,7 +248,7 @@ class TCPTransportInterface : public TransportInterface //! Resets the locator bound to the sender resource. void SenderResourceHasBeenClosed( - fastrtps::rtps::Locator_t& locator); + Locator_t& locator); //! Reports whether Locators correspond to the same port. bool DoInputLocatorsMatch( @@ -277,7 +277,7 @@ class TCPTransportInterface : public TransportInterface virtual uint16_t GetMaxLogicalPort() const = 0; bool init( - const fastrtps::rtps::PropertyPolicy* properties = nullptr, + const PropertyPolicy* properties = nullptr, const uint32_t& max_msg_size_no_frag = 0) override; //! Checks whether there are open and bound sockets for the given port. @@ -330,7 +330,7 @@ class TCPTransportInterface : public TransportInterface */ bool OpenOutputChannels( SendResourceList& sender_resource_list, - const fastrtps::rtps::LocatorSelectorEntry& locator_selector_entry) override; + const LocatorSelectorEntry& locator_selector_entry) override; /** * Acts like OpenOutputChannel but ensures that a new CONNECT channel is created for the given locator @@ -381,10 +381,10 @@ class TCPTransportInterface : public TransportInterface bool Receive( std::weak_ptr& rtcp_manager, std::shared_ptr& channel, - fastrtps::rtps::octet* receive_buffer, + octet* receive_buffer, uint32_t receive_buffer_capacity, uint32_t& receive_buffer_size, - fastrtps::rtps::Endianness_t msg_endian, + Endianness_t msg_endian, Locator& remote_locator); /** @@ -401,9 +401,9 @@ class TCPTransportInterface : public TransportInterface bool send( const std::vector& buffers, uint32_t total_bytes, - const fastrtps::rtps::Locator_t& locator, - fastrtps::rtps::LocatorsIterator* destination_locators_begin, - fastrtps::rtps::LocatorsIterator* destination_locators_end); + const Locator_t& locator, + LocatorsIterator* destination_locators_begin, + LocatorsIterator* destination_locators_end); /** * Performs the locator selection algorithm for this transport. @@ -420,7 +420,7 @@ class TCPTransportInterface : public TransportInterface * @param [in, out] selector Locator selector. */ void select_locators( - fastrtps::rtps::LocatorSelector& selector) const override; + LocatorSelector& selector) const override; //! Callback called each time that an incoming connection is accepted. void SocketAccepted( @@ -469,7 +469,7 @@ class TCPTransportInterface : public TransportInterface bool configureInitialPeerLocator( Locator& locator, - const fastrtps::rtps::PortParameters& port_params, + const PortParameters& port_params, uint32_t domainId, LocatorList& list) const override; diff --git a/src/cpp/rtps/transport/TCPv4Transport.cpp b/src/cpp/rtps/transport/TCPv4Transport.cpp index ba05316402a..ff1d1b36dc9 100644 --- a/src/cpp/rtps/transport/TCPv4Transport.cpp +++ b/src/cpp/rtps/transport/TCPv4Transport.cpp @@ -33,9 +33,6 @@ namespace eprosima { namespace fastdds { namespace rtps { -using IPFinder = fastrtps::rtps::IPFinder; -using octet = fastrtps::rtps::octet; -using IPLocator = fastrtps::rtps::IPLocator; using Log = fastdds::dds::Log; static bool get_ipv4s( diff --git a/src/cpp/rtps/transport/TCPv4Transport.h b/src/cpp/rtps/transport/TCPv4Transport.h index 2368a4527d2..579aff6d64a 100644 --- a/src/cpp/rtps/transport/TCPv4Transport.h +++ b/src/cpp/rtps/transport/TCPv4Transport.h @@ -83,7 +83,7 @@ class TCPv4Transport : public TCPTransportInterface } virtual bool get_ips( - std::vector& locNames, + std::vector& locNames, bool return_loopback, bool force_lookup) const override; diff --git a/src/cpp/rtps/transport/TCPv6Transport.cpp b/src/cpp/rtps/transport/TCPv6Transport.cpp index 88a1b866a60..0fc2acdbb84 100644 --- a/src/cpp/rtps/transport/TCPv6Transport.cpp +++ b/src/cpp/rtps/transport/TCPv6Transport.cpp @@ -33,9 +33,6 @@ namespace eprosima { namespace fastdds { namespace rtps { -using IPFinder = fastrtps::rtps::IPFinder; -using octet = fastrtps::rtps::octet; -using IPLocator = fastrtps::rtps::IPLocator; using Log = fastdds::dds::Log; static bool get_ipv6s( diff --git a/src/cpp/rtps/transport/TCPv6Transport.h b/src/cpp/rtps/transport/TCPv6Transport.h index 27a878bd37a..11aec4d1dee 100644 --- a/src/cpp/rtps/transport/TCPv6Transport.h +++ b/src/cpp/rtps/transport/TCPv6Transport.h @@ -85,7 +85,7 @@ class TCPv6Transport : public TCPTransportInterface } virtual bool get_ips( - std::vector& locNames, + std::vector& locNames, bool return_loopback, bool force_lookup) const override; diff --git a/src/cpp/rtps/transport/TransportInterface.cpp b/src/cpp/rtps/transport/TransportInterface.cpp index a108682a999..c5a5c26c977 100644 --- a/src/cpp/rtps/transport/TransportInterface.cpp +++ b/src/cpp/rtps/transport/TransportInterface.cpp @@ -20,8 +20,6 @@ namespace eprosima { namespace fastdds { namespace rtps { -using LocatorSelectorEntry = fastrtps::rtps::LocatorSelectorEntry; - bool TransportInterface::OpenOutputChannels( SendResourceList& send_resource_list, const LocatorSelectorEntry& locator_selector_entry) @@ -42,12 +40,12 @@ bool TransportInterface::OpenOutputChannels( void TransportInterface::CloseOutputChannels( SendResourceList& sender_resource_list, - const fastrtps::rtps::LocatorSelectorEntry& locator_selector_entry) + const LocatorSelectorEntry& locator_selector_entry) { static_cast(sender_resource_list); static_cast(locator_selector_entry); } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/rtps/transport/UDPChannelResource.cpp b/src/cpp/rtps/transport/UDPChannelResource.cpp index b90efe284bf..e4ccad94e67 100644 --- a/src/cpp/rtps/transport/UDPChannelResource.cpp +++ b/src/cpp/rtps/transport/UDPChannelResource.cpp @@ -26,7 +26,6 @@ namespace eprosima { namespace fastdds { namespace rtps { -using octet = fastrtps::rtps::octet; using Log = fastdds::dds::Log; UDPChannelResource::UDPChannelResource( diff --git a/src/cpp/rtps/transport/UDPChannelResource.h b/src/cpp/rtps/transport/UDPChannelResource.h index 56949e2c869..0ee4d03dbdf 100644 --- a/src/cpp/rtps/transport/UDPChannelResource.h +++ b/src/cpp/rtps/transport/UDPChannelResource.h @@ -236,7 +236,7 @@ class UDPChannelResource : public ChannelResource * @param[out] remote_locator Locator describing the remote restination we received a packet from. */ bool Receive( - fastrtps::rtps::octet* receive_buffer, + octet* receive_buffer, uint32_t receive_buffer_capacity, uint32_t& receive_buffer_size, Locator& remote_locator); diff --git a/src/cpp/rtps/transport/UDPSenderResource.hpp b/src/cpp/rtps/transport/UDPSenderResource.hpp index 4c960581955..b656a5c47bb 100644 --- a/src/cpp/rtps/transport/UDPSenderResource.hpp +++ b/src/cpp/rtps/transport/UDPSenderResource.hpp @@ -25,7 +25,7 @@ namespace eprosima { namespace fastdds { namespace rtps { -class UDPSenderResource : public fastrtps::rtps::SenderResource +class UDPSenderResource : public SenderResource { public: @@ -49,8 +49,8 @@ class UDPSenderResource : public fastrtps::rtps::SenderResource send_buffers_lambda_ = [this, &transport]( const std::vector& buffers, uint32_t total_bytes, - fastrtps::rtps::LocatorsIterator* destination_locators_begin, - fastrtps::rtps::LocatorsIterator* destination_locators_end, + LocatorsIterator* destination_locators_begin, + LocatorsIterator* destination_locators_end, const std::chrono::steady_clock::time_point& max_blocking_time_point) -> bool { return transport.send(buffers, total_bytes, socket_, destination_locators_begin, diff --git a/src/cpp/rtps/transport/UDPTransportInterface.cpp b/src/cpp/rtps/transport/UDPTransportInterface.cpp index 0ec478b2f48..b3116967a7d 100644 --- a/src/cpp/rtps/transport/UDPTransportInterface.cpp +++ b/src/cpp/rtps/transport/UDPTransportInterface.cpp @@ -35,13 +35,6 @@ namespace eprosima { namespace fastdds { namespace rtps { -using IPLocator = fastrtps::rtps::IPLocator; -using LocatorSelectorEntry = fastrtps::rtps::LocatorSelectorEntry; -using LocatorSelector = fastrtps::rtps::LocatorSelector; -using IPFinder = fastrtps::rtps::IPFinder; -using octet = fastrtps::rtps::octet; -using PortParameters = fastrtps::rtps::PortParameters; -using SenderResource = fastrtps::rtps::SenderResource; using Log = fastdds::dds::Log; UDPTransportDescriptor::UDPTransportDescriptor() @@ -120,7 +113,7 @@ bool UDPTransportInterface::DoInputLocatorsMatch( } bool UDPTransportInterface::init( - const fastrtps::rtps::PropertyPolicy*, + const fastdds::rtps::PropertyPolicy*, const uint32_t& max_msg_size_no_frag) { uint32_t maximumMessageSize = max_msg_size_no_frag == 0 ? s_maximumMessageSize : max_msg_size_no_frag; @@ -496,13 +489,13 @@ bool UDPTransportInterface::send( const std::vector& buffers, uint32_t total_bytes, eProsimaUDPSocket& socket, - fastrtps::rtps::LocatorsIterator* destination_locators_begin, - fastrtps::rtps::LocatorsIterator* destination_locators_end, + fastdds::rtps::LocatorsIterator* destination_locators_begin, + fastdds::rtps::LocatorsIterator* destination_locators_end, bool only_multicast_purpose, bool whitelisted, const std::chrono::steady_clock::time_point& max_blocking_time_point) { - fastrtps::rtps::LocatorsIterator& it = *destination_locators_begin; + fastdds::rtps::LocatorsIterator& it = *destination_locators_begin; bool ret = true; @@ -619,7 +612,7 @@ bool UDPTransportInterface::send( * @return true when at least one entry was invalidated, false otherwise */ static bool check_and_invalidate( - fastrtps::ResourceLimitedVector& entries, + fastdds::ResourceLimitedVector& entries, size_t index, const Locator& locator) { @@ -647,7 +640,7 @@ static bool check_and_invalidate( void UDPTransportInterface::select_locators( LocatorSelector& selector) const { - fastrtps::ResourceLimitedVector& entries = selector.transport_starts(); + fastdds::ResourceLimitedVector& entries = selector.transport_starts(); for (size_t i = 0; i < entries.size(); ++i) { diff --git a/src/cpp/rtps/transport/UDPTransportInterface.h b/src/cpp/rtps/transport/UDPTransportInterface.h index 669f967b8ec..f1ef019a50e 100644 --- a/src/cpp/rtps/transport/UDPTransportInterface.h +++ b/src/cpp/rtps/transport/UDPTransportInterface.h @@ -64,7 +64,7 @@ class UDPTransportInterface : public TransportInterface virtual const UDPTransportDescriptor* configuration() const = 0; bool init( - const fastrtps::rtps::PropertyPolicy* properties = nullptr, + const PropertyPolicy* properties = nullptr, const uint32_t& max_msg_size_no_frag = 0) override; //! Checks whether there are open and bound sockets for the given port. @@ -129,8 +129,8 @@ class UDPTransportInterface : public TransportInterface const std::vector& buffers, uint32_t total_bytes, eProsimaUDPSocket& socket, - fastrtps::rtps::LocatorsIterator* destination_locators_begin, - fastrtps::rtps::LocatorsIterator* destination_locators_end, + LocatorsIterator* destination_locators_begin, + LocatorsIterator* destination_locators_end, bool only_multicast_purpose, bool whitelisted, const std::chrono::steady_clock::time_point& max_blocking_time_point); @@ -149,7 +149,7 @@ class UDPTransportInterface : public TransportInterface * @param [in, out] selector Locator selector. */ void select_locators( - fastrtps::rtps::LocatorSelector& selector) const override; + LocatorSelector& selector) const override; bool fillMetatrafficMulticastLocator( Locator& locator, @@ -161,7 +161,7 @@ class UDPTransportInterface : public TransportInterface bool configureInitialPeerLocator( Locator& locator, - const fastrtps::rtps::PortParameters& port_params, + const PortParameters& port_params, uint32_t domainId, LocatorList& list) const override; @@ -231,7 +231,7 @@ class UDPTransportInterface : public TransportInterface uint16_t port) = 0; virtual asio::ip::udp generate_protocol() const = 0; virtual bool get_ips( - std::vector& locNames, + std::vector& locNames, bool return_loopback, bool force_lookup) const = 0; virtual const std::string& localhost_name() = 0; @@ -301,7 +301,7 @@ class UDPTransportInterface : public TransportInterface */ void get_unknown_network_interfaces( const SendResourceList& sender_resource_list, - std::vector& locNames, + std::vector& locNames, bool return_loopback = false); std::atomic_bool rescan_interfaces_ = {true}; diff --git a/src/cpp/rtps/transport/UDPv4Transport.cpp b/src/cpp/rtps/transport/UDPv4Transport.cpp index 76422083876..e961ed9bd6b 100644 --- a/src/cpp/rtps/transport/UDPv4Transport.cpp +++ b/src/cpp/rtps/transport/UDPv4Transport.cpp @@ -38,8 +38,6 @@ namespace eprosima { namespace fastdds { namespace rtps { -using IPFinder = fastrtps::rtps::IPFinder; -using IPLocator = fastrtps::rtps::IPLocator; using Log = fastdds::dds::Log; static bool get_ipv4s( diff --git a/src/cpp/rtps/transport/UDPv4Transport.h b/src/cpp/rtps/transport/UDPv4Transport.h index 69b22b1b163..132941bb4fe 100644 --- a/src/cpp/rtps/transport/UDPv4Transport.h +++ b/src/cpp/rtps/transport/UDPv4Transport.h @@ -124,7 +124,7 @@ class UDPv4Transport : public UDPTransportInterface uint16_t port) override; asio::ip::udp generate_protocol() const override; bool get_ips( - std::vector& locNames, + std::vector& locNames, bool return_loopback, bool force_lookup) const override; const std::string& localhost_name() override; diff --git a/src/cpp/rtps/transport/UDPv6Transport.cpp b/src/cpp/rtps/transport/UDPv6Transport.cpp index 2af84773c66..04c32902c35 100644 --- a/src/cpp/rtps/transport/UDPv6Transport.cpp +++ b/src/cpp/rtps/transport/UDPv6Transport.cpp @@ -35,9 +35,6 @@ namespace eprosima { namespace fastdds { namespace rtps { -using IPFinder = fastrtps::rtps::IPFinder; -using octet = fastrtps::rtps::octet; -using IPLocator = fastrtps::rtps::IPLocator; using Log = fastdds::dds::Log; static bool get_ipv6s( diff --git a/src/cpp/rtps/transport/UDPv6Transport.h b/src/cpp/rtps/transport/UDPv6Transport.h index 67fdf116845..97f7b6e86bd 100644 --- a/src/cpp/rtps/transport/UDPv6Transport.h +++ b/src/cpp/rtps/transport/UDPv6Transport.h @@ -121,7 +121,7 @@ class UDPv6Transport : public UDPTransportInterface uint16_t port) override; asio::ip::udp generate_protocol() const override; bool get_ips( - std::vector& locNames, + std::vector& locNames, bool return_loopback, bool force_lookup) const override; const std::string& localhost_name() override; diff --git a/src/cpp/rtps/transport/shared_mem/SHMLocator.hpp b/src/cpp/rtps/transport/shared_mem/SHMLocator.hpp index 2e800e78054..b2af35adc43 100644 --- a/src/cpp/rtps/transport/shared_mem/SHMLocator.hpp +++ b/src/cpp/rtps/transport/shared_mem/SHMLocator.hpp @@ -45,8 +45,6 @@ class SHMLocator uint32_t port, Type type) { - using namespace fastrtps::rtps; - Locator_t locator(LOCATOR_KIND_SHM, port); locator.get_address()[0] = (type == Type::UNICAST) ? 'U' : 'M'; @@ -66,8 +64,6 @@ class SHMLocator static bool is_shm_and_from_this_host( const Locator& locator) { - using namespace fastrtps::rtps; - if (locator.kind == LOCATOR_KIND_SHM) { auto host_id = Host::instance().id(); diff --git a/src/cpp/rtps/transport/shared_mem/SharedMemChannelResource.hpp b/src/cpp/rtps/transport/shared_mem/SharedMemChannelResource.hpp index e51f3bd5e09..86e6a3f9dd9 100644 --- a/src/cpp/rtps/transport/shared_mem/SharedMemChannelResource.hpp +++ b/src/cpp/rtps/transport/shared_mem/SharedMemChannelResource.hpp @@ -148,7 +148,7 @@ class SharedMemChannelResource : public ChannelResource if (message_receiver() != nullptr) { message_receiver()->OnDataReceived( - static_cast(message->data()), + static_cast(message->data()), message->size(), input_locator, remote_locator); } diff --git a/src/cpp/rtps/transport/shared_mem/SharedMemLog.hpp b/src/cpp/rtps/transport/shared_mem/SharedMemLog.hpp index 04d2ac249c6..80ccaa2b0c7 100644 --- a/src/cpp/rtps/transport/shared_mem/SharedMemLog.hpp +++ b/src/cpp/rtps/transport/shared_mem/SharedMemLog.hpp @@ -94,7 +94,7 @@ class SHMPacketFileLogger const std::string& timestamp, const Locator& from, const Locator& to, - const fastrtps::rtps::octet* buf, + const octet* buf, const uint32_t len) { try @@ -113,7 +113,7 @@ class SHMPacketFileLogger fprintf(f_, "000000 45 00 %02x %02x %02x %02x 00 00 11 11 00 00\n", (ipSize >> 8) & 0xFF, ipSize & 0xFF, (dump_id_ >> 8) & 0xFF, dump_id_ & 0xFF); - if (from.kind == 1 && fastrtps::rtps::IsAddressDefined(from)) + if (from.kind == 1 && IsAddressDefined(from)) { fprintf(f_, "00000c %02x %02x %02x %02x\n", from.address[12], from.address[13], from.address[14], from.address[15]); @@ -127,7 +127,7 @@ class SHMPacketFileLogger fprintf(f_, "00000c %02x %02x %02x %02x\n", addr[0], addr[1], addr[2], addr[3]); } - if (to.kind == 1 && fastrtps::rtps::IsAddressDefined(to)) + if (to.kind == 1 && IsAddressDefined(to)) { fprintf(f_, "000010 %02x %02x %02x %02x\n", to.address[12], to.address[13], to.address[14], to.address[15]); diff --git a/src/cpp/rtps/transport/shared_mem/SharedMemSenderResource.hpp b/src/cpp/rtps/transport/shared_mem/SharedMemSenderResource.hpp index 269c6f7b6a1..5bceef002c2 100644 --- a/src/cpp/rtps/transport/shared_mem/SharedMemSenderResource.hpp +++ b/src/cpp/rtps/transport/shared_mem/SharedMemSenderResource.hpp @@ -24,13 +24,13 @@ namespace eprosima { namespace fastdds { namespace rtps { -class SharedMemSenderResource : public fastrtps::rtps::SenderResource +class SharedMemSenderResource : public SenderResource { public: SharedMemSenderResource( SharedMemTransport& transport) - : fastrtps::rtps::SenderResource(transport.kind()) + : SenderResource(transport.kind()) { // Implementation functions are bound to the right transport parameters clean_up = []() @@ -41,8 +41,8 @@ class SharedMemSenderResource : public fastrtps::rtps::SenderResource send_buffers_lambda_ = [&transport]( const std::vector& buffers, uint32_t total_bytes, - fastrtps::rtps::LocatorsIterator* destination_locators_begin, - fastrtps::rtps::LocatorsIterator* destination_locators_end, + LocatorsIterator* destination_locators_begin, + LocatorsIterator* destination_locators_end, const std::chrono::steady_clock::time_point& max_blocking_time_point) -> bool { return transport.send(buffers, total_bytes, destination_locators_begin, destination_locators_end, diff --git a/src/cpp/rtps/transport/shared_mem/SharedMemTransport.cpp b/src/cpp/rtps/transport/shared_mem/SharedMemTransport.cpp index 4c670797d09..c1d30ed309f 100644 --- a/src/cpp/rtps/transport/shared_mem/SharedMemTransport.cpp +++ b/src/cpp/rtps/transport/shared_mem/SharedMemTransport.cpp @@ -45,12 +45,6 @@ namespace eprosima { namespace fastdds { namespace rtps { -using octet = fastrtps::rtps::octet; -using SenderResource = fastrtps::rtps::SenderResource; -using LocatorSelectorEntry = fastrtps::rtps::LocatorSelectorEntry; -using LocatorSelector = fastrtps::rtps::LocatorSelector; -using PortParameters = fastrtps::rtps::PortParameters; - TransportInterface* SharedMemTransportDescriptor::create_transport() const { return new SharedMemTransport(*this); @@ -245,7 +239,7 @@ bool SharedMemTransport::DoInputLocatorsMatch( } bool SharedMemTransport::init( - const fastrtps::rtps::PropertyPolicy*, + const fastdds::rtps::PropertyPolicy*, const uint32_t& max_msg_size_no_frag) { (void) max_msg_size_no_frag; @@ -448,8 +442,8 @@ std::shared_ptr SharedMemTransport::copy_to_shared_buf bool SharedMemTransport::send( const std::vector& buffers, uint32_t total_bytes, - fastrtps::rtps::LocatorsIterator* destination_locators_begin, - fastrtps::rtps::LocatorsIterator* destination_locators_end, + fastdds::rtps::LocatorsIterator* destination_locators_begin, + fastdds::rtps::LocatorsIterator* destination_locators_end, const std::chrono::steady_clock::time_point& max_blocking_time_point) { using namespace eprosima::fastdds::statistics::rtps; @@ -458,7 +452,7 @@ bool SharedMemTransport::send( cleanup_output_ports(); #endif // if !defined(_WIN32) - fastrtps::rtps::LocatorsIterator& it = *destination_locators_begin; + fastdds::rtps::LocatorsIterator& it = *destination_locators_begin; bool ret = true; @@ -611,7 +605,7 @@ bool SharedMemTransport::send( void SharedMemTransport::select_locators( LocatorSelector& selector) const { - fastrtps::ResourceLimitedVector& entries = selector.transport_starts(); + fastdds::ResourceLimitedVector& entries = selector.transport_starts(); for (size_t i = 0; i < entries.size(); ++i) { diff --git a/src/cpp/rtps/transport/shared_mem/SharedMemTransport.h b/src/cpp/rtps/transport/shared_mem/SharedMemTransport.h index e96c406160a..467b38a3efb 100644 --- a/src/cpp/rtps/transport/shared_mem/SharedMemTransport.h +++ b/src/cpp/rtps/transport/shared_mem/SharedMemTransport.h @@ -52,7 +52,7 @@ class SharedMemTransport : public TransportInterface const SharedMemTransportDescriptor* configuration() const; bool init( - const fastrtps::rtps::PropertyPolicy* properties = nullptr, + const PropertyPolicy* properties = nullptr, const uint32_t& max_msg_size_no_frag = 0) override; ~SharedMemTransport() override; @@ -157,8 +157,8 @@ class SharedMemTransport : public TransportInterface virtual bool send( const std::vector& buffers, uint32_t total_bytes, - fastrtps::rtps::LocatorsIterator* destination_locators_begin, - fastrtps::rtps::LocatorsIterator* destination_locators_end, + LocatorsIterator* destination_locators_begin, + LocatorsIterator* destination_locators_end, const std::chrono::steady_clock::time_point& max_blocking_time_point); /** @@ -175,7 +175,7 @@ class SharedMemTransport : public TransportInterface * @param [in, out] selector Locator selector. */ void select_locators( - fastrtps::rtps::LocatorSelector& selector) const override; + LocatorSelector& selector) const override; bool fillMetatrafficMulticastLocator( Locator& locator, @@ -187,7 +187,7 @@ class SharedMemTransport : public TransportInterface bool configureInitialPeerLocator( Locator& locator, - const fastrtps::rtps::PortParameters& port_params, + const PortParameters& port_params, uint32_t domainId, LocatorList& list) const override; diff --git a/src/cpp/rtps/transport/shared_mem/SharedMemTransportDescriptor.cpp b/src/cpp/rtps/transport/shared_mem/SharedMemTransportDescriptor.cpp index 7b477ff0b06..922e9e03ee9 100644 --- a/src/cpp/rtps/transport/shared_mem/SharedMemTransportDescriptor.cpp +++ b/src/cpp/rtps/transport/shared_mem/SharedMemTransportDescriptor.cpp @@ -19,8 +19,6 @@ #include #include -using namespace eprosima::fastdds::rtps; - namespace eprosima { namespace fastdds { namespace rtps { @@ -29,10 +27,6 @@ static constexpr uint32_t shm_default_segment_size = 0; static constexpr uint32_t shm_default_port_queue_capacity = 512; static constexpr uint32_t shm_default_healthy_check_timeout_ms = 1000; -} // rtps -} // fastdds -} // eprosima - //********************************************************* // SharedMemTransportDescriptor //********************************************************* @@ -64,3 +58,7 @@ TransportInterface* SharedMemTransportDescriptor::create_transport() const } #endif // ifdef FASTDDS_SHM_TRANSPORT_DISABLED + +} // rtps +} // fastdds +} // eprosima diff --git a/src/cpp/rtps/transport/shared_mem/test_SharedMemTransport.cpp b/src/cpp/rtps/transport/shared_mem/test_SharedMemTransport.cpp index 651295ff530..31beda85ba4 100644 --- a/src/cpp/rtps/transport/shared_mem/test_SharedMemTransport.cpp +++ b/src/cpp/rtps/transport/shared_mem/test_SharedMemTransport.cpp @@ -51,8 +51,8 @@ TransportInterface* test_SharedMemTransportDescriptor::create_transport() const bool test_SharedMemTransport::send( const std::vector& buffers, uint32_t total_bytes, - fastrtps::rtps::LocatorsIterator* destination_locators_begin, - fastrtps::rtps::LocatorsIterator* destination_locators_end, + LocatorsIterator* destination_locators_begin, + LocatorsIterator* destination_locators_end, const std::chrono::steady_clock::time_point& max_blocking_time_point) { if (total_bytes >= big_buffer_size_) diff --git a/src/cpp/rtps/transport/shared_mem/test_SharedMemTransport.h b/src/cpp/rtps/transport/shared_mem/test_SharedMemTransport.h index 1eb9f35580e..e054e288e3b 100644 --- a/src/cpp/rtps/transport/shared_mem/test_SharedMemTransport.h +++ b/src/cpp/rtps/transport/shared_mem/test_SharedMemTransport.h @@ -32,8 +32,8 @@ class test_SharedMemTransport : public SharedMemTransport bool send( const std::vector& buffers, uint32_t total_bytes, - fastrtps::rtps::LocatorsIterator* destination_locators_begin, - fastrtps::rtps::LocatorsIterator* destination_locators_end, + LocatorsIterator* destination_locators_begin, + LocatorsIterator* destination_locators_end, const std::chrono::steady_clock::time_point& max_blocking_time_point) override; SharedMemChannelResource* CreateInputChannelResource( diff --git a/src/cpp/rtps/transport/tcp/RTCPHeader.h b/src/cpp/rtps/transport/tcp/RTCPHeader.h index 2624a8fb2e7..376a6ea7029 100644 --- a/src/cpp/rtps/transport/tcp/RTCPHeader.h +++ b/src/cpp/rtps/transport/tcp/RTCPHeader.h @@ -48,14 +48,14 @@ struct TCPHeader rtcp[3] = 'P'; } - const fastrtps::rtps::octet* address() const + const octet* address() const { - return reinterpret_cast(this); + return reinterpret_cast(this); } - fastrtps::rtps::octet* address() + octet* address() { - return (fastrtps::rtps::octet*)this; + return (fastdds::rtps::octet*)this; } /*! @@ -69,9 +69,9 @@ struct TCPHeader } inline void valid_endianness( - fastrtps::rtps::Endianness_t msg_endian) + Endianness_t msg_endian) { - if (msg_endian != eprosima::fastrtps::rtps::DEFAULT_ENDIAN) + if (msg_endian != eprosima::fastdds::rtps::DEFAULT_ENDIAN) { length = ((length >> 24) & 0xff) | ((length << 8) & 0xff0000) | ((length >> 8) & 0xff00) | ((length << 24) & 0xff000000); @@ -85,7 +85,7 @@ struct TCPHeader union TCPTransactionId { uint32_t ints[3]; - fastrtps::rtps::octet octets[12]; + octet octets[12]; TCPTransactionId() { @@ -140,16 +140,16 @@ union TCPTransactionId } TCPTransactionId& operator =( - const fastrtps::rtps::octet* id) + const octet* id) { - memcpy(octets, id, 12 * sizeof(fastrtps::rtps::octet)); + memcpy(octets, id, 12 * sizeof(fastdds::rtps::octet)); return *this; } TCPTransactionId& operator =( const char* id) { - memcpy(octets, id, 12 * sizeof(fastrtps::rtps::octet)); + memcpy(octets, id, 12 * sizeof(fastdds::rtps::octet)); return *this; } @@ -207,7 +207,7 @@ inline std::ostream& operator <<( return output; } -enum TCPCPMKind : fastrtps::rtps::octet +enum TCPCPMKind : octet { BIND_CONNECTION_REQUEST = 0xD1, BIND_CONNECTION_RESPONSE = 0xE1, @@ -224,7 +224,7 @@ enum TCPCPMKind : fastrtps::rtps::octet class TCPControlMsgHeader { TCPCPMKind kind_; // 1 byte - fastrtps::rtps::octet flags_; // 1 byte + octet flags_; // 1 byte uint16_t length_; // 2 bytes TCPTransactionId transaction_id_; // 12 bytes @@ -233,7 +233,7 @@ class TCPControlMsgHeader TCPControlMsgHeader() { kind_ = static_cast(0x00); - flags_ = static_cast(0x00); + flags_ = static_cast(0x00); length_ = 0; } @@ -291,17 +291,17 @@ class TCPControlMsgHeader bool requires_response) { //TODO: Optimize receiving a Endianness_t - fastrtps::rtps::octet e = (endianess) ? BIT(1) : 0x00; - fastrtps::rtps::octet p = (payload) ? BIT(2) : 0x00; - fastrtps::rtps::octet r = (requires_response) ? BIT(3) : 0x00; + octet e = (endianess) ? BIT(1) : 0x00; + octet p = (payload) ? BIT(2) : 0x00; + octet r = (requires_response) ? BIT(3) : 0x00; flags_ = e | p | r; } void endianess( - fastrtps::rtps::Endianness_t endianess) + Endianness_t endianess) { // Endianess flag has inverse logic than Endianness_t :-/ - if (endianess == fastrtps::rtps::Endianness_t::BIGEND) + if (endianess == Endianness_t::BIGEND) { flags_ &= 0xFE; } @@ -358,17 +358,17 @@ class TCPControlMsgHeader } inline void valid_endianness( - fastrtps::rtps::Endianness_t msg_endian) + Endianness_t msg_endian) { - fastrtps::rtps::Endianness_t internal_endian = endianess() ? fastrtps::rtps::Endianness_t::LITTLEEND : - fastrtps::rtps::Endianness_t::BIGEND; + Endianness_t internal_endian = endianess() ? Endianness_t::LITTLEEND : + Endianness_t::BIGEND; if (internal_endian != msg_endian) { logWarning(RTCP_MSG, "endianness of rtcp header is not consistent with CDRMsg"); return; } - if (msg_endian != eprosima::fastrtps::rtps::DEFAULT_ENDIAN) + if (msg_endian != eprosima::fastdds::rtps::DEFAULT_ENDIAN) { length_ = ((length_ >> 8) & 0xff) | ((length_ << 8) & 0xff00); diff --git a/src/cpp/rtps/transport/tcp/RTCPMessageManager.cpp b/src/cpp/rtps/transport/tcp/RTCPMessageManager.cpp index ee3e01a9b0b..925a159d259 100644 --- a/src/cpp/rtps/transport/tcp/RTCPMessageManager.cpp +++ b/src/cpp/rtps/transport/tcp/RTCPMessageManager.cpp @@ -33,18 +33,10 @@ #define IDSTRING "(ID:" << std::this_thread::get_id() << ") " << -//using namespace eprosima::fastrtps; - namespace eprosima { namespace fastdds { namespace rtps { -using IPLocator = fastrtps::rtps::IPLocator; -using SerializedPayload_t = fastrtps::rtps::SerializedPayload_t; -using octet = fastrtps::rtps::octet; -using CDRMessage_t = fastrtps::rtps::CDRMessage_t; -using RTPSMessageCreator = fastrtps::rtps::RTPSMessageCreator; -using ProtocolVersion_t = fastrtps::rtps::ProtocolVersion_t; using Log = fastdds::dds::Log; static void endpoint_to_locator( @@ -142,7 +134,7 @@ bool RTCPMessageManager::sendData( TCPHeader header; TCPControlMsgHeader ctrlHeader; CDRMessage_t msg(this->mTransport->get_configuration()->max_message_size()); - fastrtps::rtps::CDRMessage::initCDRMsg(&msg); + fastdds::rtps::CDRMessage::initCDRMsg(&msg); const ResponseCode* code = (respCode != RETCODE_VOID) ? &respCode : nullptr; fillHeaders(kind, transaction_id, ctrlHeader, header, payload, code); @@ -214,7 +206,7 @@ void RTCPMessageManager::fillHeaders( break; } - retCtrlHeader.endianess(fastrtps::rtps::DEFAULT_ENDIAN); // Override "false" endianess set on the switch + retCtrlHeader.endianess(fastdds::rtps::DEFAULT_ENDIAN); // Override "false" endianess set on the switch header.logical_port = 0; // This is a control message header.length = static_cast(retCtrlHeader.length() + TCPHeader::size()); @@ -683,7 +675,7 @@ ResponseCode RTCPMessageManager::processRTCPMessage( std::shared_ptr& channel, octet* receive_buffer, size_t receivedSize, - fastrtps::rtps::Endianness_t msg_endian) + fastdds::rtps::Endianness_t msg_endian) { ResponseCode responseCode(RETCODE_OK); diff --git a/src/cpp/rtps/transport/tcp/RTCPMessageManager.h b/src/cpp/rtps/transport/tcp/RTCPMessageManager.h index 4f1c5b24d09..50a3d08bf45 100644 --- a/src/cpp/rtps/transport/tcp/RTCPMessageManager.h +++ b/src/cpp/rtps/transport/tcp/RTCPMessageManager.h @@ -35,7 +35,7 @@ namespace rtps { class TCPChannelResource; class TCPTransportInterface; -const fastrtps::rtps::ProtocolVersion_t c_rtcpProtocolVersion = {1, 0}; +const fastdds::rtps::ProtocolVersion_t c_rtcpProtocolVersion = {1, 0}; /** * Class RTCPMessageManager, process the received TCP messages. @@ -147,13 +147,13 @@ class RTCPMessageManager ResponseCode processRTCPMessage( std::shared_ptr& channel, - fastrtps::rtps::octet* receive_buffer, + fastdds::rtps::octet* receive_buffer, size_t receivedSize, - fastrtps::rtps::Endianness_t msg_endian); + fastdds::rtps::Endianness_t msg_endian); static uint32_t& addToCRC( uint32_t& crc, - fastrtps::rtps::octet data); + fastdds::rtps::octet data); void dispose() { @@ -208,20 +208,20 @@ class RTCPMessageManager size_t sendMessage( TCPChannelResource* channel, - const fastrtps::rtps::CDRMessage_t& msg) const; + const fastdds::rtps::CDRMessage_t& msg) const; bool sendData( std::shared_ptr& channel, TCPCPMKind kind, const TCPTransactionId& transactionId, - const fastrtps::rtps::SerializedPayload_t* payload = nullptr, + const fastdds::rtps::SerializedPayload_t* payload = nullptr, const ResponseCode respCode = RETCODE_VOID); bool sendData( TCPChannelResource* channel, TCPCPMKind kind, const TCPTransactionId& transactionId, - const fastrtps::rtps::SerializedPayload_t* payload = nullptr, + const fastdds::rtps::SerializedPayload_t* payload = nullptr, const ResponseCode respCode = RETCODE_VOID); void fillHeaders( @@ -229,11 +229,11 @@ class RTCPMessageManager const TCPTransactionId& transactionId, TCPControlMsgHeader& retCtrlHeader, TCPHeader& header, - const fastrtps::rtps::SerializedPayload_t* payload = nullptr, + const fastdds::rtps::SerializedPayload_t* payload = nullptr, const ResponseCode* respCode = nullptr); bool isCompatibleProtocol( - const fastrtps::rtps::ProtocolVersion_t& protocol) const; + const fastdds::rtps::ProtocolVersion_t& protocol) const; inline bool alive() const { diff --git a/src/cpp/rtps/transport/tcp/TCPControlMessage.cpp b/src/cpp/rtps/transport/tcp/TCPControlMessage.cpp index 77fd76d29b3..25d9f689c7e 100644 --- a/src/cpp/rtps/transport/tcp/TCPControlMessage.cpp +++ b/src/cpp/rtps/transport/tcp/TCPControlMessage.cpp @@ -40,10 +40,6 @@ namespace eprosima { namespace fastdds { namespace rtps { -using ProtocolVersion_t = fastrtps::rtps::ProtocolVersion_t; -using VendorId_t = fastdds::rtps::VendorId_t; -using SerializedPayload_t = fastrtps::rtps::SerializedPayload_t; - static void operator <<( eprosima::fastcdr::Cdr& scdr, const ProtocolVersion_t& protocolVersion) @@ -101,7 +97,7 @@ static void operator >>( } ConnectionRequest_t::ConnectionRequest_t() - : m_vendorId(fastrtps::rtps::c_VendorId_eProsima) + : m_vendorId(fastdds::rtps::c_VendorId_eProsima) { } diff --git a/src/cpp/rtps/transport/tcp/TCPControlMessage.h b/src/cpp/rtps/transport/tcp/TCPControlMessage.h index e8803f0497d..54f4f8de862 100644 --- a/src/cpp/rtps/transport/tcp/TCPControlMessage.h +++ b/src/cpp/rtps/transport/tcp/TCPControlMessage.h @@ -73,7 +73,7 @@ class ConnectionRequest_t * @param _protocolVersion New value for member protocolVersion */ inline void protocolVersion( - const fastrtps::rtps::ProtocolVersion_t& _protocolVersion) + const ProtocolVersion_t& _protocolVersion) { m_protocolVersion = _protocolVersion; } @@ -82,7 +82,7 @@ class ConnectionRequest_t * @brief This function returns the value of member protocolVersion * @return Value of member protocolVersion */ - inline fastrtps::rtps::ProtocolVersion_t protocolVersion() const + inline ProtocolVersion_t protocolVersion() const { return m_protocolVersion; } @@ -91,7 +91,7 @@ class ConnectionRequest_t * @brief This function returns a reference to member protocolVersion * @return Reference to member protocolVersion */ - inline fastrtps::rtps::ProtocolVersion_t& protocolVersion() + inline ProtocolVersion_t& protocolVersion() { return m_protocolVersion; } @@ -101,7 +101,7 @@ class ConnectionRequest_t * @param _vendorId New value for member vendorId */ inline void vendorId( - const fastdds::rtps::VendorId_t& _vendorId) + const VendorId_t& _vendorId) { m_vendorId = _vendorId; } @@ -110,7 +110,7 @@ class ConnectionRequest_t * @brief This function returns the value of member vendorId * @return Value of member vendorId */ - inline fastdds::rtps::VendorId_t vendorId() const + inline VendorId_t vendorId() const { return m_vendorId; } @@ -119,7 +119,7 @@ class ConnectionRequest_t * @brief This function returns a reference to member vendorId * @return Reference to member vendorId */ - inline fastdds::rtps::VendorId_t& vendorId() + inline VendorId_t& vendorId() { return m_vendorId; } @@ -180,14 +180,14 @@ class ConnectionRequest_t eprosima::fastcdr::Cdr& cdr); bool serialize( - fastrtps::rtps::SerializedPayload_t* payload); + SerializedPayload_t* payload); bool deserialize( - fastrtps::rtps::SerializedPayload_t* payload); + SerializedPayload_t* payload); private: - fastrtps::rtps::ProtocolVersion_t m_protocolVersion; - fastdds::rtps::VendorId_t m_vendorId; + ProtocolVersion_t m_protocolVersion; + VendorId_t m_vendorId; Locator m_transportLocator; }; /*! @@ -264,9 +264,9 @@ class OpenLogicalPortRequest_t eprosima::fastcdr::Cdr& cdr); bool serialize( - fastrtps::rtps::SerializedPayload_t* payload); + SerializedPayload_t* payload); bool deserialize( - fastrtps::rtps::SerializedPayload_t* payload); + SerializedPayload_t* payload); private: @@ -365,9 +365,9 @@ class CheckLogicalPortsRequest_t eprosima::fastcdr::Cdr& cdr); bool serialize( - fastrtps::rtps::SerializedPayload_t* payload); + SerializedPayload_t* payload); bool deserialize( - fastrtps::rtps::SerializedPayload_t* payload); + SerializedPayload_t* payload); private: @@ -447,9 +447,9 @@ class KeepAliveRequest_t eprosima::fastcdr::Cdr& cdr); bool serialize( - fastrtps::rtps::SerializedPayload_t* payload); + SerializedPayload_t* payload); bool deserialize( - fastrtps::rtps::SerializedPayload_t* payload); + SerializedPayload_t* payload); private: @@ -530,9 +530,9 @@ class LogicalPortIsClosedRequest_t eprosima::fastcdr::Cdr& cdr); bool serialize( - fastrtps::rtps::SerializedPayload_t* payload); + SerializedPayload_t* payload); bool deserialize( - fastrtps::rtps::SerializedPayload_t* payload); + SerializedPayload_t* payload); private: @@ -628,9 +628,9 @@ class BindConnectionResponse_t eprosima::fastcdr::Cdr& cdr); bool serialize( - fastrtps::rtps::SerializedPayload_t* payload); + SerializedPayload_t* payload); bool deserialize( - fastrtps::rtps::SerializedPayload_t* payload); + SerializedPayload_t* payload); private: @@ -729,9 +729,9 @@ class CheckLogicalPortsResponse_t eprosima::fastcdr::Cdr& cdr); bool serialize( - fastrtps::rtps::SerializedPayload_t* payload); + SerializedPayload_t* payload); bool deserialize( - fastrtps::rtps::SerializedPayload_t* payload); + SerializedPayload_t* payload); private: diff --git a/src/cpp/rtps/transport/test_UDPv4Transport.cpp b/src/cpp/rtps/transport/test_UDPv4Transport.cpp index 4254540b0c7..12f71418cf5 100644 --- a/src/cpp/rtps/transport/test_UDPv4Transport.cpp +++ b/src/cpp/rtps/transport/test_UDPv4Transport.cpp @@ -26,12 +26,6 @@ namespace eprosima { namespace fastdds { namespace rtps { -using octet = fastrtps::rtps::octet; -using CDRMessage_t = fastrtps::rtps::CDRMessage_t; -using SubmessageHeader_t = fastrtps::rtps::SubmessageHeader_t; -using SequenceNumber_t = fastrtps::rtps::SequenceNumber_t; -using EntityId_t = fastrtps::rtps::EntityId_t; - std::vector> test_UDPv4Transport::test_UDPv4Transport_DropLog; std::atomic test_UDPv4Transport::test_UDPv4Transport_DropLogLength(0); std::atomic test_UDPv4Transport::test_UDPv4Transport_ShutdownAllNetwork(false); @@ -157,7 +151,7 @@ bool test_UDPv4TransportDescriptor::operator ==( } bool test_UDPv4Transport::get_ips( - std::vector& locNames, + std::vector& locNames, bool return_loopback, bool force_lookup) const { @@ -168,8 +162,8 @@ bool test_UDPv4Transport::get_ips( if (return_loopback) { - fastrtps::rtps::IPFinder::info_IP local; - local.type = fastrtps::rtps::IPFinder::IPTYPE::IP4_LOCAL; + fastdds::rtps::IPFinder::info_IP local; + local.type = fastdds::rtps::IPFinder::IPTYPE::IP4_LOCAL; local.dev = "lo"; local.name = "127.0.0.1"; local.locator.kind = LOCATOR_KIND_UDPv4; @@ -190,10 +184,10 @@ LocatorList test_UDPv4Transport::NormalizeLocator( } LocatorList list; - if (fastrtps::rtps::IPLocator::isAny(locator)) + if (fastdds::rtps::IPLocator::isAny(locator)) { Locator newloc(locator); - fastrtps::rtps::IPLocator::setIPv4(newloc, "127.0.0.1"); + fastdds::rtps::IPLocator::setIPv4(newloc, "127.0.0.1"); list.push_back(newloc); } else @@ -207,13 +201,13 @@ bool test_UDPv4Transport::send( const std::vector& buffers, uint32_t total_bytes, eProsimaUDPSocket& socket, - fastrtps::rtps::LocatorsIterator* destination_locators_begin, - fastrtps::rtps::LocatorsIterator* destination_locators_end, + fastdds::rtps::LocatorsIterator* destination_locators_begin, + fastdds::rtps::LocatorsIterator* destination_locators_end, bool only_multicast_purpose, bool whitelisted, const std::chrono::steady_clock::time_point& max_blocking_time_point) { - fastrtps::rtps::LocatorsIterator& it = *destination_locators_begin; + fastdds::rtps::LocatorsIterator& it = *destination_locators_begin; bool ret = true; @@ -258,7 +252,7 @@ bool test_UDPv4Transport::send( bool whitelisted, const std::chrono::microseconds& timeout) { - bool is_multicast_remote_address = fastrtps::rtps::IPLocator::IPLocator::isMulticast(remote_locator); + bool is_multicast_remote_address = fastdds::rtps::IPLocator::IPLocator::isMulticast(remote_locator); if (is_multicast_remote_address == only_multicast_purpose || whitelisted) { if (packet_should_drop(buffers, total_bytes) || should_drop_locator(remote_locator)) @@ -288,16 +282,16 @@ static bool ReadSubmessageHeader( smh.submessageId = msg.buffer[msg.pos]; msg.pos++; smh.flags = msg.buffer[msg.pos]; msg.pos++; - msg.msg_endian = smh.flags & BIT(0) ? fastrtps::rtps::LITTLEEND : fastrtps::rtps::BIGEND; + msg.msg_endian = smh.flags & BIT(0) ? fastdds::rtps::LITTLEEND : fastdds::rtps::BIGEND; uint16_t length = 0; - fastrtps::rtps::CDRMessage::readUInt16(&msg, &length); + fastdds::rtps::CDRMessage::readUInt16(&msg, &length); if (msg.pos + length > msg.length) { return false; } - if ((length == 0) && (smh.submessageId != fastrtps::rtps::INFO_TS) && (smh.submessageId != fastrtps::rtps::PAD)) + if ((length == 0) && (smh.submessageId != fastdds::rtps::INFO_TS) && (smh.submessageId != fastdds::rtps::PAD)) { // THIS IS THE LAST SUBMESSAGE smh.submessageLength = msg.length - msg.pos; @@ -318,8 +312,8 @@ bool test_UDPv4Transport::should_drop_locator( locator_filter_(remote_locator) || // If there are no interfaces (simulate_no_interfaces), only multicast and localhost traffic is sent (simulate_no_interfaces && - !fastrtps::rtps::IPLocator::isMulticast(remote_locator) && - !fastrtps::rtps::IPLocator::isLocal(remote_locator)); + !fastdds::rtps::IPLocator::isMulticast(remote_locator) && + !fastdds::rtps::IPLocator::isLocal(remote_locator)); } bool test_UDPv4Transport::packet_should_drop( @@ -376,15 +370,15 @@ bool test_UDPv4Transport::packet_should_drop( switch (cdrSubMessageHeader.submessageId) { - case fastrtps::rtps::DATA: + case fastdds::rtps::DATA: // Get WriterID. cdrMessage.pos += 8; - fastrtps::rtps::CDRMessage::readEntityId(&cdrMessage, &writer_id); - fastrtps::rtps::CDRMessage::readInt32(&cdrMessage, &sequence_number.high); - fastrtps::rtps::CDRMessage::readUInt32(&cdrMessage, &sequence_number.low); + fastdds::rtps::CDRMessage::readEntityId(&cdrMessage, &writer_id); + fastdds::rtps::CDRMessage::readInt32(&cdrMessage, &sequence_number.high); + fastdds::rtps::CDRMessage::readUInt32(&cdrMessage, &sequence_number.low); cdrMessage.pos = old_pos; - if (writer_id == fastrtps::rtps::c_EntityId_SPDPWriter) + if (writer_id == fastdds::rtps::c_EntityId_SPDPWriter) { if (always_drop_participant_builtin_topic_data) { @@ -403,7 +397,7 @@ bool test_UDPv4Transport::packet_should_drop( return true; } } - else if (writer_id == fastrtps::rtps::c_EntityId_SEDPPubWriter) + else if (writer_id == fastdds::rtps::c_EntityId_SEDPPubWriter) { if (drop_publication_builtin_topic_data_) { @@ -418,7 +412,7 @@ bool test_UDPv4Transport::packet_should_drop( return true; } } - else if (writer_id == fastrtps::rtps::c_EntityId_SEDPSubWriter) + else if (writer_id == fastdds::rtps::c_EntityId_SEDPSubWriter) { if (drop_subscription_builtin_topic_data_) { @@ -447,7 +441,7 @@ bool test_UDPv4Transport::packet_should_drop( break; - case fastrtps::rtps::ACKNACK: + case fastdds::rtps::ACKNACK: if (should_be_dropped(&drop_ack_nack_messages_percentage_)) { return true; @@ -459,10 +453,10 @@ bool test_UDPv4Transport::packet_should_drop( break; - case fastrtps::rtps::HEARTBEAT: + case fastdds::rtps::HEARTBEAT: cdrMessage.pos += 8; - fastrtps::rtps::CDRMessage::readInt32(&cdrMessage, &sequence_number.high); - fastrtps::rtps::CDRMessage::readUInt32(&cdrMessage, &sequence_number.low); + fastdds::rtps::CDRMessage::readInt32(&cdrMessage, &sequence_number.high); + fastdds::rtps::CDRMessage::readUInt32(&cdrMessage, &sequence_number.low); cdrMessage.pos = old_pos; if (should_be_dropped(&drop_heartbeat_messages_percentage_)) { @@ -475,7 +469,7 @@ bool test_UDPv4Transport::packet_should_drop( break; - case fastrtps::rtps::DATA_FRAG: + case fastdds::rtps::DATA_FRAG: if (should_be_dropped(&drop_data_frag_messages_percentage_)) { return true; @@ -487,10 +481,10 @@ bool test_UDPv4Transport::packet_should_drop( break; - case fastrtps::rtps::GAP: + case fastdds::rtps::GAP: cdrMessage.pos += 8; - fastrtps::rtps::CDRMessage::readInt32(&cdrMessage, &sequence_number.high); - fastrtps::rtps::CDRMessage::readUInt32(&cdrMessage, &sequence_number.low); + fastdds::rtps::CDRMessage::readInt32(&cdrMessage, &sequence_number.high); + fastdds::rtps::CDRMessage::readUInt32(&cdrMessage, &sequence_number.low); cdrMessage.pos = old_pos; if (should_be_dropped(&drop_gap_messages_percentage_)) { diff --git a/src/cpp/rtps/transport/test_UDPv4Transport.h b/src/cpp/rtps/transport/test_UDPv4Transport.h index b924fb6d48a..8811af59dad 100644 --- a/src/cpp/rtps/transport/test_UDPv4Transport.h +++ b/src/cpp/rtps/transport/test_UDPv4Transport.h @@ -44,8 +44,8 @@ class test_UDPv4Transport : public UDPv4Transport const std::vector& send_buffer, uint32_t total_bytes, eProsimaUDPSocket& socket, - fastrtps::rtps::LocatorsIterator* destination_locators_begin, - fastrtps::rtps::LocatorsIterator* destination_locators_end, + LocatorsIterator* destination_locators_begin, + LocatorsIterator* destination_locators_end, bool only_multicast_purpose, bool whitelisted, const std::chrono::steady_clock::time_point& max_blocking_time_point) override; @@ -55,7 +55,7 @@ class test_UDPv4Transport : public UDPv4Transport FASTDDS_EXPORTED_API static std::atomic test_UDPv4Transport_ShutdownAllNetwork; // Handle to a persistent log of dropped packets. Defaults to length 0 (no logging) to prevent wasted resources. - FASTDDS_EXPORTED_API static std::vector> test_UDPv4Transport_DropLog; + FASTDDS_EXPORTED_API static std::vector> test_UDPv4Transport_DropLog; FASTDDS_EXPORTED_API static std::atomic test_UDPv4Transport_DropLogLength; FASTDDS_EXPORTED_API static std::atomic always_drop_participant_builtin_topic_data; FASTDDS_EXPORTED_API static std::atomic simulate_no_interfaces; @@ -65,7 +65,7 @@ class test_UDPv4Transport : public UDPv4Transport protected: virtual bool get_ips( - std::vector& locNames, + std::vector& locNames, bool return_loopback, bool force_lookup) const override; @@ -104,7 +104,7 @@ class test_UDPv4Transport : public UDPv4Transport test_UDPv4TransportDescriptor::filter sub_messages_filter_; PercentageData percentage_of_messages_to_drop_; test_UDPv4TransportDescriptor::filter messages_filter_; - std::vector sequence_number_data_messages_to_drop_; + std::vector sequence_number_data_messages_to_drop_; test_UDPv4TransportDescriptor::DestinationLocatorFilter locator_filter_; bool should_drop_locator( diff --git a/src/cpp/rtps/writer/ChangeForReader.hpp b/src/cpp/rtps/writer/ChangeForReader.hpp index 51b4d682881..fad390a6f27 100644 --- a/src/cpp/rtps/writer/ChangeForReader.hpp +++ b/src/cpp/rtps/writer/ChangeForReader.hpp @@ -26,7 +26,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** @@ -206,7 +206,7 @@ struct ChangeForReaderCmp }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // RTPS_WRITER__CHANGEFORREADER_HPP diff --git a/src/cpp/rtps/writer/LivelinessData.hpp b/src/cpp/rtps/writer/LivelinessData.hpp index 21c35b08764..29bf2af8b24 100644 --- a/src/cpp/rtps/writer/LivelinessData.hpp +++ b/src/cpp/rtps/writer/LivelinessData.hpp @@ -24,7 +24,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** @@ -116,7 +116,7 @@ struct LivelinessData }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif /* _FASTDDS_RTPS_LIVELINESS_DATA_H_ */ diff --git a/src/cpp/rtps/writer/LivelinessManager.cpp b/src/cpp/rtps/writer/LivelinessManager.cpp index 8c21676dbeb..8284c52ef8b 100644 --- a/src/cpp/rtps/writer/LivelinessManager.cpp +++ b/src/cpp/rtps/writer/LivelinessManager.cpp @@ -21,7 +21,7 @@ using namespace std::chrono; namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { using LivelinessDataIterator = ResourceLimitedVector::iterator; @@ -415,5 +415,5 @@ const ResourceLimitedVector& LivelinessManager::get_liveliness_d } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/rtps/writer/LivelinessManager.hpp b/src/cpp/rtps/writer/LivelinessManager.hpp index 6a3af86dbb3..bdf4300cc36 100644 --- a/src/cpp/rtps/writer/LivelinessManager.hpp +++ b/src/cpp/rtps/writer/LivelinessManager.hpp @@ -26,7 +26,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { using LivelinessCallback = std::function namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { bool LocatorSelectorSender::send( @@ -14,5 +14,5 @@ bool LocatorSelectorSender::send( } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/rtps/writer/PersistentWriter.cpp b/src/cpp/rtps/writer/PersistentWriter.cpp index 09733cfca82..beacbcfa9db 100644 --- a/src/cpp/rtps/writer/PersistentWriter.cpp +++ b/src/cpp/rtps/writer/PersistentWriter.cpp @@ -25,7 +25,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { @@ -87,5 +87,5 @@ void PersistentWriter::remove_persistent_change( } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/rtps/writer/PersistentWriter.hpp b/src/cpp/rtps/writer/PersistentWriter.hpp index 9f7baf3a649..f2734fe0124 100644 --- a/src/cpp/rtps/writer/PersistentWriter.hpp +++ b/src/cpp/rtps/writer/PersistentWriter.hpp @@ -26,7 +26,7 @@ #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class IPersistenceService; @@ -75,7 +75,7 @@ class PersistentWriter }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/src/cpp/rtps/writer/RTPSWriter.cpp b/src/cpp/rtps/writer/RTPSWriter.cpp index 0a0fd75a4cc..c967fc839bf 100644 --- a/src/cpp/rtps/writer/RTPSWriter.cpp +++ b/src/cpp/rtps/writer/RTPSWriter.cpp @@ -37,7 +37,7 @@ #include "../flowcontrol/FlowController.hpp" namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { RTPSWriter::RTPSWriter( @@ -497,6 +497,6 @@ void RTPSWriter::add_statistics_sent_submessage( } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/rtps/writer/ReaderLocator.cpp b/src/cpp/rtps/writer/ReaderLocator.cpp index 4db19a6e0bf..a65b1964597 100644 --- a/src/cpp/rtps/writer/ReaderLocator.cpp +++ b/src/cpp/rtps/writer/ReaderLocator.cpp @@ -31,7 +31,7 @@ #include "rtps/RTPSDomainImpl.hpp" namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { using BaseReader = fastdds::rtps::BaseReader; @@ -240,5 +240,5 @@ void ReaderLocator::datasharing_notify() } } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/writer/ReaderLocator.hpp b/src/cpp/rtps/writer/ReaderLocator.hpp index e315b99dc26..46a4e58f4e7 100644 --- a/src/cpp/rtps/writer/ReaderLocator.hpp +++ b/src/cpp/rtps/writer/ReaderLocator.hpp @@ -26,7 +26,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSParticipantImpl; @@ -267,7 +267,7 @@ class ReaderLocator : public RTPSMessageSenderInterface }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif // RTPS_WRITER__READERLOCATOR_HPP diff --git a/src/cpp/rtps/writer/ReaderProxy.cpp b/src/cpp/rtps/writer/ReaderProxy.cpp index d566b47493d..5787bc91a2b 100644 --- a/src/cpp/rtps/writer/ReaderProxy.cpp +++ b/src/cpp/rtps/writer/ReaderProxy.cpp @@ -37,7 +37,7 @@ namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { ReaderProxy::ReaderProxy( @@ -712,5 +712,5 @@ bool ReaderProxy::has_been_delivered( } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/rtps/writer/ReaderProxy.hpp b/src/cpp/rtps/writer/ReaderProxy.hpp index c27873bde47..0c0d95d45c3 100644 --- a/src/cpp/rtps/writer/ReaderProxy.hpp +++ b/src/cpp/rtps/writer/ReaderProxy.hpp @@ -37,7 +37,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class StatefulWriter; @@ -501,7 +501,7 @@ class ReaderProxy }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif // RTPS_WRITER__READERPROXY_HPP diff --git a/src/cpp/rtps/writer/StatefulPersistentWriter.cpp b/src/cpp/rtps/writer/StatefulPersistentWriter.cpp index 8d0b09a193c..447738d4238 100644 --- a/src/cpp/rtps/writer/StatefulPersistentWriter.cpp +++ b/src/cpp/rtps/writer/StatefulPersistentWriter.cpp @@ -24,7 +24,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { @@ -114,5 +114,5 @@ void StatefulPersistentWriter::print_inconsistent_acknack( } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/rtps/writer/StatefulPersistentWriter.hpp b/src/cpp/rtps/writer/StatefulPersistentWriter.hpp index 9260b7b26cf..f888287662c 100644 --- a/src/cpp/rtps/writer/StatefulPersistentWriter.hpp +++ b/src/cpp/rtps/writer/StatefulPersistentWriter.hpp @@ -24,7 +24,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class IPersistenceService; @@ -101,7 +101,7 @@ class StatefulPersistentWriter : public StatefulWriter, private PersistentWriter }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/src/cpp/rtps/writer/StatefulWriter.cpp b/src/cpp/rtps/writer/StatefulWriter.cpp index 847693e8021..ac4b058644b 100644 --- a/src/cpp/rtps/writer/StatefulWriter.cpp +++ b/src/cpp/rtps/writer/StatefulWriter.cpp @@ -60,7 +60,7 @@ #include "../flowcontrol/FlowController.hpp" namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { using BaseReader = fastdds::rtps::BaseReader; @@ -1023,7 +1023,7 @@ void StatefulWriter::select_all_readers_nts( bool StatefulWriter::matched_reader_add( const ReaderProxyData& rdata) { - using fastdds::rtps::network::external_locators::filter_remote_locators; + using network::external_locators::filter_remote_locators; if (rdata.guid() == c_Guid_Unknown) { @@ -2320,5 +2320,5 @@ void StatefulWriter::add_gaps_for_holes_in_history_( } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/rtps/writer/StatefulWriter.hpp b/src/cpp/rtps/writer/StatefulWriter.hpp index f0dba3a93e3..e14809e573c 100644 --- a/src/cpp/rtps/writer/StatefulWriter.hpp +++ b/src/cpp/rtps/writer/StatefulWriter.hpp @@ -32,7 +32,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class ReaderProxy; @@ -546,7 +546,7 @@ class StatefulWriter : public RTPSWriter }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/src/cpp/rtps/writer/StatelessPersistentWriter.cpp b/src/cpp/rtps/writer/StatelessPersistentWriter.cpp index 5fdbe31f156..40f86acdaf7 100644 --- a/src/cpp/rtps/writer/StatelessPersistentWriter.cpp +++ b/src/cpp/rtps/writer/StatelessPersistentWriter.cpp @@ -24,7 +24,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { StatelessPersistentWriter::StatelessPersistentWriter( @@ -95,5 +95,5 @@ bool StatelessPersistentWriter::change_removed_by_history( } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/rtps/writer/StatelessPersistentWriter.hpp b/src/cpp/rtps/writer/StatelessPersistentWriter.hpp index 06835438acb..ce7dad2eee8 100644 --- a/src/cpp/rtps/writer/StatelessPersistentWriter.hpp +++ b/src/cpp/rtps/writer/StatelessPersistentWriter.hpp @@ -24,7 +24,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class IPersistenceService; @@ -92,7 +92,7 @@ class StatelessPersistentWriter : public StatelessWriter, private PersistentWrit }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/src/cpp/rtps/writer/StatelessWriter.cpp b/src/cpp/rtps/writer/StatelessWriter.cpp index 29d1ccfa981..3986da62401 100644 --- a/src/cpp/rtps/writer/StatelessWriter.cpp +++ b/src/cpp/rtps/writer/StatelessWriter.cpp @@ -45,7 +45,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { using BaseReader = fastdds::rtps::BaseReader; @@ -465,7 +465,7 @@ bool StatelessWriter::wait_for_acknowledgement( bool StatelessWriter::matched_reader_add( const ReaderProxyData& data) { - using fastdds::rtps::network::external_locators::filter_remote_locators; + using network::external_locators::filter_remote_locators; std::unique_lock guard(mp_mutex); std::unique_lock locator_selector_guard(locator_selector_); @@ -998,5 +998,5 @@ bool StatelessWriter::get_connections( #endif // ifdef FASTDDS_STATISTICS } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/writer/StatelessWriter.hpp b/src/cpp/rtps/writer/StatelessWriter.hpp index 65d1df71e48..51ea2b8df0f 100644 --- a/src/cpp/rtps/writer/StatelessWriter.hpp +++ b/src/cpp/rtps/writer/StatelessWriter.hpp @@ -36,7 +36,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSMessageGroup; @@ -298,7 +298,7 @@ class StatelessWriter : public RTPSWriter }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC diff --git a/src/cpp/security/OpenSSLInit.hpp b/src/cpp/security/OpenSSLInit.hpp index 91391ab74eb..fab1e0aba3d 100644 --- a/src/cpp/security/OpenSSLInit.hpp +++ b/src/cpp/security/OpenSSLInit.hpp @@ -4,7 +4,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -38,5 +38,5 @@ class OpenSSLInit } // namespace security } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/security/accesscontrol/AccessPermissionsHandle.cpp b/src/cpp/security/accesscontrol/AccessPermissionsHandle.cpp index 7cb295293f6..7c46ded5ddb 100644 --- a/src/cpp/security/accesscontrol/AccessPermissionsHandle.cpp +++ b/src/cpp/security/accesscontrol/AccessPermissionsHandle.cpp @@ -18,6 +18,6 @@ #include -using namespace eprosima::fastrtps::rtps::security; +using namespace eprosima::fastdds::rtps::security; const char* const AccessPermissions::class_id_ = "AccessPermissionsHandle"; diff --git a/src/cpp/security/accesscontrol/AccessPermissionsHandle.h b/src/cpp/security/accesscontrol/AccessPermissionsHandle.h index 9b3168fea1f..78dcefb37e9 100644 --- a/src/cpp/security/accesscontrol/AccessPermissionsHandle.h +++ b/src/cpp/security/accesscontrol/AccessPermissionsHandle.h @@ -29,7 +29,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -70,7 +70,7 @@ typedef HandleImpl AccessPermissionsHandle; } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // __SECURITY_ACCESSCONTROL_ACCESSPERMISSIONSHANDLE_H__ diff --git a/src/cpp/security/accesscontrol/CommonParser.cpp b/src/cpp/security/accesscontrol/CommonParser.cpp index 18b20e49487..8fd7ba840c9 100644 --- a/src/cpp/security/accesscontrol/CommonParser.cpp +++ b/src/cpp/security/accesscontrol/CommonParser.cpp @@ -31,10 +31,10 @@ static const char* DomainIdRange_str = "id_range"; static const char* Min_str = "min"; static const char* Max_str = "max"; -using namespace eprosima::fastrtps; +using namespace eprosima::fastdds; using namespace ::rtps::security; -bool eprosima::fastrtps::rtps::security::parse_domain_id_set( +bool eprosima::fastdds::rtps::security::parse_domain_id_set( tinyxml2::XMLElement* root, Domains& domains) { diff --git a/src/cpp/security/accesscontrol/CommonParser.h b/src/cpp/security/accesscontrol/CommonParser.h index d782de4eb08..c7e69463879 100644 --- a/src/cpp/security/accesscontrol/CommonParser.h +++ b/src/cpp/security/accesscontrol/CommonParser.h @@ -20,15 +20,17 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { -bool parse_domain_id_set(tinyxml2::XMLElement* root, Domains& domains); +bool parse_domain_id_set( + tinyxml2::XMLElement* root, + Domains& domains); -} -} -} -} +} // namespace security +} // namespace rtps +} // namespace fastdds +} // namespace eprosima #endif // __SECURITY_ACCESSCONTROL_COMMON_H__ diff --git a/src/cpp/security/accesscontrol/DistinguishedName.cpp b/src/cpp/security/accesscontrol/DistinguishedName.cpp index 65a2125fe69..5f5fe256533 100644 --- a/src/cpp/security/accesscontrol/DistinguishedName.cpp +++ b/src/cpp/security/accesscontrol/DistinguishedName.cpp @@ -24,7 +24,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -391,5 +391,5 @@ bool rfc2253_string_compare( } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima diff --git a/src/cpp/security/accesscontrol/DistinguishedName.h b/src/cpp/security/accesscontrol/DistinguishedName.h index d481eaa4ffc..5f0211bfea8 100644 --- a/src/cpp/security/accesscontrol/DistinguishedName.h +++ b/src/cpp/security/accesscontrol/DistinguishedName.h @@ -23,7 +23,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -213,7 +213,7 @@ class DistinguishedNameSpecialized } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _SECURITY_ACCESSCONTROL_DISTINGUISHEDNAME_H_ diff --git a/src/cpp/security/accesscontrol/GovernanceParser.cpp b/src/cpp/security/accesscontrol/GovernanceParser.cpp index 8ee2db74736..83e450222ec 100644 --- a/src/cpp/security/accesscontrol/GovernanceParser.cpp +++ b/src/cpp/security/accesscontrol/GovernanceParser.cpp @@ -51,7 +51,7 @@ static const char* ProtectionKindEncrypt_str = "ENCRYPT"; static const char* ProtectionKindSignAuth_str = "SIGN_WITH_ORIGIN_AUTHENTICATION"; static const char* ProtectionKindEncryptAuth_str = "ENCRYPT_WITH_ORIGIN_AUTHENTICATION"; -using namespace eprosima::fastrtps::rtps::security; +using namespace eprosima::fastdds::rtps::security; void GovernanceParser::swap( DomainAccessRules& rules) diff --git a/src/cpp/security/accesscontrol/GovernanceParser.h b/src/cpp/security/accesscontrol/GovernanceParser.h index d416687b26c..51888449c69 100644 --- a/src/cpp/security/accesscontrol/GovernanceParser.h +++ b/src/cpp/security/accesscontrol/GovernanceParser.h @@ -20,7 +20,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -62,30 +62,41 @@ struct DomainAccessRules class GovernanceParser { - public: +public: - bool parse_stream(const char* stream, size_t stream_length); + bool parse_stream( + const char* stream, + size_t stream_length); - void swap(DomainAccessRules& rules); + void swap( + DomainAccessRules& rules); - private: +private: - bool parse_domain_access_rules_node(tinyxml2::XMLElement* root); + bool parse_domain_access_rules_node( + tinyxml2::XMLElement* root); - bool parse_domain_access_rules(tinyxml2::XMLElement* root); + bool parse_domain_access_rules( + tinyxml2::XMLElement* root); - bool parse_domain_rule(tinyxml2::XMLElement* root, DomainRule& rule); + bool parse_domain_rule( + tinyxml2::XMLElement* root, + DomainRule& rule); - bool parse_topic_access_rules(tinyxml2::XMLElement* root, std::vector& rules); + bool parse_topic_access_rules( + tinyxml2::XMLElement* root, + std::vector& rules); - bool parse_topic_rule(tinyxml2::XMLElement* root, TopicRule& rule); + bool parse_topic_rule( + tinyxml2::XMLElement* root, + TopicRule& rule); - DomainAccessRules access_rules_; + DomainAccessRules access_rules_; }; -} -} -} -} +} // namespace security +} // namespace rtps +} // namespace fastdds +} // namespace eprosima #endif // __SECURITY_ACCESSCONTROL_GOVERNANCEPARSER_H__ diff --git a/src/cpp/security/accesscontrol/Permissions.cpp b/src/cpp/security/accesscontrol/Permissions.cpp index ccb7ae940fe..ad7888b2da2 100644 --- a/src/cpp/security/accesscontrol/Permissions.cpp +++ b/src/cpp/security/accesscontrol/Permissions.cpp @@ -53,10 +53,11 @@ #define LOCATION " (" __FILE__ ":" S2(__LINE__) ")" #define _SecurityException_(str) SecurityException(std::string(str) + LOCATION) -using namespace eprosima::fastdds::rtps; -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; -using namespace eprosima::fastrtps::rtps::security; +namespace eprosima { +namespace fastdds { +namespace rtps { + +using namespace security; static bool is_domain_in_set( const uint32_t domain_id, @@ -1382,3 +1383,7 @@ bool Permissions::get_datareader_sec_attributes( return false; } + +} // namespace rtps +} // namespace fastdds +} // namespace eprosima diff --git a/src/cpp/security/accesscontrol/Permissions.h b/src/cpp/security/accesscontrol/Permissions.h index 7c522479157..396c55a719c 100644 --- a/src/cpp/security/accesscontrol/Permissions.h +++ b/src/cpp/security/accesscontrol/Permissions.h @@ -23,7 +23,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -135,7 +135,7 @@ class Permissions : public AccessControl } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _SECURITY_ACCESSCONTROL_PERMISSIONS_H_ diff --git a/src/cpp/security/accesscontrol/PermissionsParser.cpp b/src/cpp/security/accesscontrol/PermissionsParser.cpp index b0c227becc7..051aa9ce88d 100644 --- a/src/cpp/security/accesscontrol/PermissionsParser.cpp +++ b/src/cpp/security/accesscontrol/PermissionsParser.cpp @@ -51,7 +51,7 @@ static const char* DataTags_str = "data_tags"; static const char* Allow_str = "ALLOW"; static const char* Deny_str = "DENY"; -using namespace eprosima::fastrtps::rtps::security; +using namespace eprosima::fastdds::rtps::security; void PermissionsParser::swap( PermissionsData& permissions) diff --git a/src/cpp/security/accesscontrol/PermissionsParser.h b/src/cpp/security/accesscontrol/PermissionsParser.h index adb765ac432..0d977e7a83a 100644 --- a/src/cpp/security/accesscontrol/PermissionsParser.h +++ b/src/cpp/security/accesscontrol/PermissionsParser.h @@ -20,7 +20,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -31,34 +31,50 @@ struct PermissionsData class PermissionsParser { - public: +public: - bool parse_stream(const char* stream, size_t stream_length); + bool parse_stream( + const char* stream, + size_t stream_length); - void swap(PermissionsData& permissions); + void swap( + PermissionsData& permissions); - private: +private: - bool parse_permissions(tinyxml2::XMLElement* root); + bool parse_permissions( + tinyxml2::XMLElement* root); - bool parse_grant(tinyxml2::XMLElement* root, Grant& grant); + bool parse_grant( + tinyxml2::XMLElement* root, + Grant& grant); - bool parse_validity(tinyxml2::XMLElement* root, Validity& validity); + bool parse_validity( + tinyxml2::XMLElement* root, + Validity& validity); - bool parse_rule(tinyxml2::XMLElement* root, Rule& rule); + bool parse_rule( + tinyxml2::XMLElement* root, + Rule& rule); - bool parse_criteria(tinyxml2::XMLElement* root, Criteria& criteria); + bool parse_criteria( + tinyxml2::XMLElement* root, + Criteria& criteria); - bool parse_topic(tinyxml2::XMLElement* root, std::vector& topics); + bool parse_topic( + tinyxml2::XMLElement* root, + std::vector& topics); - bool parse_partition(tinyxml2::XMLElement* root, std::vector& partitions); + bool parse_partition( + tinyxml2::XMLElement* root, + std::vector& partitions); - PermissionsData permissions_; + PermissionsData permissions_; }; -} -} -} -} +} // namespace security +} // namespace rtps +} // namespace fastdds +} // namespace eprosima #endif // __SECURITY_ACCESSCONTROL_PERMISSIONSPARSER_H__ diff --git a/src/cpp/security/accesscontrol/PermissionsTypes.h b/src/cpp/security/accesscontrol/PermissionsTypes.h index 97665e590c2..9743f2f4f24 100644 --- a/src/cpp/security/accesscontrol/PermissionsTypes.h +++ b/src/cpp/security/accesscontrol/PermissionsTypes.h @@ -24,7 +24,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -63,9 +63,9 @@ struct Grant bool is_default_allow; }; -} -} -} -} +} // namespace security +} // namespace rtps +} // namespace fastdds +} // namespace eprosima #endif // __SECURITY_ACCESSCONTROL_PERMISSIONSTYPES_H__ diff --git a/src/cpp/security/artifact_providers/FileProvider.cpp b/src/cpp/security/artifact_providers/FileProvider.cpp index cccdb2cd778..77d8fcb5376 100644 --- a/src/cpp/security/artifact_providers/FileProvider.cpp +++ b/src/cpp/security/artifact_providers/FileProvider.cpp @@ -29,7 +29,7 @@ namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { namespace detail { @@ -260,6 +260,6 @@ X509_CRL* FileProvider::load_crl( } // namespace detail } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima diff --git a/src/cpp/security/artifact_providers/FileProvider.hpp b/src/cpp/security/artifact_providers/FileProvider.hpp index 9b1d7ba974c..80b2f13e648 100644 --- a/src/cpp/security/artifact_providers/FileProvider.hpp +++ b/src/cpp/security/artifact_providers/FileProvider.hpp @@ -29,7 +29,7 @@ namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { namespace detail { @@ -66,7 +66,7 @@ class FileProvider } // namespace detail } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _SECURITY_ARTIFACTPROVIDERS_FILEPROVIDER_HPP_ diff --git a/src/cpp/security/artifact_providers/Pkcs11Provider.cpp b/src/cpp/security/artifact_providers/Pkcs11Provider.cpp index 483d5ce0f1c..05bab96dbfa 100644 --- a/src/cpp/security/artifact_providers/Pkcs11Provider.cpp +++ b/src/cpp/security/artifact_providers/Pkcs11Provider.cpp @@ -34,7 +34,7 @@ namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { namespace detail { @@ -167,5 +167,5 @@ EVP_PKEY* Pkcs11Provider::load_private_key( } // namespace detail } // namespace security } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/security/artifact_providers/Pkcs11Provider.hpp b/src/cpp/security/artifact_providers/Pkcs11Provider.hpp index 2ecc11f4f1c..903b8aaec3f 100644 --- a/src/cpp/security/artifact_providers/Pkcs11Provider.hpp +++ b/src/cpp/security/artifact_providers/Pkcs11Provider.hpp @@ -26,7 +26,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { namespace detail { @@ -63,7 +63,7 @@ class Pkcs11Provider } // namespace detail } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _SECURITY_ARTIFACTPROVIDERS_PKCS11PROVIDER_HPP_ diff --git a/src/cpp/security/authentication/PKIDH.cpp b/src/cpp/security/authentication/PKIDH.cpp index afc998b7745..e67336a6dd5 100644 --- a/src/cpp/security/authentication/PKIDH.cpp +++ b/src/cpp/security/authentication/PKIDH.cpp @@ -61,9 +61,11 @@ #define LOCATION " (" __FILE__ ":" S2(__LINE__) ")" #define _SecurityException_(str) SecurityException(std::string(str) + LOCATION) -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; -using namespace eprosima::fastrtps::rtps::security; +namespace eprosima { +namespace fastdds { +namespace rtps { + +using namespace security; using ParameterList = eprosima::fastdds::dds::ParameterList; @@ -2588,3 +2590,7 @@ bool PKIDH::check_guid_comes_from( return adjusted == original; } + +} // namespace rtps +} // namespace fastdds +} // namespace eprosima diff --git a/src/cpp/security/authentication/PKIDH.h b/src/cpp/security/authentication/PKIDH.h index baf771f502a..4a8dbd178f4 100644 --- a/src/cpp/security/authentication/PKIDH.h +++ b/src/cpp/security/authentication/PKIDH.h @@ -25,7 +25,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -146,7 +146,7 @@ class PKIDH : public Authentication } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _SECURITY_AUTHENTICATION_PKIDH_H_ diff --git a/src/cpp/security/authentication/PKIHandshakeHandle.cpp b/src/cpp/security/authentication/PKIHandshakeHandle.cpp index ce060d0d037..9bf5df59320 100644 --- a/src/cpp/security/authentication/PKIHandshakeHandle.cpp +++ b/src/cpp/security/authentication/PKIHandshakeHandle.cpp @@ -18,6 +18,6 @@ #include -using namespace eprosima::fastrtps::rtps::security; +using namespace eprosima::fastdds::rtps::security; const char* const PKIHandshake::class_id_ = "PKIHandshakeHandle"; diff --git a/src/cpp/security/authentication/PKIHandshakeHandle.h b/src/cpp/security/authentication/PKIHandshakeHandle.h index cb70b449506..2b4d39945e7 100644 --- a/src/cpp/security/authentication/PKIHandshakeHandle.h +++ b/src/cpp/security/authentication/PKIHandshakeHandle.h @@ -25,7 +25,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -65,7 +65,7 @@ typedef HandleImpl PKIHandshakeHandle; } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _SECURITY_AUTHENTICATION_PKIHANDSHAKEHANDLE_H_ diff --git a/src/cpp/security/authentication/PKIIdentityHandle.cpp b/src/cpp/security/authentication/PKIIdentityHandle.cpp index e643411fbf5..942583f46e1 100644 --- a/src/cpp/security/authentication/PKIIdentityHandle.cpp +++ b/src/cpp/security/authentication/PKIIdentityHandle.cpp @@ -18,6 +18,6 @@ #include -using namespace eprosima::fastrtps::rtps::security; +using namespace eprosima::fastdds::rtps::security; const char* const PKIIdentity::class_id_ = "PKIIdentityHandle"; diff --git a/src/cpp/security/authentication/PKIIdentityHandle.h b/src/cpp/security/authentication/PKIIdentityHandle.h index d71baddea4b..71b47c7436b 100644 --- a/src/cpp/security/authentication/PKIIdentityHandle.h +++ b/src/cpp/security/authentication/PKIIdentityHandle.h @@ -26,7 +26,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -97,7 +97,7 @@ typedef HandleImpl PKIIdentityHandle; } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _SECURITY_AUTHENTICATION_PKIIDENTITYHANDLE_H_ diff --git a/src/cpp/security/cryptography/AESGCMGMAC.cpp b/src/cpp/security/cryptography/AESGCMGMAC.cpp index 7c9156bf54d..89494a1d728 100644 --- a/src/cpp/security/cryptography/AESGCMGMAC.cpp +++ b/src/cpp/security/cryptography/AESGCMGMAC.cpp @@ -23,7 +23,7 @@ #include -using namespace eprosima::fastrtps::rtps::security; +using namespace eprosima::fastdds::rtps::security; AESGCMGMAC::AESGCMGMAC() { diff --git a/src/cpp/security/cryptography/AESGCMGMAC.h b/src/cpp/security/cryptography/AESGCMGMAC.h index 6c0bca9cb39..921e268d788 100644 --- a/src/cpp/security/cryptography/AESGCMGMAC.h +++ b/src/cpp/security/cryptography/AESGCMGMAC.h @@ -29,7 +29,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -66,7 +66,7 @@ class AESGCMGMAC : public Cryptography } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _SECURITY_AUTHENTICATION_AESGCMGMAC_H_ diff --git a/src/cpp/security/cryptography/AESGCMGMAC_KeyExchange.cpp b/src/cpp/security/cryptography/AESGCMGMAC_KeyExchange.cpp index 48817920ce0..c362b5f3713 100644 --- a/src/cpp/security/cryptography/AESGCMGMAC_KeyExchange.cpp +++ b/src/cpp/security/cryptography/AESGCMGMAC_KeyExchange.cpp @@ -35,7 +35,7 @@ #undef max #endif // ifdef WIN32 -using namespace eprosima::fastrtps::rtps::security; +using namespace eprosima::fastdds::rtps::security; AESGCMGMAC_KeyExchange::AESGCMGMAC_KeyExchange() { diff --git a/src/cpp/security/cryptography/AESGCMGMAC_KeyExchange.h b/src/cpp/security/cryptography/AESGCMGMAC_KeyExchange.h index 2a3621e75a0..50604c3c315 100644 --- a/src/cpp/security/cryptography/AESGCMGMAC_KeyExchange.h +++ b/src/cpp/security/cryptography/AESGCMGMAC_KeyExchange.h @@ -25,7 +25,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -91,7 +91,7 @@ class AESGCMGMAC_KeyExchange : public CryptoKeyExchange } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _SECURITY_AUTHENTICATION_AESGCMGMAC_KEYEXCHANGE_H_ diff --git a/src/cpp/security/cryptography/AESGCMGMAC_KeyFactory.cpp b/src/cpp/security/cryptography/AESGCMGMAC_KeyFactory.cpp index 978049bfef5..2f70c07769f 100644 --- a/src/cpp/security/cryptography/AESGCMGMAC_KeyFactory.cpp +++ b/src/cpp/security/cryptography/AESGCMGMAC_KeyFactory.cpp @@ -102,8 +102,11 @@ static bool create_kx_key( return true; } -using namespace eprosima::fastrtps::rtps; -using namespace eprosima::fastrtps::rtps::security; +namespace eprosima { +namespace fastdds { +namespace rtps { + +using namespace security; ParticipantCryptoHandleDeleter::ParticipantCryptoHandleDeleter( AESGCMGMAC_KeyFactory& factory) @@ -995,3 +998,7 @@ void AESGCMGMAC_KeyFactory::release_key_id( m_CryptoTransformKeyIds.erase(it); } } + +} // namespace rtps +} // namespace fastdds +} // namespace eprosima diff --git a/src/cpp/security/cryptography/AESGCMGMAC_KeyFactory.h b/src/cpp/security/cryptography/AESGCMGMAC_KeyFactory.h index b9981305674..96a8cc89f2d 100644 --- a/src/cpp/security/cryptography/AESGCMGMAC_KeyFactory.h +++ b/src/cpp/security/cryptography/AESGCMGMAC_KeyFactory.h @@ -27,7 +27,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -147,7 +147,7 @@ class AESGCMGMAC_KeyFactory : public CryptoKeyFactory, public std::enable_shared } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _SECURITY_AUTHENTICATION_AESGCMGMAC_KEYFACTORY_H_ diff --git a/src/cpp/security/cryptography/AESGCMGMAC_Transform.cpp b/src/cpp/security/cryptography/AESGCMGMAC_Transform.cpp index 3d5f1398632..f8813b42496 100644 --- a/src/cpp/security/cryptography/AESGCMGMAC_Transform.cpp +++ b/src/cpp/security/cryptography/AESGCMGMAC_Transform.cpp @@ -47,8 +47,11 @@ #define set_state setState #endif // FASTCDR_VERSION_MAJOR == 1 -using namespace eprosima::fastrtps::rtps; -using namespace eprosima::fastrtps::rtps::security; +namespace eprosima { +namespace fastdds { +namespace rtps { + +using namespace security; constexpr int initialization_vector_suffix_length = 8; @@ -2322,3 +2325,7 @@ bool AESGCMGMAC_Transform::lookup_writer( return false; } + +} // namespace rtps +} // namespace fastdds +} // namespace eprosima diff --git a/src/cpp/security/cryptography/AESGCMGMAC_Transform.h b/src/cpp/security/cryptography/AESGCMGMAC_Transform.h index 9d6453693f3..f2e1be48d96 100644 --- a/src/cpp/security/cryptography/AESGCMGMAC_Transform.h +++ b/src/cpp/security/cryptography/AESGCMGMAC_Transform.h @@ -27,7 +27,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -219,7 +219,7 @@ class AESGCMGMAC_Transform : public CryptoTransform } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _SECURITY_AUTHENTICATION_AESGCMGMAC_TRANSFORM_H_ diff --git a/src/cpp/security/cryptography/AESGCMGMAC_Types.cpp b/src/cpp/security/cryptography/AESGCMGMAC_Types.cpp index e677164e8d5..1744516d60c 100644 --- a/src/cpp/security/cryptography/AESGCMGMAC_Types.cpp +++ b/src/cpp/security/cryptography/AESGCMGMAC_Types.cpp @@ -19,8 +19,8 @@ #include -using namespace eprosima::fastrtps::rtps::security; +using namespace eprosima::fastdds::rtps::security; const char* const ParticipantKeyHandle::class_id_ = "ParticipantCryptohandle"; -const char * const EntityKeyHandle::class_id_ = "EntityCryptohandle"; +const char* const EntityKeyHandle::class_id_ = "EntityCryptohandle"; diff --git a/src/cpp/security/cryptography/AESGCMGMAC_Types.h b/src/cpp/security/cryptography/AESGCMGMAC_Types.h index 96f54f580d5..cbf163d7625 100644 --- a/src/cpp/security/cryptography/AESGCMGMAC_Types.h +++ b/src/cpp/security/cryptography/AESGCMGMAC_Types.h @@ -54,7 +54,7 @@ #define CRYPTO_TRANSFORMATION_KIND_AES256_GCM { {0, 0, 0, 4} } namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -210,7 +210,7 @@ typedef HandleImpl AESGCMGMAC_Parti } //namespaces security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _SECURITY_AUTHENTICATION_AESGCMGMAC_TYPES_H_ diff --git a/src/cpp/security/logging/LogTopic.cpp b/src/cpp/security/logging/LogTopic.cpp index a7be352c349..4ea7e629746 100644 --- a/src/cpp/security/logging/LogTopic.cpp +++ b/src/cpp/security/logging/LogTopic.cpp @@ -6,7 +6,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -101,5 +101,5 @@ void LogTopic::publish( } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima diff --git a/src/cpp/security/logging/LogTopic.h b/src/cpp/security/logging/LogTopic.h index 206ec8b8f04..6dcc143331e 100644 --- a/src/cpp/security/logging/LogTopic.h +++ b/src/cpp/security/logging/LogTopic.h @@ -31,7 +31,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -83,7 +83,7 @@ class LogTopic final : public Logging } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _FASTDDS_RTPS_SECURITY_LOGGING_LOGTOPIC_H_ diff --git a/src/cpp/statistics/fastdds/domain/DomainParticipant.cpp b/src/cpp/statistics/fastdds/domain/DomainParticipant.cpp index f8962b7bef0..86417739a30 100644 --- a/src/cpp/statistics/fastdds/domain/DomainParticipant.cpp +++ b/src/cpp/statistics/fastdds/domain/DomainParticipant.cpp @@ -113,7 +113,7 @@ fastdds::dds::ReturnCode_t DomainParticipant::disable_monitor_service() } fastdds::dds::ReturnCode_t DomainParticipant::fill_discovery_data_from_cdr_message( - fastrtps::rtps::ParticipantProxyData& data, + fastdds::rtps::ParticipantProxyData& data, fastdds::statistics::MonitorServiceStatusData& msg) { #ifdef FASTDDS_STATISTICS @@ -126,7 +126,7 @@ fastdds::dds::ReturnCode_t DomainParticipant::fill_discovery_data_from_cdr_messa } fastdds::dds::ReturnCode_t DomainParticipant::fill_discovery_data_from_cdr_message( - fastrtps::rtps::WriterProxyData& data, + fastdds::rtps::WriterProxyData& data, fastdds::statistics::MonitorServiceStatusData& msg) { #ifdef FASTDDS_STATISTICS @@ -139,7 +139,7 @@ fastdds::dds::ReturnCode_t DomainParticipant::fill_discovery_data_from_cdr_messa } fastdds::dds::ReturnCode_t DomainParticipant::fill_discovery_data_from_cdr_message( - fastrtps::rtps::ReaderProxyData& data, + fastdds::rtps::ReaderProxyData& data, fastdds::statistics::MonitorServiceStatusData& msg) { #ifdef FASTDDS_STATISTICS diff --git a/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp b/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp index f771fa76770..5c0c8f9cc2b 100644 --- a/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp +++ b/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp @@ -56,9 +56,9 @@ namespace fastdds { namespace statistics { namespace dds { -using fastrtps::xmlparser::XMLProfileManager; -using fastrtps::xmlparser::XMLP_ret; -using fastrtps::xmlparser::DEFAULT_STATISTICS_DATAWRITER_PROFILE; +using xmlparser::XMLProfileManager; +using xmlparser::XMLP_ret; +using xmlparser::DEFAULT_STATISTICS_DATAWRITER_PROFILE; constexpr const char* HISTORY_LATENCY_TOPIC_ALIAS = "HISTORY_LATENCY_TOPIC"; constexpr const char* NETWORK_LATENCY_TOPIC_ALIAS = "NETWORK_LATENCY_TOPIC"; @@ -135,7 +135,7 @@ ReturnCode_t DomainParticipantImpl::enable_statistics_datawriter( // Check if the statistics DataWriter already exists and create statistics DataWriter if it does not. if (nullptr == builtin_publisher_->lookup_datawriter(use_topic_name)) { - fastrtps::rtps::EntityId_t entity_id; + fastdds::rtps::EntityId_t entity_id; set_statistics_entity_id(event_kind, entity_id); efd::TypeSupport type = participant_->find_type(topic->get_type_name()); auto writer_impl = builtin_publisher_impl_->create_datawriter_impl(type, topic, dwqos, entity_id); @@ -260,7 +260,7 @@ ReturnCode_t DomainParticipantImpl::enable() if (!rtps_participant_->is_monitor_service_created()) { - auto enable_ms_property_value = fastrtps::rtps::PropertyPolicyHelper::find_property( + auto enable_ms_property_value = fastdds::rtps::PropertyPolicyHelper::find_property( qos_.properties(), fastdds::dds::parameter_enable_monitor_service); if (nullptr != enable_ms_property_value && *enable_ms_property_value == "true") @@ -323,7 +323,7 @@ ReturnCode_t DomainParticipantImpl::disable_monitor_service() } ReturnCode_t DomainParticipantImpl::fill_discovery_data_from_cdr_message( - fastrtps::rtps::ParticipantProxyData& data, + fastdds::rtps::ParticipantProxyData& data, fastdds::statistics::MonitorServiceStatusData& msg) { ReturnCode_t ret{efd::RETCODE_OK}; @@ -337,7 +337,7 @@ ReturnCode_t DomainParticipantImpl::fill_discovery_data_from_cdr_message( } ReturnCode_t DomainParticipantImpl::fill_discovery_data_from_cdr_message( - fastrtps::rtps::WriterProxyData& data, + fastdds::rtps::WriterProxyData& data, fastdds::statistics::MonitorServiceStatusData& msg) { ReturnCode_t ret{efd::RETCODE_OK}; @@ -351,7 +351,7 @@ ReturnCode_t DomainParticipantImpl::fill_discovery_data_from_cdr_message( } ReturnCode_t DomainParticipantImpl::fill_discovery_data_from_cdr_message( - fastrtps::rtps::ReaderProxyData& data, + fastdds::rtps::ReaderProxyData& data, fastdds::statistics::MonitorServiceStatusData& msg) { ReturnCode_t ret{efd::RETCODE_OK}; @@ -390,7 +390,7 @@ void DomainParticipantImpl::create_statistics_builtin_entities() // Enable statistics datawriters // 1. Find fastdds_statistics PropertyPolicyQos - const std::string* property_topic_list = eprosima::fastrtps::rtps::PropertyPolicyHelper::find_property( + const std::string* property_topic_list = eprosima::fastdds::rtps::PropertyPolicyHelper::find_property( get_qos().properties(), "fastdds.statistics"); if (nullptr != property_topic_list) @@ -624,7 +624,7 @@ bool DomainParticipantImpl::delete_topic_and_type( } bool DomainParticipantImpl::get_monitoring_status( - const fastrtps::rtps::GUID_t& entity_guid, + const fastdds::rtps::GUID_t& entity_guid, eprosima::fastdds::statistics::MonitorServiceData& status) { ReturnCode_t ret = efd::RETCODE_ERROR; diff --git a/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp b/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp index 0c977d6b7fa..18105ced641 100644 --- a/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp +++ b/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp @@ -155,7 +155,7 @@ class DomainParticipantImpl : public efd::DomainParticipantImpl, * @return RETCODE_ERROR if the operation fails. */ efd::ReturnCode_t fill_discovery_data_from_cdr_message( - fastrtps::rtps::ParticipantProxyData& data, + fastdds::rtps::ParticipantProxyData& data, fastdds::statistics::MonitorServiceStatusData& msg); /** @@ -168,7 +168,7 @@ class DomainParticipantImpl : public efd::DomainParticipantImpl, * @return RETCODE_ERROR if the operation fails. */ efd::ReturnCode_t fill_discovery_data_from_cdr_message( - fastrtps::rtps::WriterProxyData& data, + fastdds::rtps::WriterProxyData& data, fastdds::statistics::MonitorServiceStatusData& msg); /** @@ -181,7 +181,7 @@ class DomainParticipantImpl : public efd::DomainParticipantImpl, * @return RETCODE_ERROR if the operation fails. */ efd::ReturnCode_t fill_discovery_data_from_cdr_message( - fastrtps::rtps::ReaderProxyData& data, + fastdds::rtps::ReaderProxyData& data, fastdds::statistics::MonitorServiceStatusData& msg); /** @@ -289,7 +289,7 @@ class DomainParticipantImpl : public efd::DomainParticipantImpl, * @brief Implementation of the IStatusQueryable interface. */ bool get_monitoring_status( - const fastrtps::rtps::GUID_t& entity_guid, + const fastdds::rtps::GUID_t& entity_guid, eprosima::fastdds::statistics::MonitorServiceData&) override; efd::Publisher* builtin_publisher_ = nullptr; diff --git a/src/cpp/statistics/fastdds/publisher/DataWriterImpl.hpp b/src/cpp/statistics/fastdds/publisher/DataWriterImpl.hpp index 5072d93cfd0..8394f3fe6a7 100644 --- a/src/cpp/statistics/fastdds/publisher/DataWriterImpl.hpp +++ b/src/cpp/statistics/fastdds/publisher/DataWriterImpl.hpp @@ -48,7 +48,7 @@ class DataWriterImpl : public efd::DataWriterImpl efd::TypeSupport type, efd::Topic* topic, const efd::DataWriterQos& qos, - const eprosima::fastrtps::rtps::EntityId_t& entity_id) + const eprosima::fastdds::rtps::EntityId_t& entity_id) : BaseType(p, type, topic, qos, entity_id, nullptr) { } @@ -59,7 +59,7 @@ class DataWriterImpl : public efd::DataWriterImpl efd::Topic* topic, const efd::DataWriterQos& qos, efd::DataWriterListener* listener, - std::shared_ptr payload_pool, + std::shared_ptr payload_pool, std::shared_ptr stat_listener) : BaseType(p, type, topic, qos, listener, payload_pool) , statistics_listener_(stat_listener) diff --git a/src/cpp/statistics/fastdds/publisher/PublisherImpl.hpp b/src/cpp/statistics/fastdds/publisher/PublisherImpl.hpp index 72fca819ff2..bdeda4612ee 100644 --- a/src/cpp/statistics/fastdds/publisher/PublisherImpl.hpp +++ b/src/cpp/statistics/fastdds/publisher/PublisherImpl.hpp @@ -53,7 +53,7 @@ class PublisherImpl : public efd::PublisherImpl const efd::TypeSupport& type, efd::Topic* topic, const efd::DataWriterQos& qos, - const eprosima::fastrtps::rtps::EntityId_t& entity_id) + const eprosima::fastdds::rtps::EntityId_t& entity_id) { return new DataWriterImpl(this, type, topic, qos, entity_id); } @@ -63,7 +63,7 @@ class PublisherImpl : public efd::PublisherImpl efd::Topic* topic, const efd::DataWriterQos& qos, efd::DataWriterListener* listener, - std::shared_ptr payload_pool) override + std::shared_ptr payload_pool) override { return new DataWriterImpl(this, type, topic, qos, listener, payload_pool, statistics_listener_); } diff --git a/src/cpp/statistics/fastdds/subscriber/DataReaderImpl.hpp b/src/cpp/statistics/fastdds/subscriber/DataReaderImpl.hpp index 304acfc6c20..9bb796fabff 100644 --- a/src/cpp/statistics/fastdds/subscriber/DataReaderImpl.hpp +++ b/src/cpp/statistics/fastdds/subscriber/DataReaderImpl.hpp @@ -48,7 +48,7 @@ class DataReaderImpl : public efd::DataReaderImpl efd::TopicDescription* topic, const efd::DataReaderQos& qos, efd::DataReaderListener* listener, - std::shared_ptr payload_pool, + std::shared_ptr payload_pool, std::shared_ptr stat_listener) : BaseType(s, type, topic, qos, listener, payload_pool) , statistics_listener_(stat_listener) diff --git a/src/cpp/statistics/fastdds/subscriber/SubscriberImpl.hpp b/src/cpp/statistics/fastdds/subscriber/SubscriberImpl.hpp index 3cdc5fd1ba1..14ca67c9a12 100644 --- a/src/cpp/statistics/fastdds/subscriber/SubscriberImpl.hpp +++ b/src/cpp/statistics/fastdds/subscriber/SubscriberImpl.hpp @@ -54,7 +54,7 @@ class SubscriberImpl : public efd::SubscriberImpl efd::TopicDescription* topic, const efd::DataReaderQos& qos, efd::DataReaderListener* listener, - std::shared_ptr payload_pool) override + std::shared_ptr payload_pool) override { return new DataReaderImpl(this, type, topic, qos, listener, payload_pool, statistics_listener_); } diff --git a/src/cpp/statistics/fastdds/subscriber/qos/DataReaderQos.cpp b/src/cpp/statistics/fastdds/subscriber/qos/DataReaderQos.cpp index 68231df5482..211c6b59521 100644 --- a/src/cpp/statistics/fastdds/subscriber/qos/DataReaderQos.cpp +++ b/src/cpp/statistics/fastdds/subscriber/qos/DataReaderQos.cpp @@ -35,7 +35,7 @@ DataReaderQos::DataReaderQos() history().depth = 100; // Setting history memory policy to PREALLOCATED_WITH_REALLOC_MEMORY_MODE allows for future type // extension with backwards compatibility - endpoint().history_memory_policy = eprosima::fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; + endpoint().history_memory_policy = eprosima::fastdds::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; } MonitorServiceDataReaderQos::MonitorServiceDataReaderQos() diff --git a/src/cpp/statistics/rtps/GuidUtils.hpp b/src/cpp/statistics/rtps/GuidUtils.hpp index 502ecafee35..03eef276321 100644 --- a/src/cpp/statistics/rtps/GuidUtils.hpp +++ b/src/cpp/statistics/rtps/GuidUtils.hpp @@ -35,7 +35,7 @@ namespace statistics { * @return true when the entity id corresponds to a builtin statistics writer. */ inline bool is_statistics_builtin( - const fastrtps::rtps::EntityId_t& entity_id) + const fastdds::rtps::EntityId_t& entity_id) { return 0x60 == (0xE0 & entity_id.value[3]); } @@ -47,7 +47,7 @@ inline bool is_statistics_builtin( */ inline void set_statistics_entity_id( uint32_t kind, - fastrtps::rtps::EntityId_t& entity_id) + fastdds::rtps::EntityId_t& entity_id) { entity_id.value[3] = 0x62; entity_id.value[2] = kind & 0xFF; diff --git a/src/cpp/statistics/rtps/StatisticsBase.cpp b/src/cpp/statistics/rtps/StatisticsBase.cpp index b12e5bbe418..3a0278fd656 100644 --- a/src/cpp/statistics/rtps/StatisticsBase.cpp +++ b/src/cpp/statistics/rtps/StatisticsBase.cpp @@ -70,31 +70,31 @@ static void sub_bytes( } detail::Locator_s to_statistics_type( - fastrtps::rtps::Locator_t locator) + fastdds::rtps::Locator_t locator) { return *reinterpret_cast(&locator); } -fastrtps::rtps::Locator_t to_fastdds_type( +fastdds::rtps::Locator_t to_fastdds_type( detail::Locator_s locator) { - return *reinterpret_cast(&locator); + return *reinterpret_cast(&locator); } detail::GUID_s to_statistics_type( - fastrtps::rtps::GUID_t guid) + fastdds::rtps::GUID_t guid) { return *reinterpret_cast(&guid); } -fastrtps::rtps::GUID_t to_fastdds_type( +fastdds::rtps::GUID_t to_fastdds_type( detail::GUID_s guid) { - return *reinterpret_cast(&guid); + return *reinterpret_cast(&guid); } detail::SampleIdentity_s to_statistics_type( - fastrtps::rtps::SampleIdentity sample_id) + fastdds::rtps::SampleIdentity sample_id) { return *reinterpret_cast(&sample_id); } @@ -113,7 +113,7 @@ bool StatisticsListenersImpl::add_statistics_listener_impl( return false; } - std::lock_guard lock(get_statistics_mutex()); + std::lock_guard lock(get_statistics_mutex()); // add the new listener return members_->listeners.insert(listener).second; @@ -122,7 +122,7 @@ bool StatisticsListenersImpl::add_statistics_listener_impl( bool StatisticsListenersImpl::remove_statistics_listener_impl( std::shared_ptr listener) { - std::lock_guard lock(get_statistics_mutex()); + std::lock_guard lock(get_statistics_mutex()); if (!listener) { @@ -136,7 +136,7 @@ bool StatisticsListenersImpl::remove_statistics_listener_impl( void StatisticsListenersImpl::set_enabled_statistics_writers_mask_impl( uint32_t enabled_writers) { - std::unique_lock lock(get_statistics_mutex()); + std::unique_lock lock(get_statistics_mutex()); if (members_) { members_->enabled_writers_mask.store(enabled_writers); @@ -147,7 +147,7 @@ bool StatisticsListenersImpl::are_statistics_writers_enabled( uint32_t checked_enabled_writers) { // Check if the corresponding writer is enabled - std::unique_lock lock(get_statistics_mutex()); + std::unique_lock lock(get_statistics_mutex()); if (members_) { // Casting a number other than 1 to bool is not guaranteed to yield true @@ -156,9 +156,9 @@ bool StatisticsListenersImpl::are_statistics_writers_enabled( return false; } -const eprosima::fastrtps::rtps::GUID_t& StatisticsParticipantImpl::get_guid() const +const eprosima::fastdds::rtps::GUID_t& StatisticsParticipantImpl::get_guid() const { - using eprosima::fastrtps::rtps::RTPSParticipantImpl; + using eprosima::fastdds::rtps::RTPSParticipantImpl; static_assert( std::is_base_of::value, @@ -208,8 +208,6 @@ void StatisticsParticipantImpl::ListenerProxy::mask( bool StatisticsParticipantImpl::are_writers_involved( const uint32_t mask) const { - using namespace fastdds::statistics; - constexpr uint32_t writers_maks = EventKind::PUBLICATION_THROUGHPUT \ | EventKind::RESENT_DATAS \ | EventKind::HEARTBEAT_COUNT \ @@ -223,8 +221,6 @@ bool StatisticsParticipantImpl::are_writers_involved( bool StatisticsParticipantImpl::are_readers_involved( const uint32_t mask) const { - using namespace fastdds::statistics; - constexpr uint32_t readers_maks = EventKind::HISTORY2HISTORY_LATENCY \ | EventKind::SUBSCRIPTION_THROUGHPUT \ | EventKind::ACKNACK_COUNT \ @@ -375,9 +371,9 @@ uint32_t StatisticsParticipantImpl::get_enabled_statistics_writers_mask() } void StatisticsParticipantImpl::on_network_statistics( - const fastrtps::rtps::GuidPrefix_t& source_participant, - const fastrtps::rtps::Locator_t& source_locator, - const fastrtps::rtps::Locator_t& reception_locator, + const fastdds::rtps::GuidPrefix_t& source_participant, + const fastdds::rtps::Locator_t& source_locator, + const fastdds::rtps::Locator_t& reception_locator, const rtps::StatisticsSubmessageData& data, uint64_t datagram_size) { @@ -388,20 +384,20 @@ void StatisticsParticipantImpl::on_network_statistics( } void StatisticsParticipantImpl::process_network_timestamp( - const fastrtps::rtps::GuidPrefix_t& source_participant, - const fastrtps::rtps::Locator_t& reception_locator, + const fastdds::rtps::GuidPrefix_t& source_participant, + const fastdds::rtps::Locator_t& reception_locator, const rtps::StatisticsSubmessageData::TimeStamp& ts) { - using namespace eprosima::fastrtps::rtps; + using namespace eprosima::fastdds::rtps; if (!are_statistics_writers_enabled(EventKind::NETWORK_LATENCY)) { return; } - Time_t source_ts(ts.seconds, ts.fraction); - Time_t current_ts; - Time_t::now(current_ts); + eprosima::fastdds::rtps::Time_t source_ts(ts.seconds, ts.fraction); + eprosima::fastdds::rtps::Time_t current_ts; + eprosima::fastdds::rtps::Time_t::now(current_ts); auto latency = static_cast((current_ts - source_ts).to_ns()); Locator2LocatorData notification; @@ -427,8 +423,8 @@ void StatisticsParticipantImpl::process_network_timestamp( } void StatisticsParticipantImpl::process_network_sequence( - const fastrtps::rtps::GuidPrefix_t& source_participant, - const fastrtps::rtps::Locator_t& reception_locator, + const fastdds::rtps::GuidPrefix_t& source_participant, + const fastdds::rtps::Locator_t& reception_locator, const rtps::StatisticsSubmessageData::Sequence& seq, uint64_t datagram_size) { @@ -500,11 +496,11 @@ void StatisticsParticipantImpl::process_network_sequence( } void StatisticsParticipantImpl::on_rtps_sent( - const fastrtps::rtps::Locator_t& loc, + const fastdds::rtps::Locator_t& loc, unsigned long payload_size) { using namespace std; - using eprosima::fastrtps::rtps::RTPSParticipantImpl; + using eprosima::fastdds::rtps::RTPSParticipantImpl; if (!are_statistics_writers_enabled(EventKind::RTPS_SENT)) { @@ -537,10 +533,10 @@ void StatisticsParticipantImpl::on_rtps_sent( } void StatisticsParticipantImpl::on_entity_discovery( - const fastrtps::rtps::GUID_t& id, + const fastdds::rtps::GUID_t& id, const fastdds::dds::ParameterPropertyList_t& properties) { - using namespace fastrtps; + using namespace fastdds; if (!are_statistics_writers_enabled(EventKind::DISCOVERED_ENTITY)) { @@ -583,8 +579,8 @@ void StatisticsParticipantImpl::on_entity_discovery( { // generate callback timestamp - Time_t t; - Time_t::now(t); + eprosima::fastdds::rtps::Time_t t; + eprosima::fastdds::rtps::Time_t::now(t); notification.time(t.to_ns()); } diff --git a/src/cpp/statistics/rtps/StatisticsBase.hpp b/src/cpp/statistics/rtps/StatisticsBase.hpp index 941b502dc22..0c1c4e4b855 100644 --- a/src/cpp/statistics/rtps/StatisticsBase.hpp +++ b/src/cpp/statistics/rtps/StatisticsBase.hpp @@ -36,16 +36,14 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class MessageReceiver; class PDP; } // rtps -} // fastrtps -namespace fastdds { namespace statistics { #ifdef FASTDDS_STATISTICS @@ -79,7 +77,7 @@ Function StatisticsListenersImpl::for_each_listener( Function f) { // Use a collection copy to prevent locking on traversal - std::unique_lock lock(get_statistics_mutex()); + std::unique_lock lock(get_statistics_mutex()); if (members_) { auto listeners = members_->listeners; @@ -96,15 +94,15 @@ Function StatisticsListenersImpl::for_each_listener( class StatisticsParticipantImpl { - friend class fastrtps::rtps::PDP; - friend class fastrtps::rtps::MessageReceiver; + friend class fastdds::rtps::PDP; + friend class fastdds::rtps::MessageReceiver; // statistics members protection only std::recursive_mutex statistics_mutex_; public: - using GUID_t = fastrtps::rtps::GUID_t; + using GUID_t = fastdds::rtps::GUID_t; private: @@ -115,10 +113,10 @@ class StatisticsParticipantImpl unsigned long long byte_count = {}; }; - std::map traffic_; + std::map traffic_; // RTPS_LOST ancillary - using lost_traffic_key = std::pair; + using lost_traffic_key = std::pair; struct lost_traffic_value { uint64_t first_sequence = 0; @@ -282,9 +280,9 @@ class StatisticsParticipantImpl * @param [in] datagram_size The size in bytes of the received datagram. */ void on_network_statistics( - const fastrtps::rtps::GuidPrefix_t& source_participant, - const fastrtps::rtps::Locator_t& source_locator, - const fastrtps::rtps::Locator_t& reception_locator, + const fastdds::rtps::GuidPrefix_t& source_participant, + const fastdds::rtps::Locator_t& source_locator, + const fastdds::rtps::Locator_t& reception_locator, const rtps::StatisticsSubmessageData& data, uint64_t datagram_size); @@ -295,8 +293,8 @@ class StatisticsParticipantImpl * @param [in] ts The timestamp of the statistics submessage received. */ void process_network_timestamp( - const fastrtps::rtps::GuidPrefix_t& source_participant, - const fastrtps::rtps::Locator_t& reception_locator, + const fastdds::rtps::GuidPrefix_t& source_participant, + const fastdds::rtps::Locator_t& reception_locator, const rtps::StatisticsSubmessageData::TimeStamp& ts); /* @@ -307,8 +305,8 @@ class StatisticsParticipantImpl * @param [in] datagram_size The size in bytes of the received datagram. */ void process_network_sequence( - const fastrtps::rtps::GuidPrefix_t& source_participant, - const fastrtps::rtps::Locator_t& reception_locator, + const fastdds::rtps::GuidPrefix_t& source_participant, + const fastdds::rtps::Locator_t& reception_locator, const rtps::StatisticsSubmessageData::Sequence& seq, uint64_t datagram_size); @@ -318,7 +316,7 @@ class StatisticsParticipantImpl * @param payload_size size of the current message */ void on_rtps_sent( - const fastrtps::rtps::Locator_t& loc, + const fastdds::rtps::Locator_t& loc, unsigned long payload_size); /* @@ -461,13 +459,13 @@ class StatisticsParticipantImpl // auxiliary conversion functions // TODO(jlbueno): private headers shall not export API -FASTDDS_EXPORTED_API detail::Locator_s to_statistics_type(fastrtps::rtps::Locator_t); -FASTDDS_EXPORTED_API fastrtps::rtps::Locator_t to_fastdds_type( +FASTDDS_EXPORTED_API detail::Locator_s to_statistics_type(fastdds::rtps::Locator_t); +FASTDDS_EXPORTED_API fastdds::rtps::Locator_t to_fastdds_type( detail::Locator_s); -FASTDDS_EXPORTED_API detail::GUID_s to_statistics_type(fastrtps::rtps::GUID_t); -FASTDDS_EXPORTED_API fastrtps::rtps::GUID_t to_fastdds_type( +FASTDDS_EXPORTED_API detail::GUID_s to_statistics_type(fastdds::rtps::GUID_t); +FASTDDS_EXPORTED_API fastdds::rtps::GUID_t to_fastdds_type( detail::GUID_s); -FASTDDS_EXPORTED_API detail::SampleIdentity_s to_statistics_type(fastrtps::rtps::SampleIdentity); +FASTDDS_EXPORTED_API detail::SampleIdentity_s to_statistics_type(fastdds::rtps::SampleIdentity); #else // dummy implementation @@ -475,7 +473,7 @@ struct StatisticsAncillary {}; class StatisticsParticipantImpl { - friend class fastrtps::rtps::PDP; + friend class fastdds::rtps::PDP; protected: @@ -490,9 +488,9 @@ class StatisticsParticipantImpl * @param [in] The size in bytes of the received datagram. */ inline void on_network_statistics( - const fastrtps::rtps::GuidPrefix_t&, - const fastrtps::rtps::Locator_t&, - const fastrtps::rtps::Locator_t&, + const fastdds::rtps::GuidPrefix_t&, + const fastdds::rtps::Locator_t&, + const fastdds::rtps::Locator_t&, const rtps::StatisticsSubmessageData&, uint64_t) { @@ -507,7 +505,7 @@ class StatisticsParticipantImpl */ template inline void on_rtps_send( - const fastrtps::rtps::GUID_t&, + const fastdds::rtps::GUID_t&, const LocatorIteratorT&, const LocatorIteratorT&, unsigned long) @@ -521,7 +519,7 @@ class StatisticsParticipantImpl * @param properties The property list of the discoved entity */ inline void on_entity_discovery( - const fastrtps::rtps::GUID_t&, + const fastdds::rtps::GUID_t&, const fastdds::dds::ParameterPropertyList_t&) { } @@ -535,7 +533,7 @@ class StatisticsParticipantImpl */ template inline void on_discovery_packet( - const fastrtps::rtps::GUID_t&, + const fastdds::rtps::GUID_t&, const LocatorIteratorT&, const LocatorIteratorT&) { diff --git a/src/cpp/statistics/rtps/messages/OutputTrafficManager.hpp b/src/cpp/statistics/rtps/messages/OutputTrafficManager.hpp index 220bdce41e7..2f19a003374 100644 --- a/src/cpp/statistics/rtps/messages/OutputTrafficManager.hpp +++ b/src/cpp/statistics/rtps/messages/OutputTrafficManager.hpp @@ -48,7 +48,7 @@ class OutputTrafficManager * @param locator The locator for which sequencing information should be kept. */ inline void add_entry( - const eprosima::fastrtps::rtps::Locator_t& locator) + const eprosima::fastdds::rtps::Locator_t& locator) { static_cast(locator); @@ -69,7 +69,7 @@ class OutputTrafficManager * */ inline void set_statistics_message_data( - const eprosima::fastrtps::rtps::Locator_t& locator, + const eprosima::fastdds::rtps::Locator_t& locator, const eprosima::fastdds::rtps::NetworkBuffer& send_buffer, const uint32_t& total_bytes) { @@ -92,7 +92,7 @@ class OutputTrafficManager private: - using key_type = eprosima::fastrtps::rtps::Locator_t; + using key_type = eprosima::fastdds::rtps::Locator_t; using value_type = StatisticsSubmessageData::Sequence; using entry_type = std::pair; diff --git a/src/cpp/statistics/rtps/messages/RTPSStatisticsMessages.hpp b/src/cpp/statistics/rtps/messages/RTPSStatisticsMessages.hpp index 28fb200b5d7..2bcc3ea589c 100644 --- a/src/cpp/statistics/rtps/messages/RTPSStatisticsMessages.hpp +++ b/src/cpp/statistics/rtps/messages/RTPSStatisticsMessages.hpp @@ -78,7 +78,7 @@ struct StatisticsSubmessageData }; - eprosima::fastrtps::rtps::Locator_t destination; + eprosima::fastdds::rtps::Locator_t destination; TimeStamp ts{}; Sequence seq{}; }; @@ -94,14 +94,14 @@ constexpr uint16_t statistics_submessage_length = * @pre There should be room in the message for the statistics submessage. */ inline void add_statistics_submessage( - eprosima::fastrtps::rtps::CDRMessage_t* msg) + eprosima::fastdds::rtps::CDRMessage_t* msg) { static_cast(msg); #ifdef FASTDDS_STATISTICS assert(msg->max_size >= msg->length + statistics_submessage_length); - using namespace eprosima::fastrtps::rtps; + using namespace eprosima::fastdds::rtps; RTPSMessageCreator::addSubmessageHeader( msg, FASTDDS_STATISTICS_NETWORK_SUBMESSAGE, 0x00, statistics_submessage_data_length); memset(msg->buffer + msg->pos, 0, statistics_submessage_data_length); @@ -119,7 +119,7 @@ inline void add_statistics_submessage( * submessage will be consumed, and it won't be available anymore) */ inline void read_statistics_submessage( - eprosima::fastrtps::rtps::CDRMessage_t* msg, + eprosima::fastdds::rtps::CDRMessage_t* msg, StatisticsSubmessageData& data) { static_cast(msg); @@ -130,7 +130,7 @@ inline void read_statistics_submessage( assert(msg->pos + statistics_submessage_data_length == msg->length); // Read all fields - using namespace eprosima::fastrtps::rtps; + using namespace eprosima::fastdds::rtps; CDRMessage::readLocator(msg, &data.destination); CDRMessage::readInt32(msg, &data.ts.seconds); CDRMessage::readUInt32(msg, &data.ts.fraction); @@ -146,7 +146,7 @@ inline void read_statistics_submessage( #ifdef FASTDDS_STATISTICS inline uint32_t get_statistics_message_pos( - const eprosima::fastrtps::rtps::octet* send_buffer, + const eprosima::fastdds::rtps::octet* send_buffer, uint32_t send_buffer_size) { // zero can be use as an error value because the minimum valid value @@ -173,13 +173,13 @@ inline bool is_statistics_buffer( { return statistics_submessage_length == stat_buffer.size && FASTDDS_STATISTICS_NETWORK_SUBMESSAGE == - static_cast(stat_buffer.buffer)[0]; + static_cast(stat_buffer.buffer)[0]; } #endif // FASTDDS_STATISTICS inline void set_statistics_submessage_from_transport( - const eprosima::fastrtps::rtps::Locator_t& destination, + const eprosima::fastdds::rtps::Locator_t& destination, const eprosima::fastdds::rtps::NetworkBuffer& send_buffer, const uint32_t& total_bytes, StatisticsSubmessageData::Sequence& sequence) @@ -190,7 +190,7 @@ inline void set_statistics_submessage_from_transport( static_cast(sequence); #ifdef FASTDDS_STATISTICS - using namespace eprosima::fastrtps::rtps; + using namespace eprosima::fastdds::rtps; if (is_statistics_buffer(send_buffer)) { @@ -204,8 +204,8 @@ inline void set_statistics_submessage_from_transport( // Set current timestamp and sequence auto current_pos = &static_cast(send_buffer.buffer)[statistics_pos]; - Time_t ts; - Time_t::now(ts); + eprosima::fastdds::rtps::Time_t ts; + eprosima::fastdds::rtps::Time_t::now(ts); /* * This set of memcpy blocks is intended to prevent an undefined behavior caused when casting from an octet* to a StatisticsSubmessageData* diff --git a/src/cpp/statistics/rtps/monitor-service/MonitorService.cpp b/src/cpp/statistics/rtps/monitor-service/MonitorService.cpp index 8065cc33d7d..aec20a9df25 100644 --- a/src/cpp/statistics/rtps/monitor-service/MonitorService.cpp +++ b/src/cpp/statistics/rtps/monitor-service/MonitorService.cpp @@ -26,8 +26,8 @@ #include #include -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; namespace eprosima { namespace fastdds { @@ -35,7 +35,7 @@ namespace statistics { namespace rtps { MonitorService::MonitorService( - const fastrtps::rtps::GUID_t& guid, + const fastdds::rtps::GUID_t& guid, IProxyQueryable* proxy_q, IConnectionsQueryable* conns_q, IStatusQueryable& status_q, @@ -152,7 +152,7 @@ bool MonitorService::disable_monitor_service() } bool MonitorService::remove_local_entity( - const fastrtps::rtps::EntityId_t& entity_id) + const fastdds::rtps::EntityId_t& entity_id) { { std::lock_guard lock (mtx_); @@ -198,7 +198,7 @@ bool MonitorService::initialize_entity( } bool MonitorService::push_entity_update( - const fastrtps::rtps::EntityId_t& entity_id, + const fastdds::rtps::EntityId_t& entity_id, const uint32_t& status_id) { bool ret = false; @@ -247,7 +247,7 @@ bool MonitorService::push_entity_update( } bool MonitorService::write_status( - const fastrtps::rtps::EntityId_t& entity_id, + const fastdds::rtps::EntityId_t& entity_id, const std::bitset& changed_statuses, const bool& entity_disposed) { @@ -377,7 +377,7 @@ bool MonitorService::add_change( CacheChange_t* change = status_writer_->new_change( type_.getSerializedSizeProvider(&status_data), - (disposed ? fastrtps::rtps::NOT_ALIVE_DISPOSED_UNREGISTERED : fastrtps::rtps::ALIVE), + (disposed ? fastdds::rtps::NOT_ALIVE_DISPOSED_UNREGISTERED : fastdds::rtps::ALIVE), handle); if (nullptr != change) @@ -420,7 +420,7 @@ bool MonitorService::create_endpoint() RTPSWriter* tmp_writer = nullptr; WriterAttributes watts; - watts.endpoint.endpointKind = fastrtps::rtps::WRITER; + watts.endpoint.endpointKind = fastdds::rtps::WRITER; watts.endpoint.durabilityKind = TRANSIENT_LOCAL; watts.endpoint.reliabilityKind = RELIABLE; watts.endpoint.topicKind = WITH_KEY; diff --git a/src/cpp/statistics/rtps/monitor-service/MonitorService.hpp b/src/cpp/statistics/rtps/monitor-service/MonitorService.hpp index 2552866ae58..d931c2fb35c 100644 --- a/src/cpp/statistics/rtps/monitor-service/MonitorService.hpp +++ b/src/cpp/statistics/rtps/monitor-service/MonitorService.hpp @@ -58,7 +58,7 @@ class SimpleQueryable : public IStatusQueryable } inline bool get_monitoring_status( - const fastrtps::rtps::GUID_t&, + const fastdds::rtps::GUID_t&, MonitorServiceData&) override { return true; @@ -72,27 +72,27 @@ class MonitorService public: - using endpoint_creator_t = std::function&, - fastrtps::rtps::WriterHistory*, - fastrtps::rtps::WriterListener*, - const fastrtps::rtps::EntityId_t&, + using endpoint_creator_t = std::function&, + fastdds::rtps::WriterHistory*, + fastdds::rtps::WriterListener*, + const fastdds::rtps::EntityId_t&, bool)>; using endpoint_registrator_t = std::function; MonitorService( - const fastrtps::rtps::GUID_t& guid, + const fastdds::rtps::GUID_t& guid, IProxyQueryable* proxy_q, IConnectionsQueryable* conns_q, IStatusQueryable& status_q, endpoint_creator_t endpoint_creator, endpoint_registrator_t endpoint_registrator, - fastrtps::rtps::ResourceEvent& event_service); + fastdds::rtps::ResourceEvent& event_service); ~MonitorService(); @@ -142,7 +142,7 @@ class MonitorService * @return True if the operation succeeds. */ bool remove_local_entity( - const fastrtps::rtps::EntityId_t& entity_id); + const fastdds::rtps::EntityId_t& entity_id); /** * @brief Adds a new entity status update to the queue @@ -157,7 +157,7 @@ class MonitorService * @return True if the operation succeeds. */ bool push_entity_update( - const fastrtps::rtps::EntityId_t& entity_id, + const fastdds::rtps::EntityId_t& entity_id, const uint32_t& status_id); private: @@ -169,7 +169,7 @@ class MonitorService * @return True if the operation succeeds. */ bool write_status( - const fastrtps::rtps::EntityId_t& entity_id, + const fastdds::rtps::EntityId_t& entity_id, const std::bitset& changed_statuses, const bool& entity_disposed); @@ -207,7 +207,7 @@ class MonitorService * @return true if the entity was correctly initialized */ bool initialize_entity( - const fastrtps::rtps::EntityId_t& entity_id); + const fastdds::rtps::EntityId_t& entity_id); /** * @brief Frees the Payload Pool @@ -221,7 +221,7 @@ class MonitorService std::atomic timer_active_; - const fastrtps::rtps::GUID_t local_participant_guid_; + const fastdds::rtps::GUID_t local_participant_guid_; IProxyQueryable* proxy_queryable_; @@ -234,23 +234,23 @@ class MonitorService //! status id that needs to be updated, alongside //! with a bool that prevents the entity_id from being //! inserted twice. - std::map, bool>> local_entities_; - std::unique_ptr event_; + std::unique_ptr event_; - std::vector changed_entities_; + std::vector changed_entities_; std::mutex mtx_; MonitorServiceListener* listener_; - fastrtps::rtps::StatefulWriter* status_writer_; + fastdds::rtps::StatefulWriter* status_writer_; - std::unique_ptr status_writer_history_; + std::unique_ptr status_writer_history_; - std::shared_ptr status_writer_payload_pool_; + std::shared_ptr status_writer_payload_pool_; endpoint_creator_t endpoint_creator_; diff --git a/src/cpp/statistics/rtps/monitor-service/MonitorServiceListener.cpp b/src/cpp/statistics/rtps/monitor-service/MonitorServiceListener.cpp index 7b5ebb54453..c6c03893363 100644 --- a/src/cpp/statistics/rtps/monitor-service/MonitorServiceListener.cpp +++ b/src/cpp/statistics/rtps/monitor-service/MonitorServiceListener.cpp @@ -33,14 +33,14 @@ MonitorServiceListener::MonitorServiceListener( } bool MonitorServiceListener::on_local_entity_status_change( - const fastrtps::rtps::GUID_t& guid, + const fastdds::rtps::GUID_t& guid, const uint32_t& id) const { return monitor_srv_->push_entity_update(guid.entityId, id); } bool MonitorServiceListener::on_local_entity_change( - const fastrtps::rtps::GUID_t& guid, + const fastdds::rtps::GUID_t& guid, bool is_alive) const { bool ret = false; @@ -58,28 +58,28 @@ bool MonitorServiceListener::on_local_entity_change( } bool MonitorServiceListener::on_local_entity_connections_change( - const fastrtps::rtps::GUID_t& guid) const + const fastdds::rtps::GUID_t& guid) const { return monitor_srv_->push_entity_update(guid.entityId, StatusKind::CONNECTION_LIST); } void MonitorServiceListener::onWriterMatched( - fastrtps::rtps::RTPSWriter*, - fastrtps::rtps::MatchingInfo& info) + fastdds::rtps::RTPSWriter*, + fastdds::rtps::MatchingInfo& info) { - if (info.status == eprosima::fastrtps::rtps::MATCHED_MATCHING) + if (info.status == eprosima::fastdds::rtps::MATCHED_MATCHING) { EPROSIMA_LOG_INFO(MONITOR_SERVICE, "Status writer matched with " << info.remoteEndpointGuid); } - else if (info.status == eprosima::fastrtps::rtps::REMOVED_MATCHING) + else if (info.status == eprosima::fastdds::rtps::REMOVED_MATCHING) { EPROSIMA_LOG_INFO(MONITOR_SERVICE, "Status writer unmatched with " << info.remoteEndpointGuid); } } void MonitorServiceListener::onWriterChangeReceivedByAll( - fastrtps::rtps::RTPSWriter* writer, - fastrtps::rtps::CacheChange_t* change) + fastdds::rtps::RTPSWriter* writer, + fastdds::rtps::CacheChange_t* change) { //! Do nothing for the moment, no relevant info static_cast(writer); diff --git a/src/cpp/statistics/rtps/monitor-service/MonitorServiceListener.hpp b/src/cpp/statistics/rtps/monitor-service/MonitorServiceListener.hpp index 4b1a85b4b76..a492412bbb0 100644 --- a/src/cpp/statistics/rtps/monitor-service/MonitorServiceListener.hpp +++ b/src/cpp/statistics/rtps/monitor-service/MonitorServiceListener.hpp @@ -34,7 +34,7 @@ class MonitorService; #ifdef FASTDDS_STATISTICS class MonitorServiceListener : - public fastrtps::rtps::WriterListener, + public fastdds::rtps::WriterListener, public IStatusObserver, public IConnectionsObserver, public IProxyObserver @@ -46,23 +46,23 @@ class MonitorServiceListener : MonitorService* ms); bool on_local_entity_status_change( - const fastrtps::rtps::GUID_t& guid, + const fastdds::rtps::GUID_t& guid, const uint32_t& id) const override; bool on_local_entity_change( - const fastrtps::rtps::GUID_t& guid, + const fastdds::rtps::GUID_t& guid, bool is_alive) const override; bool on_local_entity_connections_change( - const fastrtps::rtps::GUID_t& guid) const override; + const fastdds::rtps::GUID_t& guid) const override; void onWriterMatched( - fastrtps::rtps::RTPSWriter* writer, - fastrtps::rtps::MatchingInfo& info) override; + fastdds::rtps::RTPSWriter* writer, + fastdds::rtps::MatchingInfo& info) override; void onWriterChangeReceivedByAll( - fastrtps::rtps::RTPSWriter* writer, - fastrtps::rtps::CacheChange_t* change) override; + fastdds::rtps::RTPSWriter* writer, + fastdds::rtps::CacheChange_t* change) override; protected: @@ -70,7 +70,7 @@ class MonitorServiceListener : private: - using fastrtps::rtps::WriterListener::onWriterMatched; + using fastdds::rtps::WriterListener::onWriterMatched; }; diff --git a/src/cpp/statistics/rtps/monitor-service/interfaces/IConnectionsObserver.hpp b/src/cpp/statistics/rtps/monitor-service/interfaces/IConnectionsObserver.hpp index bc64267fa5a..87a967ba5ee 100644 --- a/src/cpp/statistics/rtps/monitor-service/interfaces/IConnectionsObserver.hpp +++ b/src/cpp/statistics/rtps/monitor-service/interfaces/IConnectionsObserver.hpp @@ -40,7 +40,7 @@ struct IConnectionsObserver * @return Whether the implementor has been properly notified */ virtual bool on_local_entity_connections_change( - const fastrtps::rtps::GUID_t& guid) const = 0; + const fastdds::rtps::GUID_t& guid) const = 0; }; } // rtps diff --git a/src/cpp/statistics/rtps/monitor-service/interfaces/IConnectionsQueryable.hpp b/src/cpp/statistics/rtps/monitor-service/interfaces/IConnectionsQueryable.hpp index 4f4682740ec..eac9b02cd6c 100644 --- a/src/cpp/statistics/rtps/monitor-service/interfaces/IConnectionsQueryable.hpp +++ b/src/cpp/statistics/rtps/monitor-service/interfaces/IConnectionsQueryable.hpp @@ -42,7 +42,7 @@ struct IConnectionsQueryable * @return Whether the list of connnections could be retrieved */ virtual bool get_entity_connections( - const fastrtps::rtps::GUID_t& guid, + const fastdds::rtps::GUID_t& guid, ConnectionList& conns_list) = 0; }; diff --git a/src/cpp/statistics/rtps/monitor-service/interfaces/IProxyObserver.hpp b/src/cpp/statistics/rtps/monitor-service/interfaces/IProxyObserver.hpp index dcb0e48d6c6..41a9ea88998 100644 --- a/src/cpp/statistics/rtps/monitor-service/interfaces/IProxyObserver.hpp +++ b/src/cpp/statistics/rtps/monitor-service/interfaces/IProxyObserver.hpp @@ -39,7 +39,7 @@ struct IProxyObserver * @return Whether the implementor has been properly notified */ virtual bool on_local_entity_change( - const fastrtps::rtps::GUID_t& guid, + const fastdds::rtps::GUID_t& guid, bool is_alive) const = 0; }; diff --git a/src/cpp/statistics/rtps/monitor-service/interfaces/IProxyQueryable.hpp b/src/cpp/statistics/rtps/monitor-service/interfaces/IProxyQueryable.hpp index 95103ed85b4..a993cc4cf13 100644 --- a/src/cpp/statistics/rtps/monitor-service/interfaces/IProxyQueryable.hpp +++ b/src/cpp/statistics/rtps/monitor-service/interfaces/IProxyQueryable.hpp @@ -30,8 +30,6 @@ namespace fastdds { namespace statistics { namespace rtps { -using namespace eprosima::fastdds::statistics; - struct IProxyQueryable { /** @@ -44,8 +42,8 @@ struct IProxyQueryable * @return Whether the operation succeeds or not */ virtual bool get_serialized_proxy( - const fastrtps::rtps::GUID_t& guid, - fastrtps::rtps::CDRMessage_t* msg) = 0; + const fastdds::rtps::GUID_t& guid, + fastdds::rtps::CDRMessage_t* msg) = 0; /** * @brief Interface for retrieving all the guids of the @@ -55,7 +53,7 @@ struct IProxyQueryable * @param[out] guids The collections of GUID_t of the local entities */ virtual bool get_all_local_proxies( - std::vector& guids) = 0; + std::vector& guids) = 0; }; } // rtps diff --git a/src/cpp/statistics/rtps/monitor-service/interfaces/IStatusObserver.hpp b/src/cpp/statistics/rtps/monitor-service/interfaces/IStatusObserver.hpp index 31157bffc69..66229cbcb00 100644 --- a/src/cpp/statistics/rtps/monitor-service/interfaces/IStatusObserver.hpp +++ b/src/cpp/statistics/rtps/monitor-service/interfaces/IStatusObserver.hpp @@ -38,7 +38,7 @@ struct IStatusObserver * @return Whether the implementor has been properly notified */ virtual bool on_local_entity_status_change( - const fastrtps::rtps::GUID_t& guid, + const fastdds::rtps::GUID_t& guid, const uint32_t& id) const = 0; }; diff --git a/src/cpp/statistics/rtps/monitor-service/interfaces/IStatusQueryable.hpp b/src/cpp/statistics/rtps/monitor-service/interfaces/IStatusQueryable.hpp index 5b50d4e0ca8..0cad2024afb 100644 --- a/src/cpp/statistics/rtps/monitor-service/interfaces/IStatusQueryable.hpp +++ b/src/cpp/statistics/rtps/monitor-service/interfaces/IStatusQueryable.hpp @@ -45,7 +45,7 @@ struct IStatusQueryable * @return Whether the operation succeeded or not */ virtual bool get_monitoring_status( - const fastrtps::rtps::GUID_t& guid, + const fastdds::rtps::GUID_t& guid, MonitorServiceData& status) = 0; }; diff --git a/src/cpp/statistics/rtps/reader/StatisticsReaderImpl.cpp b/src/cpp/statistics/rtps/reader/StatisticsReaderImpl.cpp index c0e115cb838..3fabb699793 100644 --- a/src/cpp/statistics/rtps/reader/StatisticsReaderImpl.cpp +++ b/src/cpp/statistics/rtps/reader/StatisticsReaderImpl.cpp @@ -23,9 +23,9 @@ #include #include -using eprosima::fastrtps::RecursiveTimedMutex; -using eprosima::fastrtps::rtps::RTPSReader; -using eprosima::fastrtps::rtps::GUID_t; +using eprosima::fastdds::RecursiveTimedMutex; +using eprosima::fastdds::rtps::RTPSReader; +using eprosima::fastdds::rtps::GUID_t; namespace eprosima { namespace fastdds { @@ -66,8 +66,8 @@ const GUID_t& StatisticsReaderImpl::get_guid() const } void StatisticsReaderImpl::on_data_notify( - const fastrtps::rtps::GUID_t& writer_guid, - const fastrtps::rtps::Time_t& source_timestamp) + const fastdds::rtps::GUID_t& writer_guid, + const fastdds::rtps::Time_t& source_timestamp) { if (!are_statistics_writers_enabled(EventKind::HISTORY2HISTORY_LATENCY)) { @@ -75,8 +75,8 @@ void StatisticsReaderImpl::on_data_notify( } // Get current timestamp - fastrtps::rtps::Time_t current_time; - fastrtps::rtps::Time_t::now(current_time); + fastdds::rtps::Time_t current_time; + fastdds::rtps::Time_t::now(current_time); // Calc latency auto ns = (current_time - source_timestamp).to_ns(); @@ -161,7 +161,7 @@ void StatisticsReaderImpl::on_subscribe_throughput( time_point former_timepoint; auto& current_timepoint = get_members()->last_history_change_; { - lock_guard lock(get_statistics_mutex()); + lock_guard lock(get_statistics_mutex()); former_timepoint = current_timepoint; current_timepoint = steady_clock::now(); } diff --git a/src/cpp/statistics/rtps/writer/StatisticsWriterImpl.cpp b/src/cpp/statistics/rtps/writer/StatisticsWriterImpl.cpp index 38063150cd3..3947f537125 100644 --- a/src/cpp/statistics/rtps/writer/StatisticsWriterImpl.cpp +++ b/src/cpp/statistics/rtps/writer/StatisticsWriterImpl.cpp @@ -21,9 +21,9 @@ #include #include -using eprosima::fastrtps::RecursiveTimedMutex; -using eprosima::fastrtps::rtps::RTPSWriter; -using eprosima::fastrtps::rtps::GUID_t; +using eprosima::fastdds::RecursiveTimedMutex; +using eprosima::fastdds::rtps::RTPSWriter; +using eprosima::fastdds::rtps::GUID_t; namespace eprosima { namespace fastdds { @@ -54,7 +54,7 @@ RecursiveTimedMutex& StatisticsWriterImpl::get_statistics_mutex() const GUID_t& StatisticsWriterImpl::get_guid() const { - using eprosima::fastrtps::rtps::RTPSWriter; + using eprosima::fastdds::rtps::RTPSWriter; static_assert( std::is_base_of::value, @@ -64,7 +64,7 @@ const GUID_t& StatisticsWriterImpl::get_guid() const } void StatisticsWriterImpl::on_sample_datas( - const fastrtps::rtps::SampleIdentity& sample_identity, + const fastdds::rtps::SampleIdentity& sample_identity, size_t num_sent_submessages) { if (!are_statistics_writers_enabled(EventKind::SAMPLE_DATAS)) @@ -90,7 +90,7 @@ void StatisticsWriterImpl::on_sample_datas( void StatisticsWriterImpl::on_data_generated( size_t num_destinations) { - std::lock_guard lock(get_statistics_mutex()); + std::lock_guard lock(get_statistics_mutex()); auto members = get_members(); members->data_counter += static_cast(num_destinations); } @@ -106,7 +106,7 @@ void StatisticsWriterImpl::on_data_sent() notification.guid(to_statistics_type(get_guid())); { - std::lock_guard lock(get_statistics_mutex()); + std::lock_guard lock(get_statistics_mutex()); auto members = get_members(); notification.count(members->data_counter); } @@ -158,7 +158,7 @@ void StatisticsWriterImpl::on_gap() notification.guid(to_statistics_type(get_guid())); { - std::lock_guard lock(get_statistics_mutex()); + std::lock_guard lock(get_statistics_mutex()); notification.count(++get_members()->gap_counter); } @@ -191,7 +191,7 @@ void StatisticsWriterImpl::on_resent_data( notification.guid(to_statistics_type(get_guid())); { - std::lock_guard lock(get_statistics_mutex()); + std::lock_guard lock(get_statistics_mutex()); notification.count(get_members()->resent_counter += to_send); } @@ -223,7 +223,7 @@ void StatisticsWriterImpl::on_publish_throughput( time_point former_timepoint; auto& current_timepoint = get_members()->last_history_change_; { - lock_guard lock(get_statistics_mutex()); + lock_guard lock(get_statistics_mutex()); former_timepoint = current_timepoint; current_timepoint = steady_clock::now(); } diff --git a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.cxx b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.cxx index 4dc788af245..ef76e3741b4 100644 --- a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.cxx +++ b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "monitorservice_typesCdrAux.hpp" #include "monitorservice_typesTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; namespace eprosima { diff --git a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.h b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.h index c6d5c8faa2d..56d242c7b0d 100644 --- a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.h +++ b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.h @@ -61,18 +61,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -87,7 +87,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -152,18 +152,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -178,7 +178,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -243,18 +243,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -269,7 +269,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -335,18 +335,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -361,7 +361,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -426,18 +426,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -452,7 +452,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -517,18 +517,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -543,7 +543,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -625,18 +625,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -651,7 +651,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/src/cpp/statistics/types/typesPubSubTypes.cxx b/src/cpp/statistics/types/typesPubSubTypes.cxx index fb048b99c9b..0bbd09f19f6 100644 --- a/src/cpp/statistics/types/typesPubSubTypes.cxx +++ b/src/cpp/statistics/types/typesPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "typesCdrAux.hpp" #include "typesTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; namespace eprosima { diff --git a/src/cpp/statistics/types/typesPubSubTypes.h b/src/cpp/statistics/types/typesPubSubTypes.h index 653945fdddb..a11fbd43131 100644 --- a/src/cpp/statistics/types/typesPubSubTypes.h +++ b/src/cpp/statistics/types/typesPubSubTypes.h @@ -62,18 +62,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -88,7 +88,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -153,18 +153,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -179,7 +179,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -244,18 +244,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -270,7 +270,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -335,18 +335,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -361,7 +361,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -426,18 +426,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -452,7 +452,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -517,18 +517,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -543,7 +543,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -609,18 +609,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -635,7 +635,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -700,18 +700,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -726,7 +726,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -791,18 +791,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -817,7 +817,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -882,18 +882,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -908,7 +908,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -973,18 +973,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -999,7 +999,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1064,18 +1064,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1090,7 +1090,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1155,18 +1155,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1181,7 +1181,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1246,18 +1246,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1272,7 +1272,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/src/cpp/utils/Host.hpp b/src/cpp/utils/Host.hpp index 427e0ea14af..12cf19c13f1 100644 --- a/src/cpp/utils/Host.hpp +++ b/src/cpp/utils/Host.hpp @@ -98,12 +98,12 @@ class Host { // Compute the host id fastdds::rtps::LocatorList loc; - fastrtps::rtps::IPFinder::getIP4Address(&loc); + fastdds::rtps::IPFinder::getIP4Address(&loc); id_ = compute_id(loc); // Compute the MAC id - std::vector macs; - if (fastrtps::rtps::IPFinder::getAllMACAddress(&macs) && + std::vector macs; + if (fastdds::rtps::IPFinder::getAllMACAddress(&macs) && macs.size() > 0) { MD5 md5; diff --git a/src/cpp/utils/IPFinder.cpp b/src/cpp/utils/IPFinder.cpp index b2b345a86bb..ac0df526e8c 100644 --- a/src/cpp/utils/IPFinder.cpp +++ b/src/cpp/utils/IPFinder.cpp @@ -70,7 +70,9 @@ #include #include -using namespace eprosima::fastrtps::rtps; +namespace eprosima { +namespace fastdds { +namespace rtps { IPFinder::IPFinder() { @@ -651,3 +653,7 @@ std::string IPFinder::getIPv6Address( freeaddrinfo(result); return ""; } + +} // namespace rtps +} // namespace fastdds +} // namespace eprosima diff --git a/src/cpp/utils/IPLocator.cpp b/src/cpp/utils/IPLocator.cpp index 3127bd5d4db..9bccf278707 100644 --- a/src/cpp/utils/IPLocator.cpp +++ b/src/cpp/utils/IPLocator.cpp @@ -26,7 +26,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { static const std::regex IPv4_REGEX("^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}" @@ -1143,5 +1143,5 @@ bool IPLocator::isIPv6( } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/utils/SystemInfo.cpp b/src/cpp/utils/SystemInfo.cpp index a825f43633f..8c9c26ce0fd 100644 --- a/src/cpp/utils/SystemInfo.cpp +++ b/src/cpp/utils/SystemInfo.cpp @@ -42,7 +42,7 @@ namespace eprosima { -using IPFinder = fastrtps::rtps::IPFinder; +using IPFinder = fastdds::rtps::IPFinder; SystemInfo::SystemInfo() { diff --git a/src/cpp/utils/SystemInfo.hpp b/src/cpp/utils/SystemInfo.hpp index 99974006b86..97cbfc4fd2d 100644 --- a/src/cpp/utils/SystemInfo.hpp +++ b/src/cpp/utils/SystemInfo.hpp @@ -253,7 +253,7 @@ class SystemInfo * @return true if successful, false otherwise */ static bool get_ips( - std::vector& vec_name, + std::vector& vec_name, bool return_loopback, bool force_lookup); @@ -264,7 +264,7 @@ class SystemInfo static std::string environment_file_; static bool cached_interfaces_; - static std::vector interfaces_; + static std::vector interfaces_; static std::mutex interfaces_mtx_; }; diff --git a/src/cpp/utils/TimeConversion.hpp b/src/cpp/utils/TimeConversion.hpp index 845649305c0..d2c2e08f810 100644 --- a/src/cpp/utils/TimeConversion.hpp +++ b/src/cpp/utils/TimeConversion.hpp @@ -27,11 +27,8 @@ namespace eprosima { namespace fastdds { namespace rtps { - namespace TimeConv { -using namespace eprosima::fastrtps::rtps; - /** * Convert Time_t to seconds as a double */ @@ -54,7 +51,7 @@ inline int64_t Time_t2MicroSecondsInt64( * Convert Duration_t to seconds as an int64 */ inline int64_t Duration_t2MicroSecondsInt64( - const fastrtps::Duration_t& t) + const fastdds::Duration_t& t) { return (int64_t)(t.nanosec / 1000.0) + t.seconds * (int64_t)pow(10.0, 6); } @@ -90,7 +87,7 @@ inline double Time_t2MilliSecondsDouble( * Convert Duration_t to milliseconds as a double */ inline double Duration_t2MilliSecondsDouble( - const fastrtps::Duration_t& t) + const fastdds::Duration_t& t) { return ((double)t.nanosec / 1000000.0) + (double)t.seconds * pow(10.0, 3); } diff --git a/src/cpp/utils/collections/FixedSizeQueue.hpp b/src/cpp/utils/collections/FixedSizeQueue.hpp index 295a2f75774..ab4cc3519c4 100644 --- a/src/cpp/utils/collections/FixedSizeQueue.hpp +++ b/src/cpp/utils/collections/FixedSizeQueue.hpp @@ -25,7 +25,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { /** * A queue with a preallocated fixed size. @@ -684,7 +684,7 @@ class FixedSizeQueue }; -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif /* FASTDDS_UTILS_COLLECTIONS_FIXEDSIZEQUEUE_HPP_ */ diff --git a/src/cpp/utils/collections/concurrent_queue.h b/src/cpp/utils/collections/concurrent_queue.h index 43394070825..92ca92f575b 100644 --- a/src/cpp/utils/collections/concurrent_queue.h +++ b/src/cpp/utils/collections/concurrent_queue.h @@ -21,7 +21,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { /** * @brief ConcurrentQueue. A thread-safe shared queue. @@ -151,7 +151,7 @@ class ConcurrentQueue final Queue queue_; }; -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _FASTDDS_UTILS_CONCURRENT_QUEUE_H_ diff --git a/src/cpp/utils/collections/unordered_vector.hpp b/src/cpp/utils/collections/unordered_vector.hpp index df08c54a83f..9fd3bdd5e07 100644 --- a/src/cpp/utils/collections/unordered_vector.hpp +++ b/src/cpp/utils/collections/unordered_vector.hpp @@ -28,8 +28,8 @@ namespace collections { template < typename _Ty, typename _Alloc = std::allocator<_Ty>> -using unordered_vector = eprosima::fastrtps::ResourceLimitedVector< - _Ty, std::false_type, eprosima::fastrtps::ResourceLimitedContainerConfig, _Alloc>; +using unordered_vector = eprosima::fastdds::ResourceLimitedVector< + _Ty, std::false_type, eprosima::fastdds::ResourceLimitedContainerConfig, _Alloc>; } // namespace collections } // namespace utilities diff --git a/src/cpp/xmlparser/XMLDynamicParser.cpp b/src/cpp/xmlparser/XMLDynamicParser.cpp index 9363692bc52..a520a6d8b39 100644 --- a/src/cpp/xmlparser/XMLDynamicParser.cpp +++ b/src/cpp/xmlparser/XMLDynamicParser.cpp @@ -41,9 +41,9 @@ #include "../fastdds/xtypes/dynamic_types/TypeDescriptorImpl.hpp" using namespace eprosima::fastdds::dds; -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; -using namespace eprosima::fastrtps::xmlparser; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; +using namespace eprosima::fastdds::xmlparser; //{{{ Auxiliary constexpr function to get the length of a const char* in C++11. constexpr size_t constexpr_strlen_rec( diff --git a/src/cpp/xmlparser/XMLElementParser.cpp b/src/cpp/xmlparser/XMLElementParser.cpp index dc6b16624f5..969206d8345 100644 --- a/src/cpp/xmlparser/XMLElementParser.cpp +++ b/src/cpp/xmlparser/XMLElementParser.cpp @@ -133,12 +133,11 @@ std::string get_element_text( namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace xmlparser { -using namespace eprosima::fastdds::rtps; using namespace eprosima::fastdds::xml::detail; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; static XMLP_ret parseXMLOctetVector( tinyxml2::XMLElement* elem, @@ -3923,7 +3922,7 @@ XMLP_ret XMLParser::getXMLEnum( XMLP_ret XMLParser::getXMLEnum( tinyxml2::XMLElement* elem, - DiscoveryProtocol_t* e, + DiscoveryProtocol* e, uint8_t /*ident*/) { /* @@ -3954,12 +3953,12 @@ XMLP_ret XMLParser::getXMLEnum( } if (!get_element_enum_value(text.c_str(), *e, - NONE, DiscoveryProtocol_t::NONE, - SIMPLE, DiscoveryProtocol_t::SIMPLE, - CLIENT, DiscoveryProtocol_t::CLIENT, - SERVER, DiscoveryProtocol_t::SERVER, - BACKUP, DiscoveryProtocol_t::BACKUP, - SUPER_CLIENT, DiscoveryProtocol_t::SUPER_CLIENT)) + NONE, DiscoveryProtocol::NONE, + SIMPLE, DiscoveryProtocol::SIMPLE, + CLIENT, DiscoveryProtocol::CLIENT, + SERVER, DiscoveryProtocol::SERVER, + BACKUP, DiscoveryProtocol::BACKUP, + SUPER_CLIENT, DiscoveryProtocol::SUPER_CLIENT)) { EPROSIMA_LOG_ERROR(XMLPARSER, "Node '" << RTPS_PDP_TYPE << "' with bad content"); return XMLP_ret::XML_ERROR; @@ -3970,7 +3969,7 @@ XMLP_ret XMLParser::getXMLEnum( XMLP_ret XMLParser::getXMLEnum( tinyxml2::XMLElement* elem, - ParticipantFilteringFlags_t* e, + ParticipantFilteringFlags* e, uint8_t /*ident*/) { /* @@ -4014,19 +4013,19 @@ XMLP_ret XMLParser::getXMLEnum( if (flag == FILTER_DIFFERENT_HOST ) { - newflags |= ParticipantFilteringFlags_t::FILTER_DIFFERENT_HOST; + newflags |= ParticipantFilteringFlags::FILTER_DIFFERENT_HOST; } else if (flag == FILTER_DIFFERENT_PROCESS ) { - newflags |= ParticipantFilteringFlags_t::FILTER_DIFFERENT_PROCESS; + newflags |= ParticipantFilteringFlags::FILTER_DIFFERENT_PROCESS; } else if (flag == FILTER_SAME_PROCESS ) { - newflags |= ParticipantFilteringFlags_t::FILTER_SAME_PROCESS; + newflags |= ParticipantFilteringFlags::FILTER_SAME_PROCESS; } } - *e = static_cast(newflags); + *e = static_cast(newflags); return XMLP_ret::XML_OK; } @@ -4953,5 +4952,5 @@ XMLP_ret XMLParser::getXMLBuiltinTransports( } } // namespace xmlparser -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/xmlparser/XMLEndpointParser.cpp b/src/cpp/xmlparser/XMLEndpointParser.cpp index 645402d2802..8cb5f393345 100644 --- a/src/cpp/xmlparser/XMLEndpointParser.cpp +++ b/src/cpp/xmlparser/XMLEndpointParser.cpp @@ -33,10 +33,10 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace xmlparser { -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; using namespace eprosima::fastdds::xml::detail; XMLEndpointParser::XMLEndpointParser() @@ -835,5 +835,5 @@ XMLP_ret XMLEndpointParser::lookforWriter( } } // namespace xmlparser -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/xmlparser/XMLEndpointParser.h b/src/cpp/xmlparser/XMLEndpointParser.h index adaa26ce67b..90c7e66d0d4 100644 --- a/src/cpp/xmlparser/XMLEndpointParser.h +++ b/src/cpp/xmlparser/XMLEndpointParser.h @@ -42,7 +42,7 @@ class XMLDocument; namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class ReaderProxyData; class WriterProxyData; diff --git a/src/cpp/xmlparser/XMLParser.cpp b/src/cpp/xmlparser/XMLParser.cpp index dec3a3b921d..7b20e390580 100644 --- a/src/cpp/xmlparser/XMLParser.cpp +++ b/src/cpp/xmlparser/XMLParser.cpp @@ -46,7 +46,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace xmlparser { using namespace eprosima::fastdds::xml::detail; @@ -2832,5 +2832,5 @@ XMLP_ret XMLParser::fillDataNode( } } // namespace xmlparser -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/src/cpp/xmlparser/XMLParser.h b/src/cpp/xmlparser/XMLParser.h index 173201392ac..07c6f426fc7 100644 --- a/src/cpp/xmlparser/XMLParser.h +++ b/src/cpp/xmlparser/XMLParser.h @@ -44,7 +44,7 @@ class XMLDocument; } // namespace tinyxml2 namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace xmlparser { class BaseNode; @@ -620,7 +620,7 @@ class XMLParser static XMLP_ret getXMLEnum( tinyxml2::XMLElement* elem, - rtps::DiscoveryProtocol_t* e, + rtps::DiscoveryProtocol* e, uint8_t ident); static XMLP_ret getXMLList( @@ -630,7 +630,7 @@ class XMLParser static XMLP_ret getXMLEnum( tinyxml2::XMLElement* elem, - rtps::ParticipantFilteringFlags_t* e, + rtps::ParticipantFilteringFlags* e, uint8_t ident); static XMLP_ret getXMLRemoteServer( @@ -702,7 +702,7 @@ class XMLParser }; } // namespace xmlparser -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // ifndef XML_PARSER_H_ diff --git a/src/cpp/xmlparser/XMLParserCommon.cpp b/src/cpp/xmlparser/XMLParserCommon.cpp index 107da2f9067..a37c716f61a 100644 --- a/src/cpp/xmlparser/XMLParserCommon.cpp +++ b/src/cpp/xmlparser/XMLParserCommon.cpp @@ -15,7 +15,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace xmlparser { const char* DEFAULT_FASTDDS_ENV_VARIABLE = "FASTDDS_DEFAULT_PROFILES_FILE"; diff --git a/src/cpp/xmlparser/XMLParserCommon.h b/src/cpp/xmlparser/XMLParserCommon.h index d3e31030f95..296b15b4cb2 100644 --- a/src/cpp/xmlparser/XMLParserCommon.h +++ b/src/cpp/xmlparser/XMLParserCommon.h @@ -16,7 +16,7 @@ #define XML_PARSER_COMMON_H_ namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace xmlparser { /** diff --git a/src/cpp/xmlparser/XMLProfileManager.cpp b/src/cpp/xmlparser/XMLProfileManager.cpp index 4e0e084b3cd..45d99f3c91f 100644 --- a/src/cpp/xmlparser/XMLProfileManager.cpp +++ b/src/cpp/xmlparser/XMLProfileManager.cpp @@ -28,7 +28,6 @@ #include -using namespace eprosima::fastrtps; using namespace eprosima::fastdds; using namespace ::xmlparser; diff --git a/src/cpp/xmlparser/XMLProfileManager.h b/src/cpp/xmlparser/XMLProfileManager.h index 9f133b8f356..bd7196a8df8 100644 --- a/src/cpp/xmlparser/XMLProfileManager.h +++ b/src/cpp/xmlparser/XMLProfileManager.h @@ -31,7 +31,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace xmlparser { using participant_factory_map_t = std::map; diff --git a/src/cpp/xmlparser/XMLTree.h b/src/cpp/xmlparser/XMLTree.h index 2c69442f739..334d8b2cea1 100644 --- a/src/cpp/xmlparser/XMLTree.h +++ b/src/cpp/xmlparser/XMLTree.h @@ -7,7 +7,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace xmlparser { enum class NodeType @@ -215,6 +215,6 @@ const std::map& DataNode::getAttributes() } } // namespace xmlparser -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // !_XML_TREE_ diff --git a/src/cpp/xmlparser/attributes/ParticipantAttributes.hpp b/src/cpp/xmlparser/attributes/ParticipantAttributes.hpp index 4d46726d05c..2274a9ad0c6 100644 --- a/src/cpp/xmlparser/attributes/ParticipantAttributes.hpp +++ b/src/cpp/xmlparser/attributes/ParticipantAttributes.hpp @@ -29,7 +29,7 @@ namespace fastdds { * Class ParticipantAttributes, used by the user to define the attributes of a Participant. * The Participants in the Publisher-Subscriber layer are only a container to a RTPSParticipant, so their attributes are the same. * Still to maintain the equivalence this class is used to define them. - * @ingroup FASTRTPS_ATTRIBUTES_MODULE + * @ingroup FASTDDS_ATTRIBUTES_MODULE */ class ParticipantAttributes { @@ -39,7 +39,7 @@ class ParticipantAttributes uint32_t domainId = 0; //!Attributes of the associated RTPSParticipant. - fastrtps::rtps::RTPSParticipantAttributes rtps; + fastdds::rtps::RTPSParticipantAttributes rtps; ParticipantAttributes() { diff --git a/src/cpp/xmlparser/attributes/PublisherAttributes.hpp b/src/cpp/xmlparser/attributes/PublisherAttributes.hpp index 3c93b94cd6f..bbc4a51b517 100644 --- a/src/cpp/xmlparser/attributes/PublisherAttributes.hpp +++ b/src/cpp/xmlparser/attributes/PublisherAttributes.hpp @@ -34,7 +34,7 @@ namespace fastdds { /** * Class PublisherAttributes, used by the user to define the attributes of a Publisher. - * @ingroup FASTRTPS_ATTRIBUTES_MODULE + * @ingroup FASTDDS_ATTRIBUTES_MODULE */ class PublisherAttributes { @@ -60,22 +60,22 @@ class PublisherAttributes } //! Topic Attributes for the Publisher - fastrtps::TopicAttributes topic; + fastdds::TopicAttributes topic; //! QOS for the Publisher dds::WriterQos qos; //! Writer Attributes - fastrtps::rtps::WriterTimes times; + rtps::WriterTimes times; //! Unicast locator list - fastrtps::rtps::LocatorList_t unicastLocatorList; + rtps::LocatorList_t unicastLocatorList; //! Multicast locator list - fastrtps::rtps::LocatorList_t multicastLocatorList; + rtps::LocatorList_t multicastLocatorList; //! Remote locator list - fastrtps::rtps::LocatorList_t remoteLocatorList; + rtps::LocatorList_t remoteLocatorList; //! The collection of external locators to use for communication. rtps::ExternalLocators external_unicast_locators; @@ -84,14 +84,14 @@ class PublisherAttributes bool ignore_non_matching_locators = false; //! Underlying History memory policy - fastrtps::rtps::MemoryManagementPolicy_t historyMemoryPolicy = - fastrtps::rtps::MemoryManagementPolicy_t::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; + rtps::MemoryManagementPolicy_t historyMemoryPolicy = + rtps::MemoryManagementPolicy_t::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; //! Properties - fastrtps::rtps::PropertyPolicy properties; + rtps::PropertyPolicy properties; //! Allocation limits on the matched subscribers collections - fastrtps::ResourceLimitedContainerConfig matched_subscriber_allocation; + fastdds::ResourceLimitedContainerConfig matched_subscriber_allocation; /** * Get the user defined ID diff --git a/src/cpp/xmlparser/attributes/SubscriberAttributes.hpp b/src/cpp/xmlparser/attributes/SubscriberAttributes.hpp index 5cd7702f16e..3416f7704a9 100644 --- a/src/cpp/xmlparser/attributes/SubscriberAttributes.hpp +++ b/src/cpp/xmlparser/attributes/SubscriberAttributes.hpp @@ -33,32 +33,32 @@ namespace fastdds { /** * Class SubscriberAttributes, used by the user to define the attributes of a Subscriber. - * @ingroup FASTRTPS_ATTRIBUTES_MODULE + * @ingroup FASTDDS_ATTRIBUTES_MODULE */ class SubscriberAttributes { public: //! Topic Attributes - fastrtps::TopicAttributes topic; + fastdds::TopicAttributes topic; //! Reader QOs. dds::ReaderQos qos; //! Times for a RELIABLE Reader - fastrtps::rtps::ReaderTimes times; + rtps::ReaderTimes times; //! Unicast locator list - fastrtps::rtps::LocatorList_t unicastLocatorList; + rtps::LocatorList_t unicastLocatorList; //! Multicast locator list - fastrtps::rtps::LocatorList_t multicastLocatorList; + rtps::LocatorList_t multicastLocatorList; //! Remote locator list - fastrtps::rtps::LocatorList_t remoteLocatorList; + rtps::LocatorList_t remoteLocatorList; //! The collection of external locators to use for communication. - fastdds::rtps::ExternalLocators external_unicast_locators; + rtps::ExternalLocators external_unicast_locators; //! Whether locators that don't match with the announced locators should be kept. bool ignore_non_matching_locators = false; @@ -67,14 +67,14 @@ class SubscriberAttributes bool expects_inline_qos = false; //! Underlying History memory policy - fastrtps::rtps::MemoryManagementPolicy_t historyMemoryPolicy = - fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; + rtps::MemoryManagementPolicy_t historyMemoryPolicy = + rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; //! Properties - fastrtps::rtps::PropertyPolicy properties; + rtps::PropertyPolicy properties; //! Matched publishers allocation limits - fastrtps::ResourceLimitedContainerConfig matched_publisher_allocation; + fastdds::ResourceLimitedContainerConfig matched_publisher_allocation; SubscriberAttributes() = default; diff --git a/test/blackbox/api/dds-pim/CustomPayloadPool.hpp b/test/blackbox/api/dds-pim/CustomPayloadPool.hpp index 6f191e7adac..acd57808de8 100644 --- a/test/blackbox/api/dds-pim/CustomPayloadPool.hpp +++ b/test/blackbox/api/dds-pim/CustomPayloadPool.hpp @@ -24,7 +24,7 @@ #include #include -class CustomPayloadPool : public eprosima::fastrtps::rtps::IPayloadPool +class CustomPayloadPool : public eprosima::fastdds::rtps::IPayloadPool { public: @@ -32,7 +32,7 @@ class CustomPayloadPool : public eprosima::fastrtps::rtps::IPayloadPool bool get_payload( unsigned int size, - eprosima::fastrtps::rtps::SerializedPayload_t& payload) + eprosima::fastdds::rtps::SerializedPayload_t& payload) { // Reserve new memory for the payload buffer unsigned char* payload_buff = new unsigned char[size]; @@ -51,8 +51,8 @@ class CustomPayloadPool : public eprosima::fastrtps::rtps::IPayloadPool } bool get_payload( - const eprosima::fastrtps::rtps::SerializedPayload_t& data, - eprosima::fastrtps::rtps::SerializedPayload_t& payload) + const eprosima::fastdds::rtps::SerializedPayload_t& data, + eprosima::fastdds::rtps::SerializedPayload_t& payload) { // Reserve new memory for the payload buffer unsigned char* payload_buff = new unsigned char[data.length]; @@ -74,7 +74,7 @@ class CustomPayloadPool : public eprosima::fastrtps::rtps::IPayloadPool } bool release_payload( - eprosima::fastrtps::rtps::SerializedPayload_t& payload) + eprosima::fastdds::rtps::SerializedPayload_t& payload) { // Ensure precondition assert(this == payload.payload_owner); diff --git a/test/blackbox/api/dds-pim/PubSubParticipant.hpp b/test/blackbox/api/dds-pim/PubSubParticipant.hpp index d6989a8acaa..1b0eefe46aa 100644 --- a/test/blackbox/api/dds-pim/PubSubParticipant.hpp +++ b/test/blackbox/api/dds-pim/PubSubParticipant.hpp @@ -162,12 +162,12 @@ class PubSubParticipant void on_participant_discovery( eprosima::fastdds::dds::DomainParticipant*, - eprosima::fastrtps::rtps::ParticipantDiscoveryInfo&& info, + eprosima::fastdds::rtps::ParticipantDiscoveryInfo&& info, bool& should_be_ignored) { static_cast(should_be_ignored); bool expected = false; - if (info.status == eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT) + if (info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT) { ++participant_->matched_; if (nullptr != participant_->on_discovery_) @@ -178,14 +178,14 @@ class PubSubParticipant participant_->cv_discovery_.notify_one(); } else if (participant_->on_participant_qos_update_ != nullptr && - info.status == eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::CHANGED_QOS_PARTICIPANT) + info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::CHANGED_QOS_PARTICIPANT) { participant_->participant_qos_updated_.compare_exchange_strong(expected, participant_->on_participant_qos_update_(info)); participant_->cv_discovery_.notify_one(); } - else if (info.status == eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::REMOVED_PARTICIPANT || - info.status == eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::DROPPED_PARTICIPANT) + else if (info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::REMOVED_PARTICIPANT || + info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::DROPPED_PARTICIPANT) { --participant_->matched_; participant_->cv_discovery_.notify_one(); @@ -252,7 +252,7 @@ class PubSubParticipant datawriter_qos_.historyMemoryPolicy = rtps::DYNAMIC_RESERVE_MEMORY_MODE; #else datawriter_qos_.endpoint().history_memory_policy = - eprosima::fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; + eprosima::fastdds::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; #endif // if defined(PREALLOCATED_WITH_REALLOC_MEMORY_MODE_TEST) // By default, heartbeat period and nack response delay are 100 milliseconds. @@ -632,7 +632,7 @@ class PubSubParticipant } PubSubParticipant& property_policy( - const eprosima::fastrtps::rtps::PropertyPolicy property_policy) + const eprosima::fastdds::rtps::PropertyPolicy property_policy) { participant_qos_.properties() = property_policy; return *this; @@ -652,14 +652,14 @@ class PubSubParticipant } PubSubParticipant& user_data( - const std::vector& user_data) + const std::vector& user_data) { participant_qos_.user_data().data_vec(user_data); return *this; } bool update_user_data( - const std::vector& user_data) + const std::vector& user_data) { // Update QoS before updating user data as statistics properties might have changed internally participant_qos_ = participant_->get_qos(); @@ -688,14 +688,14 @@ class PubSubParticipant } PubSubParticipant& pub_property_policy( - const eprosima::fastrtps::rtps::PropertyPolicy property_policy) + const eprosima::fastdds::rtps::PropertyPolicy property_policy) { datawriter_qos_.properties() = property_policy; return *this; } PubSubParticipant& sub_property_policy( - const eprosima::fastrtps::rtps::PropertyPolicy property_policy) + const eprosima::fastdds::rtps::PropertyPolicy property_policy) { datareader_qos_.properties() = property_policy; return *this; @@ -873,29 +873,29 @@ class PubSubParticipant } void set_on_discovery_function( - std::function f) + std::function f) { on_discovery_ = f; } void set_on_participant_qos_update_function( - std::function f) + std::function f) { on_participant_qos_update_ = f; } PubSubParticipant& fill_server_qos( eprosima::fastdds::dds::WireProtocolConfigQos& qos, - eprosima::fastrtps::rtps::GuidPrefix_t& guid, - eprosima::fastrtps::rtps::Locator_t& locator_server, + eprosima::fastdds::rtps::GuidPrefix_t& guid, + eprosima::fastdds::rtps::Locator_t& locator_server, uint16_t port, uint32_t kind) { - qos.builtin.discovery_config.discoveryProtocol = eprosima::fastrtps::rtps::DiscoveryProtocol_t::SERVER; + qos.builtin.discovery_config.discoveryProtocol = eprosima::fastdds::rtps::DiscoveryProtocol::SERVER; qos.prefix = guid; // Generate server's listening locator - eprosima::fastrtps::rtps::IPLocator::setIPv4(locator_server, 127, 0, 0, 1); - eprosima::fastrtps::rtps::IPLocator::setPhysicalPort(locator_server, port); + eprosima::fastdds::rtps::IPLocator::setIPv4(locator_server, 127, 0, 0, 1); + eprosima::fastdds::rtps::IPLocator::setPhysicalPort(locator_server, port); locator_server.kind = kind; // Leave logical port as 0 to use TCP DS default logical port qos.builtin.metatrafficUnicastLocatorList.push_back(locator_server); @@ -975,8 +975,8 @@ class PubSubParticipant std::mutex mutex_discovery_; std::condition_variable cv_discovery_; std::atomic matched_; - std::function on_discovery_; - std::function on_participant_qos_update_; + std::function on_discovery_; + std::function on_participant_qos_update_; std::atomic_bool discovery_result_; std::atomic_bool participant_qos_updated_; diff --git a/test/blackbox/api/dds-pim/PubSubReader.hpp b/test/blackbox/api/dds-pim/PubSubReader.hpp index 180a01174f3..5645510f38d 100644 --- a/test/blackbox/api/dds-pim/PubSubReader.hpp +++ b/test/blackbox/api/dds-pim/PubSubReader.hpp @@ -65,7 +65,7 @@ using eprosima::fastdds::dds::ReturnCode_t; using eprosima::fastdds::rtps::UDPTransportDescriptor; using eprosima::fastdds::rtps::UDPv4TransportDescriptor; using eprosima::fastdds::rtps::UDPv6TransportDescriptor; -using eprosima::fastrtps::rtps::IPLocator; +using eprosima::fastdds::rtps::IPLocator; using SampleLostStatusFunctor = std::function; using SampleRejectedStatusFunctor = std::function; @@ -96,7 +96,7 @@ class PubSubReader void on_participant_discovery( eprosima::fastdds::dds::DomainParticipant*, - eprosima::fastrtps::rtps::ParticipantDiscoveryInfo&& info, + eprosima::fastdds::rtps::ParticipantDiscoveryInfo&& info, bool& should_be_ignored) override { static_cast(should_be_ignored); @@ -107,13 +107,13 @@ class PubSubReader reader_.cvDiscovery_.notify_one(); } - if (info.status == eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT) + if (info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT) { reader_.participant_matched(); } - else if (info.status == eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::REMOVED_PARTICIPANT || - info.status == eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::DROPPED_PARTICIPANT) + else if (info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::REMOVED_PARTICIPANT || + info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::DROPPED_PARTICIPANT) { reader_.participant_unmatched(); } @@ -121,7 +121,7 @@ class PubSubReader void on_data_writer_discovery( eprosima::fastdds::dds::DomainParticipant*, - eprosima::fastrtps::rtps::WriterDiscoveryInfo&& info, + eprosima::fastdds::rtps::WriterDiscoveryInfo&& info, bool& /*should_be_ignored*/) override { if (reader_.onEndpointDiscovery_ != nullptr) @@ -135,13 +135,13 @@ class PubSubReader #if HAVE_SECURITY void onParticipantAuthentication( eprosima::fastdds::dds::DomainParticipant*, - eprosima::fastrtps::rtps::ParticipantAuthenticationInfo&& info) override + eprosima::fastdds::rtps::ParticipantAuthenticationInfo&& info) override { - if (info.status == eprosima::fastrtps::rtps::ParticipantAuthenticationInfo::AUTHORIZED_PARTICIPANT) + if (info.status == eprosima::fastdds::rtps::ParticipantAuthenticationInfo::AUTHORIZED_PARTICIPANT) { reader_.authorized(); } - else if (info.status == eprosima::fastrtps::rtps::ParticipantAuthenticationInfo::UNAUTHORIZED_PARTICIPANT) + else if (info.status == eprosima::fastdds::rtps::ParticipantAuthenticationInfo::UNAUTHORIZED_PARTICIPANT) { reader_.unauthorized(); } @@ -354,7 +354,7 @@ class PubSubReader // By default, memory mode is PREALLOCATED_WITH_REALLOC_MEMORY_MODE datareader_qos_.endpoint().history_memory_policy = - eprosima::fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; + eprosima::fastdds::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; // By default, heartbeat period delay is 100 milliseconds. datareader_qos_.reliable_reader_qos().times.heartbeat_response_delay.seconds = 0; @@ -545,7 +545,7 @@ class PubSubReader return total_msgs_; } - eprosima::fastrtps::rtps::SequenceNumber_t startReception( + eprosima::fastdds::rtps::SequenceNumber_t startReception( const std::list& msgs) { mutex_.lock(); @@ -611,7 +611,7 @@ class PubSubReader } void block_for_seq( - eprosima::fastrtps::rtps::SequenceNumber_t seq) + eprosima::fastdds::rtps::SequenceNumber_t seq) { block([this, seq]() -> bool { @@ -887,11 +887,11 @@ class PubSubReader return current_processed_count_; } - eprosima::fastrtps::rtps::SequenceNumber_t get_last_sequence_received() + eprosima::fastdds::rtps::SequenceNumber_t get_last_sequence_received() { if (last_seq.empty()) { - return eprosima::fastrtps::rtps::SequenceNumber_t(); + return eprosima::fastdds::rtps::SequenceNumber_t(); } using pair_type = typename decltype(last_seq)::value_type; @@ -943,21 +943,21 @@ class PubSubReader } PubSubReader& mem_policy( - const eprosima::fastrtps::rtps::MemoryManagementPolicy mem_policy) + const eprosima::fastdds::rtps::MemoryManagementPolicy mem_policy) { datareader_qos_.endpoint().history_memory_policy = mem_policy; return *this; } PubSubReader& deadline_period( - const eprosima::fastrtps::Duration_t deadline_period) + const eprosima::fastdds::Duration_t deadline_period) { datareader_qos_.deadline().period = deadline_period; return *this; } bool update_deadline_period( - const eprosima::fastrtps::Duration_t& deadline_period) + const eprosima::fastdds::Duration_t& deadline_period) { eprosima::fastdds::dds::DataReaderQos datareader_qos; datareader_->get_qos(datareader_qos); @@ -974,33 +974,33 @@ class PubSubReader } PubSubReader& liveliness_lease_duration( - const eprosima::fastrtps::Duration_t lease_duration) + const eprosima::fastdds::Duration_t lease_duration) { datareader_qos_.liveliness().lease_duration = lease_duration; return *this; } PubSubReader& latency_budget_duration( - const eprosima::fastrtps::Duration_t& latency_duration) + const eprosima::fastdds::Duration_t& latency_duration) { datareader_qos_.latency_budget().duration = latency_duration; return *this; } - eprosima::fastrtps::Duration_t get_latency_budget_duration() + eprosima::fastdds::Duration_t get_latency_budget_duration() { return datareader_qos_.latency_budget().duration; } PubSubReader& lifespan_period( - const eprosima::fastrtps::Duration_t lifespan_period) + const eprosima::fastdds::Duration_t lifespan_period) { datareader_qos_.lifespan().duration = lifespan_period; return *this; } PubSubReader& keep_duration( - const eprosima::fastrtps::Duration_t duration) + const eprosima::fastdds::Duration_t duration) { datareader_qos_.reliable_reader_qos().disable_positive_ACKs.enabled = true; datareader_qos_.reliable_reader_qos().disable_positive_ACKs.duration = duration; @@ -1078,29 +1078,29 @@ class PubSubReader } /* Locators */ - eprosima::fastrtps::rtps::Locator_t pdp_locator; - eprosima::fastrtps::rtps::Locator_t tcp_locator; + eprosima::fastdds::rtps::Locator_t pdp_locator; + eprosima::fastdds::rtps::Locator_t tcp_locator; if (v6) { // Define locator for PDP over multicast pdp_locator.kind = LOCATOR_KIND_UDPv6; - eprosima::fastrtps::rtps::IPLocator::setIPv6(pdp_locator, "ff1e::ffff:efff:1"); + eprosima::fastdds::rtps::IPLocator::setIPv6(pdp_locator, "ff1e::ffff:efff:1"); // Define locator for EDP and user data tcp_locator.kind = LOCATOR_KIND_TCPv6; - eprosima::fastrtps::rtps::IPLocator::setIPv6(tcp_locator, "::"); - eprosima::fastrtps::rtps::IPLocator::setPhysicalPort(tcp_locator, tcp_listening_port); - eprosima::fastrtps::rtps::IPLocator::setLogicalPort(tcp_locator, 0); + eprosima::fastdds::rtps::IPLocator::setIPv6(tcp_locator, "::"); + eprosima::fastdds::rtps::IPLocator::setPhysicalPort(tcp_locator, tcp_listening_port); + eprosima::fastdds::rtps::IPLocator::setLogicalPort(tcp_locator, 0); } else { // Define locator for PDP over multicast pdp_locator.kind = LOCATOR_KIND_UDPv4; - eprosima::fastrtps::rtps::IPLocator::setIPv4(pdp_locator, "239.255.0.1"); + eprosima::fastdds::rtps::IPLocator::setIPv4(pdp_locator, "239.255.0.1"); // Define locator for EDP and user data tcp_locator.kind = LOCATOR_KIND_TCPv4; - eprosima::fastrtps::rtps::IPLocator::setIPv4(tcp_locator, "0.0.0.0"); - eprosima::fastrtps::rtps::IPLocator::setPhysicalPort(tcp_locator, tcp_listening_port); - eprosima::fastrtps::rtps::IPLocator::setLogicalPort(tcp_locator, 0); + eprosima::fastdds::rtps::IPLocator::setIPv4(tcp_locator, "0.0.0.0"); + eprosima::fastdds::rtps::IPLocator::setPhysicalPort(tcp_locator, tcp_listening_port); + eprosima::fastdds::rtps::IPLocator::setLogicalPort(tcp_locator, 0); } participant_qos_.wire_protocol().builtin.metatrafficMulticastLocatorList.push_back(pdp_locator); @@ -1358,7 +1358,7 @@ class PubSubReader } PubSubReader& ignore_participant_flags( - eprosima::fastrtps::rtps::ParticipantFilteringFlags_t flags) + eprosima::fastdds::rtps::ParticipantFilteringFlags flags) { participant_qos_.wire_protocol().builtin.discovery_config.ignoreParticipantFlags = flags; return *this; @@ -1438,14 +1438,14 @@ class PubSubReader } PubSubReader& property_policy( - const eprosima::fastrtps::rtps::PropertyPolicy& property_policy) + const eprosima::fastdds::rtps::PropertyPolicy& property_policy) { participant_qos_.properties() = property_policy; return *this; } PubSubReader& entity_property_policy( - const eprosima::fastrtps::rtps::PropertyPolicy& property_policy) + const eprosima::fastdds::rtps::PropertyPolicy& property_policy) { datareader_qos_.properties() = property_policy; return *this; @@ -1459,7 +1459,7 @@ class PubSubReader } PubSubReader& userData( - std::vector user_data) + std::vector user_data) { participant_qos_.user_data() = user_data; return *this; @@ -1494,8 +1494,8 @@ class PubSubReader } PubSubReader& lease_duration( - eprosima::fastrtps::Duration_t lease_duration, - eprosima::fastrtps::Duration_t announce_period) + eprosima::fastdds::Duration_t lease_duration, + eprosima::fastdds::Duration_t announce_period) { participant_qos_.wire_protocol().builtin.discovery_config.leaseDuration = lease_duration; participant_qos_.wire_protocol().builtin.discovery_config.leaseDuration_announcementperiod = announce_period; @@ -1504,7 +1504,7 @@ class PubSubReader PubSubReader& initial_announcements( uint32_t count, - const eprosima::fastrtps::Duration_t& period) + const eprosima::fastdds::Duration_t& period) { participant_qos_.wire_protocol().builtin.discovery_config.initial_announcements.count = count; participant_qos_.wire_protocol().builtin.discovery_config.initial_announcements.period = period; @@ -1521,16 +1521,16 @@ class PubSubReader const std::string& /*xml*/) { /* TODO - std::unique_ptr root; - if (eprosima::fastrtps::xmlparser::XMLParser::loadXML(xml.data(), xml.size(), - root) == eprosima::fastrtps::xmlparser::XMLP_ret::XML_OK) + std::unique_ptr root; + if (eprosima::fastdds::xmlparser::XMLParser::loadXML(xml.data(), xml.size(), + root) == eprosima::fastdds::xmlparser::XMLP_ret::XML_OK) { for (const auto& profile : root->getChildren()) { - if (profile->getType() == eprosima::fastrtps::xmlparser::NodeType::PARTICIPANT) + if (profile->getType() == eprosima::fastdds::xmlparser::NodeType::PARTICIPANT) { participant_attr_ = - *(dynamic_cast + *(dynamic_cast *>( profile.get())->get()); } @@ -1544,16 +1544,16 @@ class PubSubReader const std::string& /*xml*/) { /* TODO - std::unique_ptr root; - if (eprosima::fastrtps::xmlparser::XMLParser::loadXML(xml.data(), xml.size(), - root) == eprosima::fastrtps::xmlparser::XMLP_ret::XML_OK) + std::unique_ptr root; + if (eprosima::fastdds::xmlparser::XMLParser::loadXML(xml.data(), xml.size(), + root) == eprosima::fastdds::xmlparser::XMLP_ret::XML_OK) { for (const auto& profile : root->getChildren()) { - if (profile->getType() == eprosima::fastrtps::xmlparser::NodeType::SUBSCRIBER) + if (profile->getType() == eprosima::fastdds::xmlparser::NodeType::SUBSCRIBER) { subscriber_attr_ = - *(dynamic_cast + *(dynamic_cast *>( profile.get())->get()); } @@ -1582,7 +1582,7 @@ class PubSubReader } PubSubReader& guid_prefix( - const eprosima::fastrtps::rtps::GuidPrefix_t& prefix) + const eprosima::fastdds::rtps::GuidPrefix_t& prefix) { participant_qos_.wire_protocol().prefix = prefix; return *this; @@ -1684,13 +1684,13 @@ class PubSubReader } void setOnDiscoveryFunction( - std::function f) + std::function f) { onDiscovery_ = f; } void setOnEndpointDiscoveryFunction( - std::function f) + std::function f) { onEndpointDiscovery_ = f; } @@ -1849,14 +1849,14 @@ class PubSubReader return datareader_->get_statuscondition(); } - const eprosima::fastrtps::rtps::GUID_t& datareader_guid() const + const eprosima::fastdds::rtps::GUID_t& datareader_guid() const { return datareader_guid_; } - eprosima::fastrtps::rtps::InstanceHandle_t datareader_ihandle() + eprosima::fastdds::rtps::InstanceHandle_t datareader_ihandle() { - return eprosima::fastrtps::rtps::InstanceHandle_t(datareader_guid()); + return eprosima::fastdds::rtps::InstanceHandle_t(datareader_guid()); } void set_sample_lost_status( @@ -1891,7 +1891,7 @@ class PubSubReader return *this; } - const eprosima::fastrtps::rtps::GUID_t& participant_guid() const + const eprosima::fastdds::rtps::GUID_t& participant_guid() const { return participant_guid_; } @@ -2100,8 +2100,8 @@ class PubSubReader eprosima::fastdds::dds::DataReaderQos datareader_qos_; eprosima::fastdds::dds::StatusMask status_mask_; std::string topic_name_; - eprosima::fastrtps::rtps::GUID_t participant_guid_; - eprosima::fastrtps::rtps::GUID_t datareader_guid_; + eprosima::fastdds::rtps::GUID_t participant_guid_; + eprosima::fastdds::rtps::GUID_t datareader_guid_; bool initialized_; bool use_domain_id_from_profile_; std::list total_msgs_; @@ -2113,8 +2113,8 @@ class PubSubReader unsigned int participant_matched_; std::atomic receiving_; eprosima::fastdds::dds::TypeSupport type_; - using LastSeqInfo = std::pair; - std::map last_seq; + using LastSeqInfo = std::pair; + std::map last_seq; std::atomic current_processed_count_; std::atomic number_samples_expected_; std::atomic current_unread_count_; @@ -2124,8 +2124,8 @@ class PubSubReader std::string participant_profile_ = ""; std::string datareader_profile_ = ""; - std::function onDiscovery_; - std::function onEndpointDiscovery_; + std::function onDiscovery_; + std::function onEndpointDiscovery_; //! True to take data from history. On False, read_ is checked. bool take_; @@ -2207,7 +2207,7 @@ class PubSubReaderWithWaitsets : public PubSubReader } void start( - const eprosima::fastrtps::Duration_t& timeout) + const eprosima::fastdds::Duration_t& timeout) { waitset_.attach_condition(reader_.datareader_->get_statuscondition()); waitset_.attach_condition(reader_.subscriber_->get_statuscondition()); @@ -2405,7 +2405,7 @@ class PubSubReaderWithWaitsets : public PubSubReader unsigned int times_deadline_missed_ = 0; //! The timeout for the wait operation - eprosima::fastrtps::Duration_t timeout_; + eprosima::fastdds::Duration_t timeout_; } waitset_thread_; @@ -2420,7 +2420,7 @@ class PubSubReaderWithWaitsets : public PubSubReader bool statistics = false) : PubSubReader(topic_name, take, statistics) , waitset_thread_(*this) - , timeout_(eprosima::fastrtps::c_TimeInfinite) + , timeout_(eprosima::fastdds::c_TimeInfinite) , times_waitset_timeout_(0) { } @@ -2502,7 +2502,7 @@ class PubSubReaderWithWaitsets : public PubSubReader } PubSubReaderWithWaitsets& waitset_timeout( - const eprosima::fastrtps::Duration_t& timeout) + const eprosima::fastdds::Duration_t& timeout) { timeout_ = timeout; return *this; @@ -2518,7 +2518,7 @@ class PubSubReaderWithWaitsets : public PubSubReader } //! The timeout for the waitset - eprosima::fastrtps::Duration_t timeout_; + eprosima::fastdds::Duration_t timeout_; //! A mutex for waitset timeout std::mutex waitset_timeout_mutex_; diff --git a/test/blackbox/api/dds-pim/PubSubWriter.hpp b/test/blackbox/api/dds-pim/PubSubWriter.hpp index 737d5c28c7d..71fa7057152 100644 --- a/test/blackbox/api/dds-pim/PubSubWriter.hpp +++ b/test/blackbox/api/dds-pim/PubSubWriter.hpp @@ -59,7 +59,7 @@ using eprosima::fastdds::dds::DomainParticipantFactory; using eprosima::fastdds::rtps::UDPTransportDescriptor; using eprosima::fastdds::rtps::UDPv4TransportDescriptor; using eprosima::fastdds::rtps::UDPv6TransportDescriptor; -using eprosima::fastrtps::rtps::IPLocator; +using eprosima::fastdds::rtps::IPLocator; template class PubSubWriter @@ -80,7 +80,7 @@ class PubSubWriter void on_participant_discovery( eprosima::fastdds::dds::DomainParticipant*, - eprosima::fastrtps::rtps::ParticipantDiscoveryInfo&& info, + eprosima::fastdds::rtps::ParticipantDiscoveryInfo&& info, bool& should_be_ignored) override { static_cast(should_be_ignored); @@ -89,12 +89,12 @@ class PubSubWriter writer_.discovery_result_ = writer_.onDiscovery_(info); } - if (info.status == eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT) + if (info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT) { writer_.participant_matched(); } - else if (info.status == eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::REMOVED_PARTICIPANT || - info.status == eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::DROPPED_PARTICIPANT) + else if (info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::REMOVED_PARTICIPANT || + info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::DROPPED_PARTICIPANT) { writer_.participant_unmatched(); } @@ -103,13 +103,13 @@ class PubSubWriter #if HAVE_SECURITY void onParticipantAuthentication( eprosima::fastdds::dds::DomainParticipant*, - eprosima::fastrtps::rtps::ParticipantAuthenticationInfo&& info) override + eprosima::fastdds::rtps::ParticipantAuthenticationInfo&& info) override { - if (info.status == eprosima::fastrtps::rtps::ParticipantAuthenticationInfo::AUTHORIZED_PARTICIPANT) + if (info.status == eprosima::fastdds::rtps::ParticipantAuthenticationInfo::AUTHORIZED_PARTICIPANT) { writer_.authorized(); } - else if (info.status == eprosima::fastrtps::rtps::ParticipantAuthenticationInfo::UNAUTHORIZED_PARTICIPANT) + else if (info.status == eprosima::fastdds::rtps::ParticipantAuthenticationInfo::UNAUTHORIZED_PARTICIPANT) { writer_.unauthorized(); } @@ -119,19 +119,19 @@ class PubSubWriter void on_data_reader_discovery( eprosima::fastdds::dds::DomainParticipant*, - eprosima::fastrtps::rtps::ReaderDiscoveryInfo&& info, + eprosima::fastdds::rtps::ReaderDiscoveryInfo&& info, bool& /*should_be_ignored*/) override { - if (info.status == eprosima::fastrtps::rtps::ReaderDiscoveryInfo::DISCOVERED_READER) + if (info.status == eprosima::fastdds::rtps::ReaderDiscoveryInfo::DISCOVERED_READER) { writer_.add_reader_info(info.info); } - else if (info.status == eprosima::fastrtps::rtps::ReaderDiscoveryInfo::CHANGED_QOS_READER) + else if (info.status == eprosima::fastdds::rtps::ReaderDiscoveryInfo::CHANGED_QOS_READER) { writer_.change_reader_info(info.info); } - else if (info.status == eprosima::fastrtps::rtps::ReaderDiscoveryInfo::REMOVED_READER) + else if (info.status == eprosima::fastdds::rtps::ReaderDiscoveryInfo::REMOVED_READER) { writer_.remove_reader_info(info.info); } @@ -139,18 +139,18 @@ class PubSubWriter void on_data_writer_discovery( eprosima::fastdds::dds::DomainParticipant*, - eprosima::fastrtps::rtps::WriterDiscoveryInfo&& info, + eprosima::fastdds::rtps::WriterDiscoveryInfo&& info, bool& /*should_be_ignored*/) override { - if (info.status == eprosima::fastrtps::rtps::WriterDiscoveryInfo::DISCOVERED_WRITER) + if (info.status == eprosima::fastdds::rtps::WriterDiscoveryInfo::DISCOVERED_WRITER) { writer_.add_writer_info(info.info); } - else if (info.status == eprosima::fastrtps::rtps::WriterDiscoveryInfo::CHANGED_QOS_WRITER) + else if (info.status == eprosima::fastdds::rtps::WriterDiscoveryInfo::CHANGED_QOS_WRITER) { writer_.change_writer_info(info.info); } - else if (info.status == eprosima::fastrtps::rtps::WriterDiscoveryInfo::REMOVED_WRITER) + else if (info.status == eprosima::fastdds::rtps::WriterDiscoveryInfo::REMOVED_WRITER) { writer_.remove_writer_info(info.info); } @@ -331,7 +331,7 @@ class PubSubWriter // By default, memory mode is PREALLOCATED_WITH_REALLOC_MEMORY_MODE datawriter_qos_.endpoint().history_memory_policy = - eprosima::fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; + eprosima::fastdds::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; // By default, heartbeat period and nack response delay are 100 milliseconds. datawriter_qos_.reliable_writer_qos().times.heartbeatPeriod.seconds = 0; @@ -529,7 +529,7 @@ class PubSubWriter } } - eprosima::fastrtps::rtps::InstanceHandle_t register_instance( + eprosima::fastdds::rtps::InstanceHandle_t register_instance( type& msg) { return datawriter_->register_instance((void*)&msg); @@ -537,14 +537,14 @@ class PubSubWriter bool unregister_instance( type& msg, - const eprosima::fastrtps::rtps::InstanceHandle_t& instance_handle) + const eprosima::fastdds::rtps::InstanceHandle_t& instance_handle) { return eprosima::fastdds::dds::RETCODE_OK == datawriter_->unregister_instance((void*)&msg, instance_handle); } bool dispose( type& msg, - const eprosima::fastrtps::rtps::InstanceHandle_t& instance_handle) + const eprosima::fastdds::rtps::InstanceHandle_t& instance_handle) { return eprosima::fastdds::dds::RETCODE_OK == datawriter_->dispose((void*)&msg, instance_handle); } @@ -778,8 +778,8 @@ class PubSubWriter auto nsecs = std::chrono::duration_cast(max_wait); auto secs = std::chrono::duration_cast(nsecs); nsecs -= secs; - eprosima::fastrtps::Duration_t timeout {static_cast(secs.count()), - static_cast(nsecs.count())}; + eprosima::fastdds::Duration_t timeout {static_cast(secs.count()), + static_cast(nsecs.count())}; return (eprosima::fastdds::dds::RETCODE_OK == datawriter_->wait_for_acknowledgments(timeout)); } @@ -789,14 +789,14 @@ class PubSubWriter > bool waitForInstanceAcked( void* data, - const eprosima::fastrtps::rtps::InstanceHandle_t& instance_handle, + const eprosima::fastdds::rtps::InstanceHandle_t& instance_handle, const std::chrono::duration<_Rep, _Period>& max_wait) { auto nsecs = std::chrono::duration_cast(max_wait); auto secs = std::chrono::duration_cast(nsecs); nsecs -= secs; - eprosima::fastrtps::Duration_t timeout {static_cast(secs.count()), - static_cast(nsecs.count())}; + eprosima::fastdds::Duration_t timeout {static_cast(secs.count()), + static_cast(nsecs.count())}; return (eprosima::fastdds::dds::RETCODE_OK == datawriter_->wait_for_acknowledgments(data, instance_handle, timeout)); } @@ -861,14 +861,14 @@ class PubSubWriter } PubSubWriter& mem_policy( - const eprosima::fastrtps::rtps::MemoryManagementPolicy mem_policy) + const eprosima::fastdds::rtps::MemoryManagementPolicy mem_policy) { datawriter_qos_.endpoint().history_memory_policy = mem_policy; return *this; } PubSubWriter& deadline_period( - const eprosima::fastrtps::Duration_t deadline_period) + const eprosima::fastdds::Duration_t deadline_period) { datawriter_qos_.deadline().period = deadline_period; return *this; @@ -882,40 +882,40 @@ class PubSubWriter } PubSubWriter& liveliness_lease_duration( - const eprosima::fastrtps::Duration_t lease_duration) + const eprosima::fastdds::Duration_t lease_duration) { datawriter_qos_.liveliness().lease_duration = lease_duration; return *this; } PubSubWriter& latency_budget_duration( - const eprosima::fastrtps::Duration_t& latency_duration) + const eprosima::fastdds::Duration_t& latency_duration) { datawriter_qos_.latency_budget().duration = latency_duration; return *this; } - eprosima::fastrtps::Duration_t get_latency_budget_duration() + eprosima::fastdds::Duration_t get_latency_budget_duration() { return datawriter_qos_.latency_budget().duration; } PubSubWriter& liveliness_announcement_period( - const eprosima::fastrtps::Duration_t announcement_period) + const eprosima::fastdds::Duration_t announcement_period) { datawriter_qos_.liveliness().announcement_period = announcement_period; return *this; } PubSubWriter& lifespan_period( - const eprosima::fastrtps::Duration_t lifespan_period) + const eprosima::fastdds::Duration_t lifespan_period) { datawriter_qos_.lifespan().duration = lifespan_period; return *this; } PubSubWriter& keep_duration( - const eprosima::fastrtps::Duration_t duration) + const eprosima::fastdds::Duration_t duration) { datawriter_qos_.reliable_writer_qos().disable_positive_acks.enabled = true; datawriter_qos_.reliable_writer_qos().disable_positive_acks.duration = duration; @@ -930,7 +930,7 @@ class PubSubWriter } PubSubWriter& max_blocking_time( - const eprosima::fastrtps::Duration_t time) + const eprosima::fastdds::Duration_t time) { datawriter_qos_.reliability().max_blocking_time = time; return *this; @@ -1030,29 +1030,29 @@ class PubSubWriter } /* Locators */ - eprosima::fastrtps::rtps::Locator_t pdp_locator; - eprosima::fastrtps::rtps::Locator_t tcp_locator; + eprosima::fastdds::rtps::Locator_t pdp_locator; + eprosima::fastdds::rtps::Locator_t tcp_locator; if (v6) { // Define locator for PDP over multicast pdp_locator.kind = LOCATOR_KIND_UDPv6; - eprosima::fastrtps::rtps::IPLocator::setIPv6(pdp_locator, "ff1e::ffff:efff:1"); + eprosima::fastdds::rtps::IPLocator::setIPv6(pdp_locator, "ff1e::ffff:efff:1"); // Define locator for EDP and user data tcp_locator.kind = LOCATOR_KIND_TCPv6; - eprosima::fastrtps::rtps::IPLocator::setIPv6(tcp_locator, "::"); - eprosima::fastrtps::rtps::IPLocator::setPhysicalPort(tcp_locator, tcp_listening_port); - eprosima::fastrtps::rtps::IPLocator::setLogicalPort(tcp_locator, 0); + eprosima::fastdds::rtps::IPLocator::setIPv6(tcp_locator, "::"); + eprosima::fastdds::rtps::IPLocator::setPhysicalPort(tcp_locator, tcp_listening_port); + eprosima::fastdds::rtps::IPLocator::setLogicalPort(tcp_locator, 0); } else { // Define locator for PDP over multicast pdp_locator.kind = LOCATOR_KIND_UDPv4; - eprosima::fastrtps::rtps::IPLocator::setIPv4(pdp_locator, "239.255.0.1"); + eprosima::fastdds::rtps::IPLocator::setIPv4(pdp_locator, "239.255.0.1"); // Define locator for EDP and user data tcp_locator.kind = LOCATOR_KIND_TCPv4; - eprosima::fastrtps::rtps::IPLocator::setIPv4(tcp_locator, "0.0.0.0"); - eprosima::fastrtps::rtps::IPLocator::setPhysicalPort(tcp_locator, tcp_listening_port); - eprosima::fastrtps::rtps::IPLocator::setLogicalPort(tcp_locator, 0); + eprosima::fastdds::rtps::IPLocator::setIPv4(tcp_locator, "0.0.0.0"); + eprosima::fastdds::rtps::IPLocator::setPhysicalPort(tcp_locator, tcp_listening_port); + eprosima::fastdds::rtps::IPLocator::setLogicalPort(tcp_locator, 0); } participant_qos_.wire_protocol().builtin.metatrafficMulticastLocatorList.push_back(pdp_locator); @@ -1339,14 +1339,14 @@ class PubSubWriter } PubSubWriter& property_policy( - const eprosima::fastrtps::rtps::PropertyPolicy& property_policy) + const eprosima::fastdds::rtps::PropertyPolicy& property_policy) { participant_qos_.properties() = property_policy; return *this; } PubSubWriter& entity_property_policy( - const eprosima::fastrtps::rtps::PropertyPolicy& property_policy) + const eprosima::fastdds::rtps::PropertyPolicy& property_policy) { datawriter_qos_.properties() = property_policy; return *this; @@ -1401,14 +1401,14 @@ class PubSubWriter } PubSubWriter& userData( - std::vector user_data) + std::vector user_data) { participant_qos_.user_data() = user_data; return *this; } PubSubWriter& endpoint_userData( - std::vector user_data) + std::vector user_data) { datawriter_qos_.user_data() = user_data; return *this; @@ -1443,8 +1443,8 @@ class PubSubWriter } PubSubWriter& lease_duration( - eprosima::fastrtps::Duration_t lease_duration, - eprosima::fastrtps::Duration_t announce_period) + eprosima::fastdds::Duration_t lease_duration, + eprosima::fastdds::Duration_t announce_period) { participant_qos_.wire_protocol().builtin.discovery_config.leaseDuration = lease_duration; participant_qos_.wire_protocol().builtin.discovery_config.leaseDuration_announcementperiod = announce_period; @@ -1453,7 +1453,7 @@ class PubSubWriter PubSubWriter& initial_announcements( uint32_t count, - const eprosima::fastrtps::Duration_t& period) + const eprosima::fastdds::Duration_t& period) { participant_qos_.wire_protocol().builtin.discovery_config.initial_announcements.count = count; participant_qos_.wire_protocol().builtin.discovery_config.initial_announcements.period = period; @@ -1472,16 +1472,16 @@ class PubSubWriter const std::string& /*xml*/) { /*TODO - std::unique_ptr root; - if (eprosima::fastrtps::xmlparser::XMLParser::loadXML(xml.data(), xml.size(), - root) == eprosima::fastrtps::xmlparser::XMLP_ret::XML_OK) + std::unique_ptr root; + if (eprosima::fastdds::xmlparser::XMLParser::loadXML(xml.data(), xml.size(), + root) == eprosima::fastdds::xmlparser::XMLP_ret::XML_OK) { for (const auto& profile : root->getChildren()) { - if (profile->getType() == eprosima::fastrtps::xmlparser::NodeType::PUBLISHER) + if (profile->getType() == eprosima::fastdds::xmlparser::NodeType::PUBLISHER) { datawriter_qos_ = - *(dynamic_cast + *(dynamic_cast *>( profile.get())->get()); } @@ -1519,7 +1519,7 @@ class PubSubWriter } PubSubWriter& guid_prefix( - const eprosima::fastrtps::rtps::GuidPrefix_t& prefix) + const eprosima::fastdds::rtps::GuidPrefix_t& prefix) { participant_qos_.wire_protocol().prefix = prefix; return *this; @@ -1573,19 +1573,19 @@ class PubSubWriter return topic_name_; } - eprosima::fastrtps::rtps::GUID_t participant_guid() + eprosima::fastdds::rtps::GUID_t participant_guid() { return participant_guid_; } - eprosima::fastrtps::rtps::GUID_t datawriter_guid() + eprosima::fastdds::rtps::GUID_t datawriter_guid() { return datawriter_guid_; } - eprosima::fastrtps::rtps::InstanceHandle_t datawriter_ihandle() + eprosima::fastdds::rtps::InstanceHandle_t datawriter_ihandle() { - return eprosima::fastrtps::rtps::InstanceHandle_t(datawriter_guid()); + return eprosima::fastdds::rtps::InstanceHandle_t(datawriter_guid()); } bool update_partition( @@ -1787,7 +1787,7 @@ class PubSubWriter #endif // if HAVE_SECURITY void add_writer_info( - const eprosima::fastrtps::rtps::WriterProxyData& writer_data) + const eprosima::fastdds::rtps::WriterProxyData& writer_data) { mutexEntitiesInfoList_.lock(); auto ret = mapWriterInfoList_.insert(std::make_pair(writer_data.guid(), writer_data)); @@ -1819,13 +1819,13 @@ class PubSubWriter } void change_writer_info( - const eprosima::fastrtps::rtps::WriterProxyData& writer_data) + const eprosima::fastdds::rtps::WriterProxyData& writer_data) { mutexEntitiesInfoList_.lock(); auto ret = mapWriterInfoList_.insert(std::make_pair(writer_data.guid(), writer_data)); ASSERT_FALSE(ret.second); - eprosima::fastrtps::rtps::WriterProxyData old_writer_data = ret.first->second; + eprosima::fastdds::rtps::WriterProxyData old_writer_data = ret.first->second; ret.first->second = writer_data; ASSERT_GT(mapTopicCountList_.count(writer_data.topicName().to_string()), 0ul); @@ -1858,7 +1858,7 @@ class PubSubWriter } void add_reader_info( - const eprosima::fastrtps::rtps::ReaderProxyData& reader_data) + const eprosima::fastdds::rtps::ReaderProxyData& reader_data) { mutexEntitiesInfoList_.lock(); auto ret = mapReaderInfoList_.insert(std::make_pair(reader_data.guid(), reader_data)); @@ -1890,13 +1890,13 @@ class PubSubWriter } void change_reader_info( - const eprosima::fastrtps::rtps::ReaderProxyData& reader_data) + const eprosima::fastdds::rtps::ReaderProxyData& reader_data) { mutexEntitiesInfoList_.lock(); auto ret = mapReaderInfoList_.insert(std::make_pair(reader_data.guid(), reader_data)); ASSERT_FALSE(ret.second); - eprosima::fastrtps::rtps::ReaderProxyData old_reader_data = ret.first->second; + eprosima::fastdds::rtps::ReaderProxyData old_reader_data = ret.first->second; ret.first->second = reader_data; ASSERT_GT(mapTopicCountList_.count(reader_data.topicName().to_string()), 0ul); @@ -1928,7 +1928,7 @@ class PubSubWriter } void remove_writer_info( - const eprosima::fastrtps::rtps::WriterProxyData& writer_data) + const eprosima::fastdds::rtps::WriterProxyData& writer_data) { std::unique_lock lock(mutexEntitiesInfoList_); @@ -1956,7 +1956,7 @@ class PubSubWriter } void remove_reader_info( - const eprosima::fastrtps::rtps::ReaderProxyData& reader_data) + const eprosima::fastdds::rtps::ReaderProxyData& reader_data) { std::unique_lock lock(mutexEntitiesInfoList_); @@ -1995,8 +1995,8 @@ class PubSubWriter eprosima::fastdds::dds::DataWriterQos datawriter_qos_; eprosima::fastdds::dds::StatusMask status_mask_; std::string topic_name_; - eprosima::fastrtps::rtps::GUID_t participant_guid_; - eprosima::fastrtps::rtps::GUID_t datawriter_guid_; + eprosima::fastdds::rtps::GUID_t participant_guid_; + eprosima::fastdds::rtps::GUID_t datawriter_guid_; bool initialized_; bool use_domain_id_from_profile_; std::mutex mutexDiscovery_; @@ -2006,8 +2006,8 @@ class PubSubWriter eprosima::fastdds::dds::TypeSupport type_; std::mutex mutexEntitiesInfoList_; std::condition_variable cvEntitiesInfoList_; - std::map mapWriterInfoList_; - std::map mapReaderInfoList_; + std::map mapWriterInfoList_; + std::map mapReaderInfoList_; std::map mapTopicCountList_; std::map mapPartitionCountList_; bool discovery_result_; @@ -2016,7 +2016,7 @@ class PubSubWriter std::string participant_profile_ = ""; std::string datawriter_profile_ = ""; - std::function onDiscovery_; + std::function onDiscovery_; //! A mutex for liveliness std::mutex liveliness_mutex_; @@ -2069,7 +2069,7 @@ class PubSubWriterWithWaitsets : public PubSubWriter } void start( - const eprosima::fastrtps::Duration_t& timeout) + const eprosima::fastdds::Duration_t& timeout) { waitset_.attach_condition(writer_.datawriter_->get_statuscondition()); waitset_.attach_condition(guard_condition_); @@ -2212,7 +2212,7 @@ class PubSubWriterWithWaitsets : public PubSubWriter unsigned int times_liveliness_lost_ = 0; //! The timeout for the wait operation - eprosima::fastrtps::Duration_t timeout_; + eprosima::fastdds::Duration_t timeout_; } waitset_thread_; @@ -2224,7 +2224,7 @@ class PubSubWriterWithWaitsets : public PubSubWriter const std::string& topic_name) : PubSubWriter(topic_name) , waitset_thread_(*this) - , timeout_(eprosima::fastrtps::c_TimeInfinite) + , timeout_(eprosima::fastdds::c_TimeInfinite) , times_waitset_timeout_(0) { } @@ -2311,7 +2311,7 @@ class PubSubWriterWithWaitsets : public PubSubWriter } PubSubWriterWithWaitsets& waitset_timeout( - const eprosima::fastrtps::Duration_t& timeout) + const eprosima::fastdds::Duration_t& timeout) { timeout_ = timeout; return *this; @@ -2327,7 +2327,7 @@ class PubSubWriterWithWaitsets : public PubSubWriter } //! The timeout for the waitset - eprosima::fastrtps::Duration_t timeout_; + eprosima::fastdds::Duration_t timeout_; //! A mutex for waitset timeout std::mutex waitset_timeout_mutex_; diff --git a/test/blackbox/api/dds-pim/PubSubWriterReader.hpp b/test/blackbox/api/dds-pim/PubSubWriterReader.hpp index 8d525968a4b..a525032f539 100644 --- a/test/blackbox/api/dds-pim/PubSubWriterReader.hpp +++ b/test/blackbox/api/dds-pim/PubSubWriterReader.hpp @@ -67,13 +67,13 @@ class PubSubWriterReader #if HAVE_SECURITY void onParticipantAuthentication( eprosima::fastdds::dds::DomainParticipant*, - eprosima::fastrtps::rtps::ParticipantAuthenticationInfo&& info) override + eprosima::fastdds::rtps::ParticipantAuthenticationInfo&& info) override { - if (info.status == eprosima::fastrtps::rtps::ParticipantAuthenticationInfo::AUTHORIZED_PARTICIPANT) + if (info.status == eprosima::fastdds::rtps::ParticipantAuthenticationInfo::AUTHORIZED_PARTICIPANT) { wreader_.authorized(); } - else if (info.status == eprosima::fastrtps::rtps::ParticipantAuthenticationInfo::UNAUTHORIZED_PARTICIPANT) + else if (info.status == eprosima::fastdds::rtps::ParticipantAuthenticationInfo::UNAUTHORIZED_PARTICIPANT) { wreader_.unauthorized(); } @@ -82,7 +82,7 @@ class PubSubWriterReader #endif // if HAVE_SECURITY void on_participant_discovery( eprosima::fastdds::dds::DomainParticipant* participant, - eprosima::fastrtps::rtps::ParticipantDiscoveryInfo&& info, + eprosima::fastdds::rtps::ParticipantDiscoveryInfo&& info, bool& should_be_ignored) override { static_cast(should_be_ignored); @@ -90,15 +90,15 @@ class PubSubWriterReader switch (info.status) { - case eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT: + case eprosima::fastdds::rtps::ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT: info_add(discovered_participants_, info.info.m_guid); break; - case eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::REMOVED_PARTICIPANT: + case eprosima::fastdds::rtps::ParticipantDiscoveryInfo::REMOVED_PARTICIPANT: info_remove(discovered_participants_, info.info.m_guid); break; - case eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::DROPPED_PARTICIPANT: + case eprosima::fastdds::rtps::ParticipantDiscoveryInfo::DROPPED_PARTICIPANT: std::cout << "Participant " << info.info.m_guid << " has been dropped"; info_remove(discovered_participants_, info.info.m_guid); break; @@ -110,18 +110,18 @@ class PubSubWriterReader void on_data_reader_discovery( eprosima::fastdds::dds::DomainParticipant* participant, - eprosima::fastrtps::rtps::ReaderDiscoveryInfo&& info, + eprosima::fastdds::rtps::ReaderDiscoveryInfo&& info, bool& /*should_be_ignored*/) override { (void)participant; switch (info.status) { - case eprosima::fastrtps::rtps::ReaderDiscoveryInfo::DISCOVERED_READER: + case eprosima::fastdds::rtps::ReaderDiscoveryInfo::DISCOVERED_READER: info_add(discovered_subscribers_, info.info.guid()); break; - case eprosima::fastrtps::rtps::ReaderDiscoveryInfo::REMOVED_READER: + case eprosima::fastdds::rtps::ReaderDiscoveryInfo::REMOVED_READER: info_remove(discovered_subscribers_, info.info.guid()); break; @@ -132,18 +132,18 @@ class PubSubWriterReader void on_data_writer_discovery( eprosima::fastdds::dds::DomainParticipant* participant, - eprosima::fastrtps::rtps::WriterDiscoveryInfo&& info, + eprosima::fastdds::rtps::WriterDiscoveryInfo&& info, bool& /*should_be_ignored*/) override { (void)participant; switch (info.status) { - case eprosima::fastrtps::rtps::WriterDiscoveryInfo::DISCOVERED_WRITER: + case eprosima::fastdds::rtps::WriterDiscoveryInfo::DISCOVERED_WRITER: info_add(discovered_publishers_, info.info.guid()); break; - case eprosima::fastrtps::rtps::WriterDiscoveryInfo::REMOVED_WRITER: + case eprosima::fastdds::rtps::WriterDiscoveryInfo::REMOVED_WRITER: info_remove(discovered_publishers_, info.info.guid()); break; @@ -179,23 +179,23 @@ class PubSubWriterReader //! Mutex guarding all info collections mutable std::mutex info_mutex_; //! The discovered participants excluding the participant this listener is listening to - std::set discovered_participants_; + std::set discovered_participants_; //! Number of subscribers discovered - std::set discovered_subscribers_; + std::set discovered_subscribers_; //! Number of publishers discovered - std::set discovered_publishers_; + std::set discovered_publishers_; void info_add( - std::set& collection, - const eprosima::fastrtps::rtps::GUID_t& item) + std::set& collection, + const eprosima::fastdds::rtps::GUID_t& item) { std::lock_guard guard(info_mutex_); collection.insert(item); } void info_remove( - std::set& collection, - const eprosima::fastrtps::rtps::GUID_t& item) + std::set& collection, + const eprosima::fastdds::rtps::GUID_t& item) { std::lock_guard guard(info_mutex_); collection.erase(item); @@ -351,9 +351,9 @@ class PubSubWriterReader // By default, memory mode is PREALLOCATED_WITH_REALLOC_MEMORY_MODE datawriter_qos_.endpoint().history_memory_policy = - eprosima::fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; + eprosima::fastdds::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; datareader_qos_.endpoint().history_memory_policy = - eprosima::fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; + eprosima::fastdds::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; // By default, heartbeat period and nack response delay are 100 milliseconds. datawriter_qos_.reliable_writer_qos().times.heartbeatPeriod.seconds = 0; @@ -430,7 +430,7 @@ class PubSubWriterReader bool create_additional_topics( size_t num_topics, const char* suffix, - const eprosima::fastrtps::rtps::PropertySeq& writer_properties = eprosima::fastrtps::rtps::PropertySeq()) + const eprosima::fastdds::rtps::PropertySeq& writer_properties = eprosima::fastdds::rtps::PropertySeq()) { bool ret_val = initialized_; if (ret_val) @@ -786,21 +786,21 @@ class PubSubWriterReader } PubSubWriterReader& property_policy( - const eprosima::fastrtps::rtps::PropertyPolicy property_policy) + const eprosima::fastdds::rtps::PropertyPolicy property_policy) { participant_qos_.properties() = property_policy; return *this; } PubSubWriterReader& pub_property_policy( - const eprosima::fastrtps::rtps::PropertyPolicy property_policy) + const eprosima::fastdds::rtps::PropertyPolicy property_policy) { datawriter_qos_.properties() = property_policy; return *this; } PubSubWriterReader& sub_property_policy( - const eprosima::fastrtps::rtps::PropertyPolicy property_policy) + const eprosima::fastdds::rtps::PropertyPolicy property_policy) { datareader_qos_.properties() = property_policy; return *this; @@ -821,28 +821,28 @@ class PubSubWriterReader } PubSubWriterReader& pub_liveliness_announcement_period( - const eprosima::fastrtps::Duration_t announcement_period) + const eprosima::fastdds::Duration_t announcement_period) { datawriter_qos_.liveliness().announcement_period = announcement_period; return *this; } PubSubWriterReader& sub_liveliness_announcement_period( - const eprosima::fastrtps::Duration_t announcement_period) + const eprosima::fastdds::Duration_t announcement_period) { datareader_qos_.liveliness().announcement_period = announcement_period; return *this; } PubSubWriterReader& pub_liveliness_lease_duration( - const eprosima::fastrtps::Duration_t lease_duration) + const eprosima::fastdds::Duration_t lease_duration) { datawriter_qos_.liveliness().lease_duration = lease_duration; return *this; } PubSubWriterReader& sub_liveliness_lease_duration( - const eprosima::fastrtps::Duration_t lease_duration) + const eprosima::fastdds::Duration_t lease_duration) { datareader_qos_.liveliness().lease_duration = lease_duration; return *this; @@ -1018,11 +1018,11 @@ class PubSubWriterReader std::condition_variable cv_; std::mutex mutexDiscovery_; std::condition_variable cvDiscovery_; - std::set matched_writers_; - std::set matched_readers_; + std::set matched_writers_; + std::set matched_readers_; std::atomic receiving_; eprosima::fastdds::dds::TypeSupport type_; - eprosima::fastrtps::rtps::SequenceNumber_t last_seq; + eprosima::fastdds::rtps::SequenceNumber_t last_seq; size_t current_received_count_; size_t number_samples_expected_; #if HAVE_SECURITY diff --git a/test/blackbox/api/dds-pim/ReqRepHelloWorldReplier.cpp b/test/blackbox/api/dds-pim/ReqRepHelloWorldReplier.cpp index fd4e40d97ee..c70c3c0f74f 100644 --- a/test/blackbox/api/dds-pim/ReqRepHelloWorldReplier.cpp +++ b/test/blackbox/api/dds-pim/ReqRepHelloWorldReplier.cpp @@ -48,8 +48,8 @@ ReqRepHelloWorldReplier::ReqRepHelloWorldReplier() , matched_(0) { // By default, memory mode is PREALLOCATED_WITH_REALLOC_MEMORY_MODE - datareader_qos_.endpoint().history_memory_policy = eprosima::fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; - datawriter_qos_.endpoint().history_memory_policy = eprosima::fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; + datareader_qos_.endpoint().history_memory_policy = eprosima::fastdds::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; + datawriter_qos_.endpoint().history_memory_policy = eprosima::fastdds::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; datawriter_qos_.reliable_writer_qos().times.heartbeatPeriod.seconds = 1; datawriter_qos_.reliable_writer_qos().times.heartbeatPeriod.nanosec = 0; @@ -150,10 +150,10 @@ void ReqRepHelloWorldReplier::init() } void ReqRepHelloWorldReplier::newNumber( - eprosima::fastrtps::rtps::SampleIdentity sample_identity, + eprosima::fastdds::rtps::SampleIdentity sample_identity, uint16_t number) { - eprosima::fastrtps::rtps::WriteParams wparams; + eprosima::fastdds::rtps::WriteParams wparams; HelloWorld hello; hello.index(number); hello.message("GoodBye"); diff --git a/test/blackbox/api/dds-pim/ReqRepHelloWorldReplier.hpp b/test/blackbox/api/dds-pim/ReqRepHelloWorldReplier.hpp index 68ccd19a6d2..31ddddbd280 100644 --- a/test/blackbox/api/dds-pim/ReqRepHelloWorldReplier.hpp +++ b/test/blackbox/api/dds-pim/ReqRepHelloWorldReplier.hpp @@ -136,7 +136,7 @@ class ReqRepHelloWorldReplier } void newNumber( - eprosima::fastrtps::rtps::SampleIdentity sample_identity, + eprosima::fastdds::rtps::SampleIdentity sample_identity, uint16_t number); void wait_discovery(); void matched(); diff --git a/test/blackbox/api/dds-pim/ReqRepHelloWorldRequester.cpp b/test/blackbox/api/dds-pim/ReqRepHelloWorldRequester.cpp index 59488b21a26..6fede9f3b1e 100644 --- a/test/blackbox/api/dds-pim/ReqRepHelloWorldRequester.cpp +++ b/test/blackbox/api/dds-pim/ReqRepHelloWorldRequester.cpp @@ -47,8 +47,8 @@ ReqRepHelloWorldRequester::ReqRepHelloWorldRequester() , matched_(0) { // By default, memory mode is PREALLOCATED_WITH_REALLOC_MEMORY_MODE - datareader_qos_.endpoint().history_memory_policy = eprosima::fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; - datawriter_qos_.endpoint().history_memory_policy = eprosima::fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; + datareader_qos_.endpoint().history_memory_policy = eprosima::fastdds::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; + datawriter_qos_.endpoint().history_memory_policy = eprosima::fastdds::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; datawriter_qos_.reliable_writer_qos().times.heartbeatPeriod.seconds = 1; datawriter_qos_.reliable_writer_qos().times.heartbeatPeriod.nanosec = 0; @@ -148,8 +148,8 @@ void ReqRepHelloWorldRequester::init() } void ReqRepHelloWorldRequester::init_with_latency( - const eprosima::fastrtps::Duration_t& latency_budget_duration_pub, - const eprosima::fastrtps::Duration_t& latency_budget_duration_sub) + const eprosima::fastdds::Duration_t& latency_budget_duration_pub, + const eprosima::fastdds::Duration_t& latency_budget_duration_sub) { datareader_qos_.latency_budget().duration = latency_budget_duration_sub; datawriter_qos_.latency_budget().duration = latency_budget_duration_pub; @@ -157,7 +157,7 @@ void ReqRepHelloWorldRequester::init_with_latency( } void ReqRepHelloWorldRequester::newNumber( - eprosima::fastrtps::rtps::SampleIdentity related_sample_identity, + eprosima::fastdds::rtps::SampleIdentity related_sample_identity, uint16_t number) { std::unique_lock lock(mutex_); @@ -230,7 +230,7 @@ void ReqRepHelloWorldRequester::ReplyListener::on_data_available( void ReqRepHelloWorldRequester::send( const uint16_t number) { - eprosima::fastrtps::rtps::WriteParams wparams; + eprosima::fastdds::rtps::WriteParams wparams; HelloWorld hello; hello.index(number); hello.message("HelloWorld"); @@ -242,5 +242,5 @@ void ReqRepHelloWorldRequester::send( ASSERT_EQ(request_datawriter_->write((void*)&hello, wparams), true); related_sample_identity_ = wparams.sample_identity(); - ASSERT_NE(related_sample_identity_.sequence_number(), eprosima::fastrtps::rtps::SequenceNumber_t()); + ASSERT_NE(related_sample_identity_.sequence_number(), eprosima::fastdds::rtps::SequenceNumber_t()); } diff --git a/test/blackbox/api/dds-pim/ReqRepHelloWorldRequester.hpp b/test/blackbox/api/dds-pim/ReqRepHelloWorldRequester.hpp index 0b2de268305..dc33540ba5d 100644 --- a/test/blackbox/api/dds-pim/ReqRepHelloWorldRequester.hpp +++ b/test/blackbox/api/dds-pim/ReqRepHelloWorldRequester.hpp @@ -133,15 +133,15 @@ class ReqRepHelloWorldRequester virtual ~ReqRepHelloWorldRequester(); void init(); void init_with_latency( - const eprosima::fastrtps::Duration_t& latency_budget_duration_pub, - const eprosima::fastrtps::Duration_t& latency_budget_duration_sub); + const eprosima::fastdds::Duration_t& latency_budget_duration_pub, + const eprosima::fastdds::Duration_t& latency_budget_duration_sub); bool isInitialized() const { return initialized_; } void newNumber( - eprosima::fastrtps::rtps::SampleIdentity related_sample_identity, + eprosima::fastdds::rtps::SampleIdentity related_sample_identity, uint16_t number); void block( const std::chrono::seconds& seconds); @@ -149,12 +149,12 @@ class ReqRepHelloWorldRequester void matched(); void send( const uint16_t number); - const eprosima::fastrtps::Duration_t datawriter_latency_budget_duration() const + const eprosima::fastdds::Duration_t datawriter_latency_budget_duration() const { return request_datawriter_->get_qos().latency_budget().duration; } - const eprosima::fastrtps::Duration_t datareader_latency_budget_duration() const + const eprosima::fastdds::Duration_t datareader_latency_budget_duration() const { return reply_datareader_->get_qos().latency_budget().duration; } @@ -208,8 +208,8 @@ class ReqRepHelloWorldRequester std::condition_variable cvDiscovery_; unsigned int matched_; eprosima::fastdds::dds::TypeSupport type_; - eprosima::fastrtps::rtps::SampleIdentity related_sample_identity_; - eprosima::fastrtps::rtps::SampleIdentity received_sample_identity_; + eprosima::fastdds::rtps::SampleIdentity related_sample_identity_; + eprosima::fastdds::rtps::SampleIdentity received_sample_identity_; }; #endif // _TEST_BLACKBOX_REQREPHELLOWORLDREQUESTER_HPP_ diff --git a/test/blackbox/api/dds-pim/TCPReqRepHelloWorldReplier.cpp b/test/blackbox/api/dds-pim/TCPReqRepHelloWorldReplier.cpp index a86f33ac70e..1d8a4dcad6d 100644 --- a/test/blackbox/api/dds-pim/TCPReqRepHelloWorldReplier.cpp +++ b/test/blackbox/api/dds-pim/TCPReqRepHelloWorldReplier.cpp @@ -35,7 +35,6 @@ #include -using namespace eprosima::fastrtps::rtps; using namespace eprosima::fastdds::rtps; using namespace eprosima::fastdds::dds; @@ -95,7 +94,7 @@ void TCPReqRepHelloWorldReplier::init( DomainParticipantQos participant_qos; participant_qos.wire_protocol().participant_id = participantId; participant_qos.wire_protocol().builtin.discovery_config.leaseDuration_announcementperiod = Duration_t(1, 0); - participant_qos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastrtps::c_TimeInfinite; + participant_qos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::c_TimeInfinite; participant_qos.transport().use_builtin_transports = false; diff --git a/test/blackbox/api/dds-pim/TCPReqRepHelloWorldReplier.hpp b/test/blackbox/api/dds-pim/TCPReqRepHelloWorldReplier.hpp index 60f77a43a1b..79fb0b270f7 100644 --- a/test/blackbox/api/dds-pim/TCPReqRepHelloWorldReplier.hpp +++ b/test/blackbox/api/dds-pim/TCPReqRepHelloWorldReplier.hpp @@ -137,7 +137,7 @@ class TCPReqRepHelloWorldReplier } void newNumber( - eprosima::fastrtps::rtps::SampleIdentity sample_identity, + eprosima::fastdds::rtps::SampleIdentity sample_identity, uint16_t number); void wait_discovery( std::chrono::seconds timeout = std::chrono::seconds::zero()); diff --git a/test/blackbox/api/dds-pim/TCPReqRepHelloWorldRequester.cpp b/test/blackbox/api/dds-pim/TCPReqRepHelloWorldRequester.cpp index f3674828620..5fa725c5b96 100644 --- a/test/blackbox/api/dds-pim/TCPReqRepHelloWorldRequester.cpp +++ b/test/blackbox/api/dds-pim/TCPReqRepHelloWorldRequester.cpp @@ -35,7 +35,6 @@ #include -using namespace eprosima::fastrtps::rtps; using namespace eprosima::fastdds::rtps; using namespace eprosima::fastdds::dds; @@ -175,7 +174,7 @@ void TCPReqRepHelloWorldRequester::init( participant_qos.transport().user_transports.push_back(descriptor); participant_qos.wire_protocol().participant_id = participantId; - participant_qos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastrtps::c_TimeInfinite; + participant_qos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::c_TimeInfinite; participant_qos.wire_protocol().builtin.discovery_config.leaseDuration_announcementperiod = Duration_t(1, 0); participant_ = eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->create_participant( diff --git a/test/blackbox/api/dds-pim/TCPReqRepHelloWorldRequester.hpp b/test/blackbox/api/dds-pim/TCPReqRepHelloWorldRequester.hpp index ce3b20d360f..037f7a8ebd0 100644 --- a/test/blackbox/api/dds-pim/TCPReqRepHelloWorldRequester.hpp +++ b/test/blackbox/api/dds-pim/TCPReqRepHelloWorldRequester.hpp @@ -137,7 +137,7 @@ class TCPReqRepHelloWorldRequester } void newNumber( - eprosima::fastrtps::rtps::SampleIdentity related_sample_identity, + eprosima::fastdds::rtps::SampleIdentity related_sample_identity, uint16_t number); void block(); void wait_discovery( @@ -196,8 +196,8 @@ class TCPReqRepHelloWorldRequester std::condition_variable cvDiscovery_; std::atomic matched_; eprosima::fastdds::dds::TypeSupport type_; - eprosima::fastrtps::rtps::SampleIdentity related_sample_identity_; - eprosima::fastrtps::rtps::SampleIdentity received_sample_identity_; + eprosima::fastdds::rtps::SampleIdentity related_sample_identity_; + eprosima::fastdds::rtps::SampleIdentity received_sample_identity_; }; #endif // _TEST_BLACKBOX_TCPReqRepHelloWorldRequester_HPP_ diff --git a/test/blackbox/common/BlackboxTests.cpp b/test/blackbox/common/BlackboxTests.cpp index 784693520e8..0daa51f0d1c 100644 --- a/test/blackbox/common/BlackboxTests.cpp +++ b/test/blackbox/common/BlackboxTests.cpp @@ -26,8 +26,8 @@ #include #include -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; //#define cout "Use Log instead!" diff --git a/test/blackbox/common/BlackboxTestsDeadlineQos.cpp b/test/blackbox/common/BlackboxTestsDeadlineQos.cpp index c891c387feb..9223e2c8ab8 100644 --- a/test/blackbox/common/BlackboxTestsDeadlineQos.cpp +++ b/test/blackbox/common/BlackboxTestsDeadlineQos.cpp @@ -24,8 +24,8 @@ #include "ReqRepAsReliableHelloWorldReplier.hpp" #include "ReqRepAsReliableHelloWorldRequester.hpp" -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; enum communication_type { diff --git a/test/blackbox/common/BlackboxTestsDiscovery.cpp b/test/blackbox/common/BlackboxTestsDiscovery.cpp index 535ba3ddb0e..902260e17db 100644 --- a/test/blackbox/common/BlackboxTestsDiscovery.cpp +++ b/test/blackbox/common/BlackboxTestsDiscovery.cpp @@ -39,10 +39,8 @@ #include "PubSubWriter.hpp" #include "PubSubWriterReader.hpp" -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; -using test_UDPv4Transport = eprosima::fastdds::rtps::test_UDPv4Transport; -using test_UDPv4TransportDescriptor = eprosima::fastdds::rtps::test_UDPv4TransportDescriptor; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; enum communication_type { @@ -1308,9 +1306,9 @@ TEST_P(Discovery, AsymmeticIgnoreParticipantFlags) // When the announcements of this participant arrive to p2, a single DATA(p) should be sent back. // No other traffic is expected, since it will take place through intraprocess. PubSubReader p1(TEST_TOPIC_NAME); - p1.ignore_participant_flags(static_cast( - eprosima::fastrtps::rtps::ParticipantFilteringFlags_t::FILTER_DIFFERENT_HOST | - eprosima::fastrtps::rtps::ParticipantFilteringFlags_t::FILTER_DIFFERENT_PROCESS)); + p1.ignore_participant_flags(static_cast( + eprosima::fastdds::rtps::ParticipantFilteringFlags::FILTER_DIFFERENT_HOST | + eprosima::fastdds::rtps::ParticipantFilteringFlags::FILTER_DIFFERENT_PROCESS)); p1.init(); EXPECT_TRUE(p1.isInitialized()); @@ -1970,11 +1968,11 @@ TEST(Discovery, RemoteBuiltinEndpointHonoring) { auto old_pos = msg.pos; msg.pos += 4; - eprosima::fastrtps::rtps::EntityId_t writer_entity_id; - eprosima::fastrtps::rtps::CDRMessage::readEntityId(&msg, &writer_entity_id); + eprosima::fastdds::rtps::EntityId_t writer_entity_id; + eprosima::fastdds::rtps::CDRMessage::readEntityId(&msg, &writer_entity_id); msg.pos = old_pos; - if (eprosima::fastrtps::rtps::c_EntityId_WriterLiveliness == writer_entity_id) + if (eprosima::fastdds::rtps::c_EntityId_WriterLiveliness == writer_entity_id) { num_wlp_reader_heartbeat++; } @@ -1985,11 +1983,11 @@ TEST(Discovery, RemoteBuiltinEndpointHonoring) { auto old_pos = msg.pos; msg.pos += 4; - eprosima::fastrtps::rtps::EntityId_t writer_entity_id; - eprosima::fastrtps::rtps::CDRMessage::readEntityId(&msg, &writer_entity_id); + eprosima::fastdds::rtps::EntityId_t writer_entity_id; + eprosima::fastdds::rtps::CDRMessage::readEntityId(&msg, &writer_entity_id); msg.pos = old_pos; - if (eprosima::fastrtps::rtps::c_EntityId_WriterLiveliness == writer_entity_id) + if (eprosima::fastdds::rtps::c_EntityId_WriterLiveliness == writer_entity_id) { num_wlp_reader_acknack++; } @@ -2005,11 +2003,11 @@ TEST(Discovery, RemoteBuiltinEndpointHonoring) { auto old_pos = msg.pos; msg.pos += 4; - eprosima::fastrtps::rtps::EntityId_t writer_entity_id; - eprosima::fastrtps::rtps::CDRMessage::readEntityId(&msg, &writer_entity_id); + eprosima::fastdds::rtps::EntityId_t writer_entity_id; + eprosima::fastdds::rtps::CDRMessage::readEntityId(&msg, &writer_entity_id); msg.pos = old_pos; - if (eprosima::fastrtps::rtps::c_EntityId_WriterLiveliness == writer_entity_id) + if (eprosima::fastdds::rtps::c_EntityId_WriterLiveliness == writer_entity_id) { num_wlp_writer_heartbeat++; } @@ -2020,11 +2018,11 @@ TEST(Discovery, RemoteBuiltinEndpointHonoring) { auto old_pos = msg.pos; msg.pos += 4; - eprosima::fastrtps::rtps::EntityId_t writer_entity_id; - eprosima::fastrtps::rtps::CDRMessage::readEntityId(&msg, &writer_entity_id); + eprosima::fastdds::rtps::EntityId_t writer_entity_id; + eprosima::fastdds::rtps::CDRMessage::readEntityId(&msg, &writer_entity_id); msg.pos = old_pos; - if (eprosima::fastrtps::rtps::c_EntityId_WriterLiveliness == writer_entity_id) + if (eprosima::fastdds::rtps::c_EntityId_WriterLiveliness == writer_entity_id) { num_wlp_writer_acknack++; } @@ -2145,7 +2143,7 @@ TEST(Discovery, MultipleXMLProfileLoad) TEST(Discovery, discovery_cyclone_participant_with_custom_pid) { using namespace eprosima::fastdds::dds; - using namespace eprosima::fastrtps::rtps; + using namespace eprosima::fastdds::rtps; /* Custom participant listener to count number of discovered participants */ class DiscoveryListener : public DomainParticipantListener diff --git a/test/blackbox/common/BlackboxTestsKeys.cpp b/test/blackbox/common/BlackboxTestsKeys.cpp index dee1e71dc45..8ba989ba920 100644 --- a/test/blackbox/common/BlackboxTestsKeys.cpp +++ b/test/blackbox/common/BlackboxTestsKeys.cpp @@ -33,7 +33,7 @@ TEST(KeyedTopic, RegistrationNonKeyedFail) for (auto data_sample : data) { // Register instances - EXPECT_EQ(writer.register_instance(data_sample), eprosima::fastrtps::rtps::c_InstanceHandle_Unknown); + EXPECT_EQ(writer.register_instance(data_sample), eprosima::fastdds::rtps::c_InstanceHandle_Unknown); } } @@ -50,7 +50,7 @@ TEST(KeyedTopic, RegistrationSuccess) for (auto data_sample : data) { // Register instances - EXPECT_NE(writer.register_instance(data_sample), eprosima::fastrtps::rtps::c_InstanceHandle_Unknown); + EXPECT_NE(writer.register_instance(data_sample), eprosima::fastdds::rtps::c_InstanceHandle_Unknown); } } @@ -67,8 +67,8 @@ TEST(KeyedTopic, RegistrationFail) auto data = default_keyedhelloworld_data_generator(2); // Register instances. - EXPECT_NE(writer.register_instance(data.front()), eprosima::fastrtps::rtps::c_InstanceHandle_Unknown); - EXPECT_EQ(writer.register_instance(data.back()), eprosima::fastrtps::rtps::c_InstanceHandle_Unknown); + EXPECT_NE(writer.register_instance(data.front()), eprosima::fastdds::rtps::c_InstanceHandle_Unknown); + EXPECT_EQ(writer.register_instance(data.back()), eprosima::fastdds::rtps::c_InstanceHandle_Unknown); } TEST(KeyedTopic, UnregistrationFail) @@ -81,7 +81,7 @@ TEST(KeyedTopic, UnregistrationFail) ASSERT_TRUE(writer.isInitialized()); - eprosima::fastrtps::rtps::InstanceHandle_t handle; + eprosima::fastdds::rtps::InstanceHandle_t handle; handle.value[0] = 1; auto data = default_keyedhelloworld_data_generator(1); @@ -99,7 +99,7 @@ TEST(KeyedTopic, DisposeFail) ASSERT_TRUE(writer.isInitialized()); - eprosima::fastrtps::rtps::InstanceHandle_t handle; + eprosima::fastdds::rtps::InstanceHandle_t handle; handle.value[0] = 1; auto data = default_keyedhelloworld_data_generator(1); @@ -121,17 +121,17 @@ TEST(KeyedTopic, RegistrationAfterUnregistration) // Register instances. auto instance_handle_1 = writer.register_instance(data.front()); - EXPECT_NE(instance_handle_1, eprosima::fastrtps::rtps::c_InstanceHandle_Unknown); - EXPECT_EQ(writer.register_instance(data.back()), eprosima::fastrtps::rtps::c_InstanceHandle_Unknown); + EXPECT_NE(instance_handle_1, eprosima::fastdds::rtps::c_InstanceHandle_Unknown); + EXPECT_EQ(writer.register_instance(data.back()), eprosima::fastdds::rtps::c_InstanceHandle_Unknown); ASSERT_TRUE(writer.unregister_instance(data.front(), instance_handle_1)); ASSERT_FALSE(writer.unregister_instance(data.front(), instance_handle_1)); - EXPECT_NE(writer.register_instance(data.back()), eprosima::fastrtps::rtps::c_InstanceHandle_Unknown); - EXPECT_EQ(writer.register_instance(data.front()), eprosima::fastrtps::rtps::c_InstanceHandle_Unknown); + EXPECT_NE(writer.register_instance(data.back()), eprosima::fastdds::rtps::c_InstanceHandle_Unknown); + EXPECT_EQ(writer.register_instance(data.front()), eprosima::fastdds::rtps::c_InstanceHandle_Unknown); - ASSERT_TRUE(writer.unregister_instance(data.back(), eprosima::fastrtps::rtps::c_InstanceHandle_Unknown)); - ASSERT_FALSE(writer.unregister_instance(data.back(), eprosima::fastrtps::rtps::c_InstanceHandle_Unknown)); - EXPECT_NE(writer.register_instance(data.front()), eprosima::fastrtps::rtps::c_InstanceHandle_Unknown); + ASSERT_TRUE(writer.unregister_instance(data.back(), eprosima::fastdds::rtps::c_InstanceHandle_Unknown)); + ASSERT_FALSE(writer.unregister_instance(data.back(), eprosima::fastdds::rtps::c_InstanceHandle_Unknown)); + EXPECT_NE(writer.register_instance(data.front()), eprosima::fastdds::rtps::c_InstanceHandle_Unknown); } TEST(KeyedTopic, RegistrationAfterDispose) @@ -148,14 +148,14 @@ TEST(KeyedTopic, RegistrationAfterDispose) // Register instances. auto instance_handle_1 = writer.register_instance(data.front()); - EXPECT_NE(instance_handle_1, eprosima::fastrtps::rtps::c_InstanceHandle_Unknown); - EXPECT_EQ(writer.register_instance(data.back()), eprosima::fastrtps::rtps::c_InstanceHandle_Unknown); + EXPECT_NE(instance_handle_1, eprosima::fastdds::rtps::c_InstanceHandle_Unknown); + EXPECT_EQ(writer.register_instance(data.back()), eprosima::fastdds::rtps::c_InstanceHandle_Unknown); ASSERT_TRUE(writer.dispose(data.front(), instance_handle_1)); - EXPECT_EQ(writer.register_instance(data.back()), eprosima::fastrtps::rtps::c_InstanceHandle_Unknown); + EXPECT_EQ(writer.register_instance(data.back()), eprosima::fastdds::rtps::c_InstanceHandle_Unknown); ASSERT_TRUE(writer.unregister_instance(data.front(), instance_handle_1)); - EXPECT_NE(writer.register_instance(data.back()), eprosima::fastrtps::rtps::c_InstanceHandle_Unknown); + EXPECT_NE(writer.register_instance(data.back()), eprosima::fastdds::rtps::c_InstanceHandle_Unknown); } TEST(KeyedTopic, UnregisterWhenHistoryKeepAll) @@ -196,7 +196,7 @@ TEST(KeyedTopic, DataWriterAlwaysSendTheSerializedKeyViaInlineQoS) bool writer_sends_pid_key_hash = true; testTransport->drop_data_messages_filter_ = [&writer_sends_inline_qos, - &writer_sends_pid_key_hash](eprosima::fastrtps::rtps::CDRMessage_t& msg) -> bool + &writer_sends_pid_key_hash](eprosima::fastdds::rtps::CDRMessage_t& msg) -> bool { // Check for inline_qos uint8_t flags = msg.buffer[msg.pos - 3]; @@ -205,7 +205,7 @@ TEST(KeyedTopic, DataWriterAlwaysSendTheSerializedKeyViaInlineQoS) // Skip extraFlags, read octetsToInlineQos, and calculate inline qos position. msg.pos += 2; uint16_t to_inline_qos = 0; - eprosima::fastrtps::rtps::CDRMessage::readUInt16(&msg, &to_inline_qos); + eprosima::fastdds::rtps::CDRMessage::readUInt16(&msg, &to_inline_qos); uint32_t inline_qos_pos = msg.pos + to_inline_qos; // Filters are only applied to user data @@ -229,8 +229,8 @@ TEST(KeyedTopic, DataWriterAlwaysSendTheSerializedKeyViaInlineQoS) uint16_t pid = 0; uint16_t plen = 0; - eprosima::fastrtps::rtps::CDRMessage::readUInt16(&msg, &pid); - eprosima::fastrtps::rtps::CDRMessage::readUInt16(&msg, &plen); + eprosima::fastdds::rtps::CDRMessage::readUInt16(&msg, &pid); + eprosima::fastdds::rtps::CDRMessage::readUInt16(&msg, &plen); uint32_t next_pos = msg.pos + plen; if (pid == eprosima::fastdds::dds::PID_KEY_HASH) @@ -311,7 +311,7 @@ TEST(KeyedTopic, DataWriterAlwaysSendTheSerializedKeyViaInlineQoS) // Register instances. auto instance_handle_1 = writer.register_instance(data.front()); - EXPECT_NE(instance_handle_1, eprosima::fastrtps::rtps::c_InstanceHandle_Unknown); + EXPECT_NE(instance_handle_1, eprosima::fastdds::rtps::c_InstanceHandle_Unknown); reader.startReception(data); // Send data @@ -326,7 +326,7 @@ TEST(KeyedTopic, DataWriterAlwaysSendTheSerializedKeyViaInlineQoS) ASSERT_TRUE(writer.unregister_instance(data2.front(), instance_handle_1)); auto instance_handle_2 = writer.register_instance(data.back()); - EXPECT_NE(instance_handle_2, eprosima::fastrtps::rtps::c_InstanceHandle_Unknown); + EXPECT_NE(instance_handle_2, eprosima::fastdds::rtps::c_InstanceHandle_Unknown); writer.send(data); // In this test all data should be sent. @@ -362,7 +362,7 @@ TEST(KeyedTopic, DataWriterAlwaysSendTheSerializedKeyViaInlineQoS) // Register instances. auto instance_handle_1 = writer.register_instance(data.front()); - EXPECT_NE(instance_handle_1, eprosima::fastrtps::rtps::c_InstanceHandle_Unknown); + EXPECT_NE(instance_handle_1, eprosima::fastdds::rtps::c_InstanceHandle_Unknown); reader.startReception(data); // Send data @@ -377,12 +377,12 @@ TEST(KeyedTopic, DataWriterAlwaysSendTheSerializedKeyViaInlineQoS) auto instance_handle_2 = writer.register_instance(data.back()); // Is it deterministic? - EXPECT_EQ(instance_handle_2, eprosima::fastrtps::rtps::c_InstanceHandle_Unknown); + EXPECT_EQ(instance_handle_2, eprosima::fastdds::rtps::c_InstanceHandle_Unknown); writer.waitForAllAcked(std::chrono::milliseconds(100)); instance_handle_2 = writer.register_instance(data.back()); - EXPECT_NE(instance_handle_2, eprosima::fastrtps::rtps::c_InstanceHandle_Unknown); + EXPECT_NE(instance_handle_2, eprosima::fastdds::rtps::c_InstanceHandle_Unknown); writer.send(data); // In this test all data should be sent. diff --git a/test/blackbox/common/BlackboxTestsLatencyBudgetQos.cpp b/test/blackbox/common/BlackboxTestsLatencyBudgetQos.cpp index e6d770cc8b3..fd67ad1f49b 100644 --- a/test/blackbox/common/BlackboxTestsLatencyBudgetQos.cpp +++ b/test/blackbox/common/BlackboxTestsLatencyBudgetQos.cpp @@ -22,8 +22,8 @@ TEST(LatencyBudgetQos, DurationCheck) { ReqRepHelloWorldRequester requester; - eprosima::fastrtps::Duration_t latency_budget_pub(10); - eprosima::fastrtps::Duration_t latency_budget_sub(20); + eprosima::fastdds::Duration_t latency_budget_pub(10); + eprosima::fastdds::Duration_t latency_budget_sub(20); requester.init_with_latency(latency_budget_pub, latency_budget_sub); diff --git a/test/blackbox/common/BlackboxTestsLifespanQoS.cpp b/test/blackbox/common/BlackboxTestsLifespanQoS.cpp index d4656d832d2..a3cdb1b0b19 100644 --- a/test/blackbox/common/BlackboxTestsLifespanQoS.cpp +++ b/test/blackbox/common/BlackboxTestsLifespanQoS.cpp @@ -22,8 +22,8 @@ #include "ReqRepAsReliableHelloWorldReplier.hpp" #include "ReqRepAsReliableHelloWorldRequester.hpp" -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; enum communication_type { diff --git a/test/blackbox/common/BlackboxTestsLivelinessQos.cpp b/test/blackbox/common/BlackboxTestsLivelinessQos.cpp index 3c4c1dcc5b2..d48adbd040a 100644 --- a/test/blackbox/common/BlackboxTestsLivelinessQos.cpp +++ b/test/blackbox/common/BlackboxTestsLivelinessQos.cpp @@ -28,8 +28,8 @@ #include -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; enum communication_type { @@ -1963,7 +1963,7 @@ TEST(LivelinessTests, Reader_Successfully_Asserts_Liveliness_on_a_Disconnected_W reader.init_participant(); // Define the reader's lease duration in 1.6 secs - reader.sub_liveliness_lease_duration(eprosima::fastrtps::Time_t(1, 600000000)); + reader.sub_liveliness_lease_duration(eprosima::fastdds::Time_t(1, 600000000)); // Create Subscribers and readers, one for each writer reader.sub_topic_name(TEST_TOPIC_NAME); @@ -1975,15 +1975,15 @@ TEST(LivelinessTests, Reader_Successfully_Asserts_Liveliness_on_a_Disconnected_W writer_1.disable_builtin_transport() .lease_duration(c_TimeInfinite, 1) .add_user_transport_to_pparams(testTransport) - .liveliness_lease_duration(eprosima::fastrtps::Time_t(1, 0)) + .liveliness_lease_duration(eprosima::fastdds::Time_t(1, 0)) .liveliness_kind(eprosima::fastdds::dds::AUTOMATIC_LIVELINESS_QOS) - .liveliness_announcement_period(eprosima::fastrtps::Time_t(0, 500000000)) + .liveliness_announcement_period(eprosima::fastdds::Time_t(0, 500000000)) .init(); writer_2.lease_duration(c_TimeInfinite, 1) - .liveliness_lease_duration(eprosima::fastrtps::Time_t(1, 0)) + .liveliness_lease_duration(eprosima::fastdds::Time_t(1, 0)) .liveliness_kind(eprosima::fastdds::dds::AUTOMATIC_LIVELINESS_QOS) - .liveliness_announcement_period(eprosima::fastrtps::Time_t(0, 500000000)) + .liveliness_announcement_period(eprosima::fastdds::Time_t(0, 500000000)) .init(); // Wait for discovery to occur. Liveliness should be recovered twice, @@ -2011,7 +2011,7 @@ TEST(LivelinessTests, correct_liveliness_state_one_writer_multiple_readers) reader.init_participant(); // Define the reader's lease duration in 1.6 secs - reader.sub_liveliness_lease_duration(eprosima::fastrtps::Time_t(1, 600000000)); + reader.sub_liveliness_lease_duration(eprosima::fastdds::Time_t(1, 600000000)); // Both readers on the same topic reader.sub_topic_name(TEST_TOPIC_NAME); @@ -2023,9 +2023,9 @@ TEST(LivelinessTests, correct_liveliness_state_one_writer_multiple_readers) // Create writers writer.lease_duration(c_TimeInfinite, 1) - .liveliness_lease_duration(eprosima::fastrtps::Time_t(1, 0)) + .liveliness_lease_duration(eprosima::fastdds::Time_t(1, 0)) .liveliness_kind(eprosima::fastdds::dds::AUTOMATIC_LIVELINESS_QOS) - .liveliness_announcement_period(eprosima::fastrtps::Time_t(0, 500000000)) + .liveliness_announcement_period(eprosima::fastdds::Time_t(0, 500000000)) .init(); // Wait for discovery to occur. Liveliness should be recovered twice, diff --git a/test/blackbox/common/BlackboxTestsNetworkConf.cpp b/test/blackbox/common/BlackboxTestsNetworkConf.cpp index bfd907d04e6..0dd775be1cd 100644 --- a/test/blackbox/common/BlackboxTestsNetworkConf.cpp +++ b/test/blackbox/common/BlackboxTestsNetworkConf.cpp @@ -24,8 +24,8 @@ #include "PubSubWriter.hpp" #include "PubSubParticipant.hpp" -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; enum communication_type { diff --git a/test/blackbox/common/BlackboxTestsPubSubBasic.cpp b/test/blackbox/common/BlackboxTestsPubSubBasic.cpp index 029e80c573e..60191498e27 100644 --- a/test/blackbox/common/BlackboxTestsPubSubBasic.cpp +++ b/test/blackbox/common/BlackboxTestsPubSubBasic.cpp @@ -31,8 +31,8 @@ #include "ReqRepAsReliableHelloWorldReplier.hpp" #include "ReqRepAsReliableHelloWorldRequester.hpp" -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; enum communication_type { diff --git a/test/blackbox/common/BlackboxTestsPubSubFlowControllers.cpp b/test/blackbox/common/BlackboxTestsPubSubFlowControllers.cpp index c863a4e5d05..3de86bdf621 100644 --- a/test/blackbox/common/BlackboxTestsPubSubFlowControllers.cpp +++ b/test/blackbox/common/BlackboxTestsPubSubFlowControllers.cpp @@ -21,8 +21,8 @@ #include "PubSubWriter.hpp" #include "PubSubWriterReader.hpp" -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; class PubSubFlowControllers : public testing::TestWithParam { @@ -181,18 +181,18 @@ TEST_P(PubSubFlowControllers, AsyncMultipleWritersFlowController64kb) ASSERT_TRUE(entities.isInitialized()); // Create second writer. - eprosima::fastrtps::rtps::PropertySeq writers2_properties; - eprosima::fastrtps::rtps::Property priority; + eprosima::fastdds::rtps::PropertySeq writers2_properties; + eprosima::fastdds::rtps::Property priority; priority.name("fastdds.sfc.priority"); priority.value("-1"); writers2_properties.push_back(priority); - eprosima::fastrtps::rtps::Property bandwidth_limit; + eprosima::fastdds::rtps::Property bandwidth_limit; bandwidth_limit.name("fastdds.sfc.bandwidth_reservation"); bandwidth_limit.value("10"); writers2_properties.push_back(bandwidth_limit); ASSERT_TRUE(entities.create_additional_topics(1, "/", writers2_properties)); - eprosima::fastrtps::rtps::PropertySeq writers3_properties; + eprosima::fastdds::rtps::PropertySeq writers3_properties; priority.name("fastdds.sfc.priority"); priority.value("1"); writers3_properties.push_back(priority); @@ -201,7 +201,7 @@ TEST_P(PubSubFlowControllers, AsyncMultipleWritersFlowController64kb) writers3_properties.push_back(bandwidth_limit); ASSERT_TRUE(entities.create_additional_topics(1, "/", writers3_properties)); - eprosima::fastrtps::rtps::PropertySeq writers4_properties; + eprosima::fastdds::rtps::PropertySeq writers4_properties; priority.name("fastdds.sfc.priority"); priority.value("4"); writers4_properties.push_back(priority); diff --git a/test/blackbox/common/BlackboxTestsPubSubFragments.cpp b/test/blackbox/common/BlackboxTestsPubSubFragments.cpp index 747022df0ba..384b461833b 100644 --- a/test/blackbox/common/BlackboxTestsPubSubFragments.cpp +++ b/test/blackbox/common/BlackboxTestsPubSubFragments.cpp @@ -25,10 +25,8 @@ #include "PubSubReader.hpp" #include "PubSubWriter.hpp" -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; -using test_UDPv4Transport = eprosima::fastdds::rtps::test_UDPv4Transport; -using test_UDPv4TransportDescriptor = eprosima::fastdds::rtps::test_UDPv4TransportDescriptor; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; enum communication_type { @@ -123,7 +121,7 @@ class PubSubFragments : public testing::TestWithParam if (0 < loss_rate) { testTransport->drop_data_frag_messages_filter_ = - [&fragment_count, loss_rate](eprosima::fastrtps::rtps::CDRMessage_t& msg)->bool + [&fragment_count, loss_rate](eprosima::fastdds::rtps::CDRMessage_t& msg)->bool { static_cast(msg); @@ -662,7 +660,7 @@ TEST(PubSubFragmentsLimited, reader.history_depth(2) .expect_inline_qos(true) - .reliability(eprosima::fastrtps::RELIABLE_RELIABILITY_QOS) + .reliability(eprosima::fastdds::RELIABLE_RELIABILITY_QOS) .init(); ASSERT_TRUE(reader.isInitialized()); @@ -686,7 +684,7 @@ TEST(PubSubFragmentsLimited, .heartbeat_period_seconds(0) .heartbeat_period_nanosec(1000000) .history_depth(1) - .asynchronously(eprosima::fastrtps::ASYNCHRONOUS_PUBLISH_MODE).init(); + .asynchronously(eprosima::fastdds::ASYNCHRONOUS_PUBLISH_MODE).init(); ASSERT_TRUE(writer.isInitialized()); diff --git a/test/blackbox/common/BlackboxTestsPubSubHistory.cpp b/test/blackbox/common/BlackboxTestsPubSubHistory.cpp index f8c894e1ac5..aa764865534 100644 --- a/test/blackbox/common/BlackboxTestsPubSubHistory.cpp +++ b/test/blackbox/common/BlackboxTestsPubSubHistory.cpp @@ -27,7 +27,7 @@ #include "PubSubReader.hpp" #include "PubSubWriter.hpp" -using namespace eprosima::fastrtps; +using namespace eprosima::fastdds; using namespace eprosima::fastdds::rtps; enum communication_type @@ -1055,7 +1055,7 @@ TEST_P(PubSubHistory, ReliableTransientLocalKeepLast1) std::this_thread::sleep_for(std::chrono::milliseconds(500)); reader.startReception(expected_data); - eprosima::fastrtps::rtps::SequenceNumber_t seq; + eprosima::fastdds::rtps::SequenceNumber_t seq; seq.low = 10; reader.block_for_seq(seq); @@ -1101,7 +1101,7 @@ TEST_P(PubSubHistory, ReliableTransientLocalKeepLast1Data300Kb) reader.wait_discovery(); reader.startReception(reader_data); - eprosima::fastrtps::rtps::SequenceNumber_t seq; + eprosima::fastdds::rtps::SequenceNumber_t seq; seq.low = 10; reader.block_for_seq(seq); @@ -1330,7 +1330,7 @@ TEST(PubSubHistory, ReliableUnmatchWithFutureChanges) std::atomic_bool drop_heartbeat {false}; auto testTransport = std::make_shared(); - testTransport->drop_data_messages_filter_ = [&drop_data](eprosima::fastrtps::rtps::CDRMessage_t& msg) + testTransport->drop_data_messages_filter_ = [&drop_data](eprosima::fastdds::rtps::CDRMessage_t& msg) -> bool { auto old_pos = msg.pos; @@ -1339,19 +1339,19 @@ TEST(PubSubHistory, ReliableUnmatchWithFutureChanges) msg.pos += 2 + 2 + 4; // Read writer entity id - eprosima::fastrtps::rtps::GUID_t writer_guid; - eprosima::fastrtps::rtps::CDRMessage::readEntityId(&msg, &writer_guid.entityId); + eprosima::fastdds::rtps::GUID_t writer_guid; + eprosima::fastdds::rtps::CDRMessage::readEntityId(&msg, &writer_guid.entityId); msg.pos = old_pos; return drop_data && !writer_guid.is_builtin(); }; - testTransport->drop_heartbeat_messages_filter_ = [&drop_heartbeat](eprosima::fastrtps::rtps::CDRMessage_t& msg) + testTransport->drop_heartbeat_messages_filter_ = [&drop_heartbeat](eprosima::fastdds::rtps::CDRMessage_t& msg) -> bool { auto old_pos = msg.pos; msg.pos += 4; - eprosima::fastrtps::rtps::GUID_t writer_guid; - eprosima::fastrtps::rtps::CDRMessage::readEntityId(&msg, &writer_guid.entityId); + eprosima::fastdds::rtps::GUID_t writer_guid; + eprosima::fastdds::rtps::CDRMessage::readEntityId(&msg, &writer_guid.entityId); msg.pos = old_pos; return drop_heartbeat && !writer_guid.is_builtin(); diff --git a/test/blackbox/common/BlackboxTestsRealtimeAllocations.cpp b/test/blackbox/common/BlackboxTestsRealtimeAllocations.cpp index 1c19d1bfb2d..9a6ceb48be3 100644 --- a/test/blackbox/common/BlackboxTestsRealtimeAllocations.cpp +++ b/test/blackbox/common/BlackboxTestsRealtimeAllocations.cpp @@ -20,8 +20,8 @@ #include "PubSubReader.hpp" #include "PubSubWriter.hpp" -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; enum communication_type { diff --git a/test/blackbox/common/BlackboxTestsReliability.cpp b/test/blackbox/common/BlackboxTestsReliability.cpp index 871a4f18e4e..6a0da87575a 100644 --- a/test/blackbox/common/BlackboxTestsReliability.cpp +++ b/test/blackbox/common/BlackboxTestsReliability.cpp @@ -23,10 +23,8 @@ #include "PubSubReader.hpp" #include "PubSubWriter.hpp" -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; -using test_UDPv4Transport = eprosima::fastdds::rtps::test_UDPv4Transport; -using test_UDPv4TransportDescriptor = eprosima::fastdds::rtps::test_UDPv4TransportDescriptor; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; void reliability_disable_heartbeat_piggyback( bool disable_heartbeat_piggyback) diff --git a/test/blackbox/common/BlackboxTestsSecurity.cpp b/test/blackbox/common/BlackboxTestsSecurity.cpp index a81a5fa3a1e..ddaea131c24 100644 --- a/test/blackbox/common/BlackboxTestsSecurity.cpp +++ b/test/blackbox/common/BlackboxTestsSecurity.cpp @@ -37,10 +37,8 @@ #include "PubSubWriterReader.hpp" #include "UDPMessageSender.hpp" -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; -using test_UDPv4Transport = eprosima::fastdds::rtps::test_UDPv4Transport; -using test_UDPv4TransportDescriptor = eprosima::fastdds::rtps::test_UDPv4TransportDescriptor; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; enum communication_type { @@ -515,7 +513,7 @@ TEST(Security, BuiltinAuthenticationPlugin_second_participant_creation_loop) // Prepare transport to check that the authentication message is sent auto transport = std::make_shared(); AuthMessageSendStatus auth_message_send_status; - transport->drop_data_messages_filter_ = [&auth_message_send_status](eprosima::fastrtps::rtps::CDRMessage_t& msg) + transport->drop_data_messages_filter_ = [&auth_message_send_status](eprosima::fastdds::rtps::CDRMessage_t& msg) -> bool { auto old_pos = msg.pos; @@ -524,11 +522,11 @@ TEST(Security, BuiltinAuthenticationPlugin_second_participant_creation_loop) msg.pos += 2 + 2 + 4; // Read writer entity id - eprosima::fastrtps::rtps::GUID_t writer_guid; - eprosima::fastrtps::rtps::CDRMessage::readEntityId(&msg, &writer_guid.entityId); + eprosima::fastdds::rtps::GUID_t writer_guid; + eprosima::fastdds::rtps::CDRMessage::readEntityId(&msg, &writer_guid.entityId); msg.pos = old_pos; - if (writer_guid.entityId == eprosima::fastrtps::rtps::participant_stateless_message_writer_entity_id) + if (writer_guid.entityId == eprosima::fastdds::rtps::participant_stateless_message_writer_entity_id) { auth_message_send_status.notify(); } @@ -629,7 +627,7 @@ TEST_P(Security, BuiltinAuthenticationPlugin_ensure_same_guid_reconnection) main_participant.property_policy(property_policy).init(); EXPECT_TRUE(main_participant.isInitialized()); - eprosima::fastrtps::rtps::GuidPrefix_t guid_prefix; + eprosima::fastdds::rtps::GuidPrefix_t guid_prefix; memset(guid_prefix.value, 0xBB, sizeof(guid_prefix.value)); // Perform a loop in which we create another participant, and destroy it just after it has been discovered. @@ -3300,13 +3298,13 @@ TEST_P(Security, BuiltinAuthenticationAndAccessAndCryptoPlugin_Permissions_valid // Initialize one reader on each partition reader_p_1.partition("Partition1"). - reliability(eprosima::fastrtps::RELIABLE_RELIABILITY_QOS). + reliability(eprosima::fastdds::RELIABLE_RELIABILITY_QOS). property_policy(sub_property_policy). init(); ASSERT_TRUE(reader_p_1.isInitialized()); reader_p_2.partition("Partition2"). - reliability(eprosima::fastrtps::RELIABLE_RELIABILITY_QOS). + reliability(eprosima::fastdds::RELIABLE_RELIABILITY_QOS). property_policy(sub_property_policy). init(); ASSERT_TRUE(reader_p_2.isInitialized()); diff --git a/test/blackbox/common/BlackboxTestsTransportCustom.cpp b/test/blackbox/common/BlackboxTestsTransportCustom.cpp index f9be8625886..30541f7ef87 100644 --- a/test/blackbox/common/BlackboxTestsTransportCustom.cpp +++ b/test/blackbox/common/BlackboxTestsTransportCustom.cpp @@ -70,11 +70,11 @@ class TestChainingTransport : public eprosima::fastdds::rtps::ChainingTransport } bool init( - const eprosima::fastrtps::rtps::PropertyPolicy* properties = nullptr, + const eprosima::fastdds::rtps::PropertyPolicy* properties = nullptr, const uint32_t& max_msg_size_no_frag = 0) override { const std::string* value = - eprosima::fastrtps::rtps::PropertyPolicyHelper::find_property(*properties, test_property_name); + eprosima::fastdds::rtps::PropertyPolicyHelper::find_property(*properties, test_property_name); if (value && 0 == value->compare(test_property_value)) { descriptor_.init_function_called(); @@ -83,11 +83,11 @@ class TestChainingTransport : public eprosima::fastdds::rtps::ChainingTransport } bool send( - eprosima::fastrtps::rtps::SenderResource* low_sender_resource, + eprosima::fastdds::rtps::SenderResource* low_sender_resource, const std::vector& buffers, uint32_t total_bytes, - eprosima::fastrtps::rtps::LocatorsIterator* destination_locators_begin, - eprosima::fastrtps::rtps::LocatorsIterator* destination_locators_end, + eprosima::fastdds::rtps::LocatorsIterator* destination_locators_begin, + eprosima::fastdds::rtps::LocatorsIterator* destination_locators_end, const std::chrono::steady_clock::time_point& timeout) override { descriptor_.send_function_called(); @@ -99,10 +99,10 @@ class TestChainingTransport : public eprosima::fastdds::rtps::ChainingTransport void receive( eprosima::fastdds::rtps::TransportReceiverInterface* next_receiver, - const eprosima::fastrtps::rtps::octet* receive_buffer, + const eprosima::fastdds::rtps::octet* receive_buffer, uint32_t receive_buffer_size, - const eprosima::fastrtps::rtps::Locator_t& local_locator, - const eprosima::fastrtps::rtps::Locator_t& remote_locator) override + const eprosima::fastdds::rtps::Locator_t& local_locator, + const eprosima::fastdds::rtps::Locator_t& remote_locator) override { descriptor_.receive_function_called(); @@ -316,7 +316,7 @@ TEST(ChainingTransportTests, basic_test) bool reader_init_function_called = false; bool reader_receive_function_called = false; bool reader_send_function_called = false; - eprosima::fastrtps::rtps::PropertyPolicy test_property_policy; + eprosima::fastdds::rtps::PropertyPolicy test_property_policy; test_property_policy.properties().push_back({test_property_name, test_property_value}); std::shared_ptr udp_transport = std::make_shared(); std::shared_ptr writer_transport = @@ -398,7 +398,7 @@ TEST(ChainingTransportTests, tcp_client_server_with_wan_correct_sender_resources std::atomic times_reader_receive_function_called{0}; std::atomic times_reader_send_function_called{0}; - eprosima::fastrtps::rtps::PropertyPolicy test_property_policy; + eprosima::fastdds::rtps::PropertyPolicy test_property_policy; test_property_policy.properties().push_back({test_property_name, test_property_value}); uint16_t port = static_cast(GET_PID()); @@ -414,8 +414,8 @@ TEST(ChainingTransportTests, tcp_client_server_with_wan_correct_sender_resources reader_tcp_transport->set_WAN_address("127.0.0.1"); reader_tcp_transport->listening_ports.push_back(port); - eprosima::fastrtps::rtps::LocatorList_t reader_locators; - eprosima::fastrtps::rtps::Locator_t reader_loc; + eprosima::fastdds::rtps::LocatorList_t reader_locators; + eprosima::fastdds::rtps::Locator_t reader_loc; reader_loc.port = port; IPLocator::setIPv4(reader_loc, "127.0.0.1"); reader_loc.kind = LOCATOR_KIND_TCPv4; @@ -457,7 +457,7 @@ TEST(ChainingTransportTests, tcp_client_server_with_wan_correct_sender_resources PubSubWriter writer(TEST_TOPIC_NAME); PubSubReader reader(TEST_TOPIC_NAME); - eprosima::fastrtps::rtps::LocatorList_t initial_peers; + eprosima::fastdds::rtps::LocatorList_t initial_peers; initial_peers.push_back(reader_loc); writer.disable_builtin_transport() diff --git a/test/blackbox/common/BlackboxTestsTransportSHM.cpp b/test/blackbox/common/BlackboxTestsTransportSHM.cpp index 71bc97a30c4..5863fbc128b 100644 --- a/test/blackbox/common/BlackboxTestsTransportSHM.cpp +++ b/test/blackbox/common/BlackboxTestsTransportSHM.cpp @@ -29,12 +29,7 @@ #include #include -using namespace eprosima::fastrtps; - -using SharedMemTransportDescriptor = eprosima::fastdds::rtps::SharedMemTransportDescriptor; -using test_SharedMemTransportDescriptor = eprosima::fastdds::rtps::test_SharedMemTransportDescriptor; -using Locator = eprosima::fastdds::rtps::Locator; -using LocatorList = eprosima::fastdds::rtps::LocatorList; +using namespace eprosima::fastdds; TEST(SHM, TransportPubSub) { @@ -44,7 +39,7 @@ TEST(SHM, TransportPubSub) // Number of samples written by writer uint32_t writer_samples = 15; - auto testTransport = std::make_shared(); + auto testTransport = std::make_shared(); writer.reliability(eprosima::fastdds::dds::RELIABLE_RELIABILITY_QOS); writer.disable_builtin_transport(). @@ -88,12 +83,12 @@ TEST(SHM, SamePortUnicastMulticast) { PubSubReader participant(TEST_TOPIC_NAME); - Locator locator; + eprosima::fastdds::rtps::Locator locator; locator.kind = LOCATOR_KIND_SHM; locator.port = global_port; - LocatorList unicast_list; - LocatorList multicast_list; + eprosima::fastdds::rtps::LocatorList unicast_list; + eprosima::fastdds::rtps::LocatorList multicast_list; // Note: this is using knowledge of the SHM locator address format since // SHMLocator is not exposed to the user. @@ -106,7 +101,7 @@ TEST(SHM, SamePortUnicastMulticast) multicast_list.push_back(locator); // Create the reader with the custom transport and locators - auto testTransport = std::make_shared(); + auto testTransport = std::make_shared(); participant .disable_builtin_transport() .add_user_transport_to_pparams(testTransport) @@ -117,7 +112,7 @@ TEST(SHM, SamePortUnicastMulticast) ASSERT_TRUE(participant.isInitialized()); // Retrieve the listening locators and check that one port is different - LocatorList reader_locators; + eprosima::fastdds::rtps::LocatorList reader_locators; participant.get_native_reader().get_listening_locators(reader_locators); ASSERT_LE(reader_locators.size(), 2u); @@ -156,7 +151,7 @@ TEST(SHM, IgnoreNonExistentSegment) .durability_kind(eprosima::fastdds::dds::TRANSIENT_LOCAL_DURABILITY_QOS) .history_kind(eprosima::fastdds::dds::KEEP_ALL_HISTORY_QOS) .disable_builtin_transport() - .add_user_transport_to_pparams(std::make_shared()) + .add_user_transport_to_pparams(std::make_shared()) .init(); ASSERT_TRUE(writer.isInitialized()); @@ -165,7 +160,7 @@ TEST(SHM, IgnoreNonExistentSegment) .durability_kind(eprosima::fastdds::dds::TRANSIENT_LOCAL_DURABILITY_QOS) .history_kind(eprosima::fastdds::dds::KEEP_ALL_HISTORY_QOS) .disable_builtin_transport() - .add_user_transport_to_pparams(std::make_shared()) + .add_user_transport_to_pparams(std::make_shared()) .init(); ASSERT_TRUE(reader.isInitialized()); @@ -195,7 +190,7 @@ TEST(SHM, IgnoreNonExistentSegment) .asynchronously(eprosima::fastdds::dds::SYNCHRONOUS_PUBLISH_MODE) .reliability(eprosima::fastdds::dds::RELIABLE_RELIABILITY_QOS) .disable_builtin_transport() - .add_user_transport_to_pparams(std::make_shared()) + .add_user_transport_to_pparams(std::make_shared()) .init(); ASSERT_TRUE(late_writer.isInitialized()); } @@ -228,7 +223,7 @@ TEST(SHM, Test300KFragmentation) auto data = default_data300kb_data_generator(1); auto data_size = data.front().data().size(); - auto shm_transport = std::make_shared(); + auto shm_transport = std::make_shared(); const uint32_t segment_size = static_cast(data_size * 3 / 4); shm_transport->segment_size(segment_size); shm_transport->max_message_size(segment_size); @@ -280,7 +275,7 @@ TEST(SHM, Test300KNoFragmentation) auto data = default_data300kb_data_generator(1); auto data_size = data.front().data().size(); - auto shm_transport = std::make_shared(); + auto shm_transport = std::make_shared(); const uint32_t segment_size = 1024 * 1024; shm_transport->segment_size(segment_size); shm_transport->max_message_size(segment_size); @@ -338,7 +333,7 @@ TEST(SHM, SHM_UDP_300KFragmentation) // Number of samples written by writer uint32_t writer_samples = 1; - auto shm_transport = std::make_shared(); + auto shm_transport = std::make_shared(); const uint32_t segment_size = 1024 * 1024; shm_transport->segment_size(segment_size); shm_transport->max_message_size(segment_size); @@ -402,7 +397,7 @@ TEST(SHM, UDPvsSHM_UDP) // Number of samples written by writer uint32_t writer_samples = 1; - auto shm_transport = std::make_shared(); + auto shm_transport = std::make_shared(); const uint32_t segment_size = 1024 * 1024; shm_transport->segment_size(segment_size); shm_transport->max_message_size(segment_size); @@ -464,7 +459,7 @@ TEST(SHM, SHM_UDPvsUDP) // Number of samples written by writer uint32_t writer_samples = 1; - auto shm_transport = std::make_shared(); + auto shm_transport = std::make_shared(); const uint32_t segment_size = 1024 * 1024; shm_transport->segment_size(segment_size); shm_transport->max_message_size(segment_size); @@ -513,8 +508,8 @@ TEST(SHM, SHM_UDPvsUDP) TEST(BlackBox, SHM_equal_operator) { // SharedMemTransportDescriptor - SharedMemTransportDescriptor shm_transport_1; - SharedMemTransportDescriptor shm_transport_2; + eprosima::fastdds::rtps::SharedMemTransportDescriptor shm_transport_1; + eprosima::fastdds::rtps::SharedMemTransportDescriptor shm_transport_2; // Compare equal in defult values ASSERT_EQ(shm_transport_1, shm_transport_2); @@ -539,18 +534,18 @@ TEST(BlackBox, SHM_equal_operator) // Test copy constructor and copy assignment TEST(SHM, SHM_copy) { - SharedMemTransportDescriptor shm_transport; + eprosima::fastdds::rtps::SharedMemTransportDescriptor shm_transport; shm_transport.segment_size(shm_transport.segment_size() * 10u); // change default value shm_transport.max_message_size(shm_transport.max_message_size() + 20u); // change default value shm_transport.healthy_check_timeout_ms(shm_transport.healthy_check_timeout_ms() - 30u); // change default value shm_transport.rtps_dump_file("test"); // change default value // Copy constructor - SharedMemTransportDescriptor shm_transport_copy_constructor(shm_transport); + eprosima::fastdds::rtps::SharedMemTransportDescriptor shm_transport_copy_constructor(shm_transport); EXPECT_EQ(shm_transport_copy_constructor, shm_transport); // Copy assignment - SharedMemTransportDescriptor shm_transport_copy = shm_transport; + eprosima::fastdds::rtps::SharedMemTransportDescriptor shm_transport_copy = shm_transport; EXPECT_EQ(shm_transport_copy, shm_transport); } diff --git a/test/blackbox/common/BlackboxTestsTransportTCP.cpp b/test/blackbox/common/BlackboxTestsTransportTCP.cpp index 538e65898a8..5c6e8489834 100644 --- a/test/blackbox/common/BlackboxTestsTransportTCP.cpp +++ b/test/blackbox/common/BlackboxTestsTransportTCP.cpp @@ -29,8 +29,8 @@ #include "PubSubWriter.hpp" #include "DatagramInjectionTransport.hpp" -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; enum communication_type { @@ -765,17 +765,17 @@ TEST_P(TransportTCP, large_data_topology) // Reliable Keep_all to wait for all acked as end condition for (uint16_t i = 0; i < n_participants; i++) { - writers[i]->reliability(eprosima::fastrtps::RELIABLE_RELIABILITY_QOS) - .history_kind(eprosima::fastrtps::KEEP_ALL_HISTORY_QOS) - .durability_kind(eprosima::fastrtps::TRANSIENT_LOCAL_DURABILITY_QOS) - .lease_duration(eprosima::fastrtps::c_TimeInfinite, eprosima::fastrtps::Duration_t(3, 0)) + writers[i]->reliability(eprosima::fastdds::RELIABLE_RELIABILITY_QOS) + .history_kind(eprosima::fastdds::KEEP_ALL_HISTORY_QOS) + .durability_kind(eprosima::fastdds::TRANSIENT_LOCAL_DURABILITY_QOS) + .lease_duration(eprosima::fastdds::c_TimeInfinite, eprosima::fastdds::Duration_t(3, 0)) .resource_limits_max_instances(1) .resource_limits_max_samples_per_instance(samples_per_participant); - readers[i]->reliability(eprosima::fastrtps::RELIABLE_RELIABILITY_QOS) - .history_kind(eprosima::fastrtps::KEEP_ALL_HISTORY_QOS) - .durability_kind(eprosima::fastrtps::TRANSIENT_LOCAL_DURABILITY_QOS) - .lease_duration(eprosima::fastrtps::c_TimeInfinite, eprosima::fastrtps::Duration_t(3, 0)) + readers[i]->reliability(eprosima::fastdds::RELIABLE_RELIABILITY_QOS) + .history_kind(eprosima::fastdds::KEEP_ALL_HISTORY_QOS) + .durability_kind(eprosima::fastdds::TRANSIENT_LOCAL_DURABILITY_QOS) + .lease_duration(eprosima::fastdds::c_TimeInfinite, eprosima::fastdds::Duration_t(3, 0)) .resource_limits_max_instances(n_participants) .resource_limits_max_samples_per_instance(samples_per_participant); diff --git a/test/blackbox/common/BlackboxTestsTransportUDP.cpp b/test/blackbox/common/BlackboxTestsTransportUDP.cpp index 3cf325e7566..df9e27b073e 100644 --- a/test/blackbox/common/BlackboxTestsTransportUDP.cpp +++ b/test/blackbox/common/BlackboxTestsTransportUDP.cpp @@ -29,8 +29,8 @@ #include "PubSubWriter.hpp" #include "UDPMessageSender.hpp" -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; enum communication_type { @@ -69,11 +69,11 @@ class TransportUDP : public testing::TestWithParam writer(TEST_TOPIC_NAME); // Disallow multicast discovery - eprosima::fastrtps::rtps::LocatorList_t loc; + eprosima::fastdds::rtps::LocatorList_t loc; get_ip_address(&loc); if (!use_udpv4) @@ -157,7 +157,7 @@ TEST_P(TransportUDP, UDPMaxInitialPeer_P0_4_P4) PubSubWriter writer(TEST_TOPIC_NAME); // Disallow multicast discovery - eprosima::fastrtps::rtps::LocatorList_t loc; + eprosima::fastdds::rtps::LocatorList_t loc; get_ip_address(&loc); if (!use_udpv4) @@ -188,7 +188,7 @@ TEST_P(TransportUDP, UDPMaxInitialPeer_P5_4_P4) PubSubWriter writer(TEST_TOPIC_NAME); // Disallow multicast discovery - eprosima::fastrtps::rtps::LocatorList_t loc; + eprosima::fastdds::rtps::LocatorList_t loc; get_ip_address(&loc); if (!use_udpv4) @@ -218,7 +218,7 @@ TEST_P(TransportUDP, UDPMaxInitialPeer_P5_6_P4) PubSubWriter writer(TEST_TOPIC_NAME); // Disallow multicast discovery - eprosima::fastrtps::rtps::LocatorList_t loc; + eprosima::fastdds::rtps::LocatorList_t loc; get_ip_address(&loc); if (!use_udpv4) @@ -590,8 +590,8 @@ TEST(TransportUDP, MaliciousManipulatedDataOctetsToNextHeaderIgnore) // Set common QoS reader.disable_builtin_transport().add_user_transport_to_pparams(udp_transport) - .history_depth(10).reliability(eprosima::fastrtps::RELIABLE_RELIABILITY_QOS); - writer.history_depth(10).reliability(eprosima::fastrtps::RELIABLE_RELIABILITY_QOS); + .history_depth(10).reliability(eprosima::fastdds::RELIABLE_RELIABILITY_QOS); + writer.history_depth(10).reliability(eprosima::fastdds::RELIABLE_RELIABILITY_QOS); // Set custom reader locator so we can send malicious data to a known location Locator_t reader_locator; diff --git a/test/blackbox/common/BlackboxTestsVolatile.cpp b/test/blackbox/common/BlackboxTestsVolatile.cpp index 0f0e9a79d79..67dd10e8a24 100644 --- a/test/blackbox/common/BlackboxTestsVolatile.cpp +++ b/test/blackbox/common/BlackboxTestsVolatile.cpp @@ -26,9 +26,7 @@ #include "ReqRepAsReliableHelloWorldReplier.hpp" #include "ReqRepAsReliableHelloWorldRequester.hpp" -using namespace eprosima::fastrtps; -using test_UDPv4Transport = eprosima::fastdds::rtps::test_UDPv4Transport; -using test_UDPv4TransportDescriptor = eprosima::fastdds::rtps::test_UDPv4TransportDescriptor; +using namespace eprosima::fastdds; enum communication_type { @@ -449,7 +447,7 @@ TEST_P(Volatile, VolatileLateJoinerSubGapLost) // To simulate lossy conditions int gaps_to_drop = 2; - auto testTransport = std::make_shared(); + auto testTransport = std::make_shared(); testTransport->drop_gap_messages_filter_ = [&gaps_to_drop](rtps::CDRMessage_t& ) { if (gaps_to_drop > 0) @@ -522,7 +520,7 @@ TEST_P(Volatile, VolatileWithLostAcks) // To simulate lossy conditions size_t acks_to_drop = 0; - auto testTransport = std::make_shared(); + auto testTransport = std::make_shared(); testTransport->drop_ack_nack_messages_filter_ = [&acks_to_drop](rtps::CDRMessage_t&) { if (acks_to_drop > 0) diff --git a/test/blackbox/common/DDSBlackboxTestsAckPositive.cpp b/test/blackbox/common/DDSBlackboxTestsAckPositive.cpp index b7422fc2854..2cb15e1616c 100644 --- a/test/blackbox/common/DDSBlackboxTestsAckPositive.cpp +++ b/test/blackbox/common/DDSBlackboxTestsAckPositive.cpp @@ -51,11 +51,8 @@ #include "../types/FixedSizedPubSubTypes.h" #include "../types/HelloWorldPubSubTypes.h" -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; -using test_UDPv4Transport = eprosima::fastdds::rtps::test_UDPv4Transport; -using test_UDPv4TransportDescriptor = eprosima::fastdds::rtps::test_UDPv4TransportDescriptor; - +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; TEST(AcknackQos, DDSEnableUpdatabilityOfPositiveAcksPeriodDDSLayer) { @@ -84,7 +81,7 @@ TEST(AcknackQos, DDSEnableUpdatabilityOfPositiveAcksPeriodDDSLayer) // Check correct initialitation eprosima::fastdds::dds::DataWriterQos get_att = writer.get_qos(); EXPECT_TRUE(get_att.reliable_writer_qos().disable_positive_acks.enabled); - EXPECT_EQ(get_att.reliable_writer_qos().disable_positive_acks.duration, eprosima::fastrtps::Duration_t({1, 0})); + EXPECT_EQ(get_att.reliable_writer_qos().disable_positive_acks.duration, eprosima::fastdds::Duration_t({1, 0})); // Wait for discovery. writer.wait_discovery(); @@ -115,14 +112,14 @@ TEST(AcknackQos, DDSEnableUpdatabilityOfPositiveAcksPeriodDDSLayer) // Update attributes on DDS layer eprosima::fastdds::dds::DataWriterQos w_att = writer.get_qos(); w_att.reliable_writer_qos().disable_positive_acks.enabled = true; - w_att.reliable_writer_qos().disable_positive_acks.duration = eprosima::fastrtps::Duration_t({2, 0}); + w_att.reliable_writer_qos().disable_positive_acks.duration = eprosima::fastdds::Duration_t({2, 0}); EXPECT_TRUE(writer.set_qos(w_att)); // Check that period has been changed in DataWriterQos get_att = writer.get_qos(); EXPECT_TRUE(get_att.reliable_writer_qos().disable_positive_acks.enabled); - EXPECT_EQ(get_att.reliable_writer_qos().disable_positive_acks.duration, eprosima::fastrtps::Duration_t({2, 0})); + EXPECT_EQ(get_att.reliable_writer_qos().disable_positive_acks.duration, eprosima::fastdds::Duration_t({2, 0})); data = default_helloworld_data_generator(); diff --git a/test/blackbox/common/DDSBlackboxTestsBasic.cpp b/test/blackbox/common/DDSBlackboxTestsBasic.cpp index c0b7a49af52..bec88eb3b69 100644 --- a/test/blackbox/common/DDSBlackboxTestsBasic.cpp +++ b/test/blackbox/common/DDSBlackboxTestsBasic.cpp @@ -333,14 +333,14 @@ TEST(DDSBasic, MultithreadedReaderCreationDoesNotDeadlock) * @return true if parsing was correct, false otherwise. */ bool check_related_sample_identity_field( - fastrtps::rtps::CDRMessage_t& msg, + fastdds::rtps::CDRMessage_t& msg, bool& exists_pid_related_sample_identity, bool& exists_pid_custom_related_sample_identity) { uint32_t qos_size = 0; auto parameter_process = [&]( - fastrtps::rtps::CDRMessage_t* msg, + fastdds::rtps::CDRMessage_t* msg, ParameterId_t& pid, uint16_t plength, uint32_t& pid_pos) @@ -395,8 +395,8 @@ bool check_related_sample_identity_field( uint16_t plength = 0; bool valid = true; auto msg_pid_pos = msg.pos; - valid &= fastrtps::rtps::CDRMessage::readUInt16(&msg, (uint16_t*)&pid); - valid &= fastrtps::rtps::CDRMessage::readUInt16(&msg, &plength); + valid &= fastdds::rtps::CDRMessage::readUInt16(&msg, (uint16_t*)&pid); + valid &= fastdds::rtps::CDRMessage::readUInt16(&msg, &plength); if (pid == PID_SENTINEL) { @@ -445,7 +445,7 @@ TEST(DDSBasic, PidRelatedSampleIdentity) test_transport->drop_data_messages_filter_ = [&exists_pid_related_sample_identity, &exists_pid_custom_related_sample_identity] - (eprosima::fastrtps::rtps::CDRMessage_t& msg)-> bool + (eprosima::fastdds::rtps::CDRMessage_t& msg)-> bool { // Inside this filter, the two flags passed in register whether both PIDs are included in the msg to be sent. // The legacy value is overwritten in order to send a msg with only the standard PID_RELATED_SAMPLE_IDENTITY as valid parameter, @@ -475,11 +475,11 @@ TEST(DDSBasic, PidRelatedSampleIdentity) HelloWorld data; // Send reply associating it with the client request. - eprosima::fastrtps::rtps::WriteParams write_params; - eprosima::fastrtps::rtps::SampleIdentity related_sample_identity_; - eprosima::fastrtps::rtps::GUID_t unknown_guid; + eprosima::fastdds::rtps::WriteParams write_params; + eprosima::fastdds::rtps::SampleIdentity related_sample_identity_; + eprosima::fastdds::rtps::GUID_t unknown_guid; related_sample_identity_.writer_guid(unknown_guid); - eprosima::fastrtps::rtps::SequenceNumber_t seq(51, 24); + eprosima::fastdds::rtps::SequenceNumber_t seq(51, 24); related_sample_identity_.sequence_number(seq); write_params.related_sample_identity() = related_sample_identity_; @@ -491,7 +491,7 @@ TEST(DDSBasic, PidRelatedSampleIdentity) HelloWorld read_data; eprosima::fastdds::dds::SampleInfo info; - eprosima::fastrtps::Duration_t timeout; + eprosima::fastdds::Duration_t timeout; timeout.seconds = 2; while (!native_reader.wait_for_unread_message(timeout)) { @@ -526,14 +526,14 @@ TEST(DDSBasic, IgnoreParticipant) void on_participant_discovery( DomainParticipant* /*participant*/, - eprosima::fastrtps::rtps::ParticipantDiscoveryInfo&& info, + eprosima::fastdds::rtps::ParticipantDiscoveryInfo&& info, bool& should_be_ignored) override { std::cout << "Using custom listener" << std::endl; if (info.status == info.DISCOVERED_PARTICIPANT) { std::cout << "Discovered participant" << std::endl; - if (info.info.m_userData == std::vector({ 'i', 'g', 'n' })) + if (info.info.m_userData == std::vector({ 'i', 'g', 'n' })) { std::cout << "Ignoring participant" << std::endl; should_be_ignored = true; @@ -665,7 +665,7 @@ TEST(DDSBasic, participant_ignore_local_endpoints) // Create the DomainParticipant with the appropriate value for the property PubSubWriterReader writer_reader(TEST_TOPIC_NAME); - eprosima::fastrtps::rtps::PropertyPolicy property_policy; + eprosima::fastdds::rtps::PropertyPolicy property_policy; property_policy.properties().emplace_back("fastdds.ignore_local_endpoints", test_config.property_value); writer_reader.property_policy(property_policy); @@ -712,7 +712,7 @@ TEST(DDSBasic, participant_ignore_local_endpoints_two_participants) /* Set up */ // Create the DomainParticipants with the appropriate value for the property - eprosima::fastrtps::rtps::PropertyPolicy property_policy; + eprosima::fastdds::rtps::PropertyPolicy property_policy; property_policy.properties().emplace_back("fastdds.ignore_local_endpoints", "true"); PubSubWriter writer(TEST_TOPIC_NAME); PubSubReader reader(TEST_TOPIC_NAME); @@ -822,7 +822,7 @@ TEST(DDSBasic, max_output_message_size_participant) auto testTransport = std::make_shared(); const uint32_t segment_size = 1470; std::string segment_size_str = std::to_string(segment_size); - testTransport->messages_filter_ = [segment_size](eprosima::fastrtps::rtps::CDRMessage_t& datagram) + testTransport->messages_filter_ = [segment_size](eprosima::fastdds::rtps::CDRMessage_t& datagram) { EXPECT_LE(datagram.length, segment_size); // Never drop samples @@ -830,7 +830,7 @@ TEST(DDSBasic, max_output_message_size_participant) }; // Create the DomainParticipants with the appropriate value for the property - eprosima::fastrtps::rtps::PropertyPolicy property_policy; + eprosima::fastdds::rtps::PropertyPolicy property_policy; property_policy.properties().emplace_back("fastdds.max_message_size", segment_size_str); PubSubWriter writer(TEST_TOPIC_NAME); writer.property_policy(property_policy).disable_builtin_transport() @@ -863,7 +863,7 @@ TEST(DDSBasic, max_output_message_size_writer) std::string segment_size_str = std::to_string(segment_size); auto testTransport = std::make_shared(); - testTransport->messages_filter_ = [segment_size](eprosima::fastrtps::rtps::CDRMessage_t& datagram) + testTransport->messages_filter_ = [segment_size](eprosima::fastdds::rtps::CDRMessage_t& datagram) { EXPECT_LE(datagram.length, segment_size); // Never drop samples @@ -871,7 +871,7 @@ TEST(DDSBasic, max_output_message_size_writer) }; // Create the DataWriter with the appropriate value for the property - eprosima::fastrtps::rtps::PropertyPolicy property_policy; + eprosima::fastdds::rtps::PropertyPolicy property_policy; property_policy.properties().emplace_back("fastdds.max_message_size", segment_size_str); PubSubWriter writer(TEST_TOPIC_NAME); writer.entity_property_policy(property_policy).disable_builtin_transport() diff --git a/test/blackbox/common/DDSBlackboxTestsContentFilter.cpp b/test/blackbox/common/DDSBlackboxTestsContentFilter.cpp index 64bfc42d98c..c27d5ff04dc 100644 --- a/test/blackbox/common/DDSBlackboxTestsContentFilter.cpp +++ b/test/blackbox/common/DDSBlackboxTestsContentFilter.cpp @@ -57,7 +57,7 @@ struct ContentFilterInfoCounter , transport(std::make_shared()) { transport->interfaceWhiteList.push_back("127.0.0.1"); - transport->drop_data_messages_filter_ = [this](fastrtps::rtps::CDRMessage_t& msg) -> bool + transport->drop_data_messages_filter_ = [this](fastdds::rtps::CDRMessage_t& msg) -> bool { // Check if it has inline_qos uint8_t flags = msg.buffer[msg.pos - 3]; @@ -66,13 +66,13 @@ struct ContentFilterInfoCounter // Skip extraFlags, read octetsToInlineQos, and calculate inline qos position. msg.pos += 2; uint16_t to_inline_qos = 0; - fastrtps::rtps::CDRMessage::readUInt16(&msg, &to_inline_qos); + fastdds::rtps::CDRMessage::readUInt16(&msg, &to_inline_qos); uint32_t inline_qos_pos = msg.pos + to_inline_qos; // Read writerId, and skip if built-in. msg.pos += 4; - fastrtps::rtps::GUID_t writer_guid; - fastrtps::rtps::CDRMessage::readEntityId(&msg, &writer_guid.entityId); + fastdds::rtps::GUID_t writer_guid; + fastdds::rtps::CDRMessage::readEntityId(&msg, &writer_guid.entityId); msg.pos = old_pos; if (writer_guid.is_builtin()) @@ -90,8 +90,8 @@ struct ContentFilterInfoCounter uint16_t pid = 0; uint16_t plen = 0; - fastrtps::rtps::CDRMessage::readUInt16(&msg, &pid); - fastrtps::rtps::CDRMessage::readUInt16(&msg, &plen); + fastdds::rtps::CDRMessage::readUInt16(&msg, &pid); + fastdds::rtps::CDRMessage::readUInt16(&msg, &plen); uint32_t next_pos = msg.pos + plen; if (pid == PID_CONTENT_FILTER_INFO) @@ -103,12 +103,12 @@ struct ContentFilterInfoCounter { // Read numBitmaps and skip bitmaps uint32_t num_bitmaps = 0; - fastrtps::rtps::CDRMessage::readUInt32(&msg, &num_bitmaps); + fastdds::rtps::CDRMessage::readUInt32(&msg, &num_bitmaps); msg.pos += 4 * num_bitmaps; // Read numSignatures and keep maximum uint32_t num_signatures = 0; - fastrtps::rtps::CDRMessage::readUInt32(&msg, &num_signatures); + fastdds::rtps::CDRMessage::readUInt32(&msg, &num_signatures); if (max_filter_signature_number < num_signatures) { max_filter_signature_number = num_signatures; @@ -146,7 +146,7 @@ class DDSContentFilter : public testing::TestWithParam void SetUp() override { - using namespace eprosima::fastrtps; + using namespace eprosima::fastdds; enable_datasharing = false; @@ -170,7 +170,7 @@ class DDSContentFilter : public testing::TestWithParam void TearDown() override { - using namespace eprosima::fastrtps; + using namespace eprosima::fastdds; eprosima::fastdds::LibrarySettings library_settings; switch (GetParam()) @@ -222,7 +222,7 @@ class DDSContentFilter : public testing::TestWithParam void init( bool writer_side_filtering, const std::shared_ptr& transport, - fastrtps::ResourceLimitedContainerConfig filter_limits) + fastdds::ResourceLimitedContainerConfig filter_limits) { writer_side_filter_ = writer_side_filtering && filter_limits.maximum > 0; @@ -232,7 +232,7 @@ class DDSContentFilter : public testing::TestWithParam ASSERT_TRUE(writer.isInitialized()); // Ensure the direct reader always receives DATA messages using the test transport - fastrtps::rtps::GuidPrefix_t custom_prefix; + fastdds::rtps::GuidPrefix_t custom_prefix; memset(custom_prefix.value, 0xee, custom_prefix.size); direct_reader.datasharing_off().guid_prefix(custom_prefix); direct_reader.disable_builtin_transport().add_user_transport_to_pparams(transport); @@ -423,7 +423,7 @@ class DDSContentFilter : public testing::TestWithParam DataReader* prepare_test( TestState& state, - fastrtps::ResourceLimitedContainerConfig filter_limits, + fastdds::ResourceLimitedContainerConfig filter_limits, uint32_t nb_of_additional_filter_readers) { state.init(using_transport_communication_, filter_counter.transport, filter_limits); @@ -517,7 +517,7 @@ TEST_P(DDSContentFilter, WithLimitsSeveralReaders) TestState state; - auto reader = prepare_test(state, fastrtps::ResourceLimitedContainerConfig::fixed_size_configuration(2u), 3u); + auto reader = prepare_test(state, fastdds::ResourceLimitedContainerConfig::fixed_size_configuration(2u), 3u); ASSERT_NE(nullptr, reader); test_run(reader, state, 2u); @@ -534,7 +534,7 @@ TEST_P(DDSContentFilter, WithLimitsDynamicReaders) TestState state; // Only one filtered reader created - auto reader = prepare_test(state, fastrtps::ResourceLimitedContainerConfig::fixed_size_configuration(2u), 0u); + auto reader = prepare_test(state, fastdds::ResourceLimitedContainerConfig::fixed_size_configuration(2u), 0u); ASSERT_NE(nullptr, reader); // We want a single filter to be applied, and check only for reader discovery changes diff --git a/test/blackbox/common/DDSBlackboxTestsDataReader.cpp b/test/blackbox/common/DDSBlackboxTestsDataReader.cpp index 508bd5d23cf..79f9d03cb88 100644 --- a/test/blackbox/common/DDSBlackboxTestsDataReader.cpp +++ b/test/blackbox/common/DDSBlackboxTestsDataReader.cpp @@ -36,8 +36,8 @@ #include "PubSubReader.hpp" #include "PubSubWriter.hpp" -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; #define INCOMPATIBLE_TEST_TOPIC_NAME std::string( \ std::string("incompatible_") + TEST_TOPIC_NAME) @@ -262,7 +262,7 @@ TEST(DDSDataReader, GetFirstUntakenInfoReturnsTheFirstValidChange) EntityId_t reader_id; testTransport_1->drop_data_messages_filter_ = - [&writer1_id, &reader_id](eprosima::fastrtps::rtps::CDRMessage_t& msg)-> bool + [&writer1_id, &reader_id](eprosima::fastdds::rtps::CDRMessage_t& msg)-> bool { uint32_t old_pos = msg.pos; diff --git a/test/blackbox/common/DDSBlackboxTestsDataRepresentationQos.cpp b/test/blackbox/common/DDSBlackboxTestsDataRepresentationQos.cpp index d4fb54a8abc..336671c38b9 100644 --- a/test/blackbox/common/DDSBlackboxTestsDataRepresentationQos.cpp +++ b/test/blackbox/common/DDSBlackboxTestsDataRepresentationQos.cpp @@ -32,7 +32,7 @@ class MockHelloWorldPubSubType : public HelloWorldPubSubType bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, DataRepresentationId_t data_representation) override { last_data_representation = data_representation; @@ -41,7 +41,7 @@ class MockHelloWorldPubSubType : public HelloWorldPubSubType } bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override { // Object that manages the raw buffer. diff --git a/test/blackbox/common/DDSBlackboxTestsDataSharing.cpp b/test/blackbox/common/DDSBlackboxTestsDataSharing.cpp index 38379c2f560..4cd849acdaa 100644 --- a/test/blackbox/common/DDSBlackboxTestsDataSharing.cpp +++ b/test/blackbox/common/DDSBlackboxTestsDataSharing.cpp @@ -26,12 +26,12 @@ #include "PubSubReader.hpp" #include "PubSubWriter.hpp" -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; bool check_shared_file ( const char* shared_dir, - const eprosima::fastrtps::rtps::GUID_t& guid) + const eprosima::fastdds::rtps::GUID_t& guid) { bool result; std::stringstream file_name; diff --git a/test/blackbox/common/DDSBlackboxTestsDataWriter.cpp b/test/blackbox/common/DDSBlackboxTestsDataWriter.cpp index add1ef8597b..de16f9a7fad 100644 --- a/test/blackbox/common/DDSBlackboxTestsDataWriter.cpp +++ b/test/blackbox/common/DDSBlackboxTestsDataWriter.cpp @@ -38,9 +38,7 @@ #include "PubSubReader.hpp" #include "PubSubWriter.hpp" -using namespace eprosima::fastrtps; -using test_UDPv4Transport = eprosima::fastdds::rtps::test_UDPv4Transport; -using test_UDPv4TransportDescriptor = eprosima::fastdds::rtps::test_UDPv4TransportDescriptor; +using namespace eprosima::fastdds; enum communication_type { @@ -99,7 +97,7 @@ TEST_P(DDSDataWriter, WaitForAcknowledgmentInstance) PubSubWriter writer(TEST_TOPIC_NAME); PubSubReader reader(TEST_TOPIC_NAME); - auto testTransport = std::make_shared(); + auto testTransport = std::make_shared(); writer.disable_builtin_transport().add_user_transport_to_pparams(testTransport).init(); ASSERT_TRUE(writer.isInitialized()); @@ -111,7 +109,7 @@ TEST_P(DDSDataWriter, WaitForAcknowledgmentInstance) reader.wait_discovery(); // Disable communication to prevent reception of ACKs - test_UDPv4Transport::test_UDPv4Transport_ShutdownAllNetwork = true; + eprosima::fastdds::rtps::test_UDPv4Transport::test_UDPv4Transport_ShutdownAllNetwork = true; auto data = default_keyedhelloworld_data_generator(2); @@ -141,7 +139,7 @@ TEST_P(DDSDataWriter, WaitForAcknowledgmentInstance) } // Enable communication and wait for acknowledgment - test_UDPv4Transport::test_UDPv4Transport_ShutdownAllNetwork = false; + eprosima::fastdds::rtps::test_UDPv4Transport::test_UDPv4Transport_ShutdownAllNetwork = false; EXPECT_TRUE(writer.waitForInstanceAcked(&sample_1, instance_handle_1, std::chrono::seconds(1))); EXPECT_TRUE(writer.waitForInstanceAcked(&sample_2, rtps::c_InstanceHandle_Unknown, std::chrono::seconds(1))); @@ -157,9 +155,9 @@ TEST_P(DDSDataWriter, GetKeyValue) // Test variables KeyedHelloWorld data; - eprosima::fastrtps::rtps::InstanceHandle_t wrong_handle; + eprosima::fastdds::rtps::InstanceHandle_t wrong_handle; wrong_handle.value[0] = 0xee; - eprosima::fastrtps::rtps::InstanceHandle_t valid_handle; + eprosima::fastdds::rtps::InstanceHandle_t valid_handle; KeyedHelloWorld valid_data; valid_data.key(27); valid_data.index(1); @@ -217,7 +215,7 @@ TEST_P(DDSDataWriter, WithTimestampOperations) using namespace eprosima::fastdds::dds; // Test variables - eprosima::fastrtps::Time_t ts; + eprosima::fastdds::Time_t ts; KeyedHelloWorld valid_data; valid_data.key(27); diff --git a/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp b/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp index 6739bfd5e8b..50c1018165f 100644 --- a/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp +++ b/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp @@ -92,7 +92,7 @@ TEST(DDSDiscovery, AddDiscoveryServerToListUDP) { using namespace eprosima; using namespace eprosima::fastdds::dds; - using namespace eprosima::fastrtps::rtps; + using namespace eprosima::fastdds::rtps; char* value = nullptr; std::string W_UNICAST_PORT_RANDOM_NUMBER_STR; @@ -112,13 +112,13 @@ TEST(DDSDiscovery, AddDiscoveryServerToListUDP) PubSubParticipant server_1(0u, 0u, 0u, 0u); // Set participant as server WireProtocolConfigQos server_1_qos; - server_1_qos.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::SERVER; + server_1_qos.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::SERVER; // Generate random GUID prefix srand(static_cast(time(nullptr))); GuidPrefix_t server_1_prefix; for (auto i = 0; i < 12; i++) { - server_1_prefix.value[i] = eprosima::fastrtps::rtps::octet(rand() % 254); + server_1_prefix.value[i] = eprosima::fastdds::rtps::octet(rand() % 254); } server_1_qos.prefix = server_1_prefix; // Generate server's listening locator @@ -134,7 +134,7 @@ TEST(DDSDiscovery, AddDiscoveryServerToListUDP) PubSubParticipant server_2(0u, 0u, 0u, 0u); // Set participant as server WireProtocolConfigQos server_2_qos; - server_2_qos.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::SERVER; + server_2_qos.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::SERVER; // Generate random GUID prefix GuidPrefix_t server_2_prefix = server_1_prefix; server_2_prefix.value[11]++; @@ -152,7 +152,7 @@ TEST(DDSDiscovery, AddDiscoveryServerToListUDP) PubSubParticipant client(0u, 0u, 0u, 0u); // Set participant as client WireProtocolConfigQos client_qos; - client_qos.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::CLIENT; + client_qos.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::CLIENT; // Connect to first server RemoteServerAttributes server_1_att; server_1_att.guidPrefix = server_1_prefix; @@ -204,7 +204,7 @@ TEST(DDSDiscovery, AddDiscoveryServerToListTCP) { using namespace eprosima; using namespace eprosima::fastdds::dds; - using namespace eprosima::fastrtps::rtps; + using namespace eprosima::fastdds::rtps; // TCP default DS port constexpr uint16_t W_UNICAST_PORT_RANDOM_NUMBER_STR = 42100; @@ -218,7 +218,7 @@ TEST(DDSDiscovery, AddDiscoveryServerToListTCP) GuidPrefix_t server_1_prefix; for (auto i = 0; i < 12; i++) { - server_1_prefix.value[i] = eprosima::fastrtps::rtps::octet(rand() % 254); + server_1_prefix.value[i] = eprosima::fastdds::rtps::octet(rand() % 254); } uint16_t server_1_port = W_UNICAST_PORT_RANDOM_NUMBER_STR; Locator_t locator_server_1; @@ -257,7 +257,7 @@ TEST(DDSDiscovery, AddDiscoveryServerToListTCP) PubSubParticipant client_1(0u, 0u, 0u, 0u); // Set participant as client WireProtocolConfigQos client_qos_1; - client_qos_1.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::CLIENT; + client_qos_1.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::CLIENT; // Connect to first server RemoteServerAttributes server_1_att; server_1_att.guidPrefix = server_1_prefix; @@ -276,7 +276,7 @@ TEST(DDSDiscovery, AddDiscoveryServerToListTCP) PubSubParticipant client_2(0u, 0u, 0u, 0u); // Set participant as client WireProtocolConfigQos client_qos_2; - client_qos_2.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::CLIENT; + client_qos_2.builtin.discovery_config.discoveryProtocol = DiscoveryProtocol::CLIENT; // Connect to first server client_qos_2.builtin.discovery_config.m_DiscoveryServers.push_back(server_1_att); auto descriptor_4 = std::make_shared(); @@ -320,7 +320,7 @@ TEST(DDSDiscovery, ServersConnectionTCP) { using namespace eprosima; using namespace eprosima::fastdds::dds; - using namespace eprosima::fastrtps::rtps; + using namespace eprosima::fastdds::rtps; // TCP default DS port constexpr uint16_t W_UNICAST_PORT_RANDOM_NUMBER_STR = 41100; @@ -334,7 +334,7 @@ TEST(DDSDiscovery, ServersConnectionTCP) GuidPrefix_t server_1_prefix; for (auto i = 0; i < 12; i++) { - server_1_prefix.value[i] = eprosima::fastrtps::rtps::octet(rand() % 254); + server_1_prefix.value[i] = eprosima::fastdds::rtps::octet(rand() % 254); } Locator_t locator_server_1; uint16_t server_1_port = W_UNICAST_PORT_RANDOM_NUMBER_STR; @@ -618,7 +618,7 @@ TEST(DDSDiscovery, UpdateMatchedStatus) TEST(DDSDiscovery, ParticipantProxyPhysicalData) { using namespace eprosima::fastdds::dds; - using namespace eprosima::fastrtps::rtps; + using namespace eprosima::fastdds::rtps; class CustomDomainParticipantListener : public DomainParticipantListener { @@ -655,7 +655,7 @@ TEST(DDSDiscovery, ParticipantProxyPhysicalData) static_cast(should_be_ignored); std::unique_lock lck(*mtx_); if (info.status == - eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::DISCOVERY_STATUS::DISCOVERED_PARTICIPANT) + eprosima::fastdds::rtps::ParticipantDiscoveryInfo::DISCOVERY_STATUS::DISCOVERED_PARTICIPANT) { static_cast(participant); if (nullptr != remote_participant_info) @@ -817,7 +817,7 @@ TEST(DDSDiscovery, ParticipantProxyPhysicalData) TEST(DDSDiscovery, DDSDiscoveryDoesNotDropUDPLocator) { using namespace eprosima::fastdds::dds; - using namespace eprosima::fastrtps::rtps; + using namespace eprosima::fastdds::rtps; struct CustomDomainParticipantListener : public DomainParticipantListener { @@ -904,11 +904,11 @@ TEST(DDSDiscovery, DDSDiscoveryDoesNotDropUDPLocator) TEST(DDSDiscovery, WriterAndReaderMatchUsingDynamicReusableMemoryMode) { using namespace eprosima::fastdds::dds; - using namespace eprosima::fastrtps::rtps; + using namespace eprosima::fastdds::rtps; WireProtocolConfigQos qos; - qos.builtin.readerHistoryMemoryPolicy = eprosima::fastrtps::rtps::DYNAMIC_REUSABLE_MEMORY_MODE; + qos.builtin.readerHistoryMemoryPolicy = eprosima::fastdds::rtps::DYNAMIC_REUSABLE_MEMORY_MODE; PubSubWriter writer("test"); PubSubReader reader("test"); @@ -1789,10 +1789,10 @@ static void test_DDSDiscovery_WaitSetMatchedStatus( fastdds::dds::DomainParticipantQos pqos; factory->get_default_participant_qos(pqos); uint32_t ignore_flags = - fastrtps::rtps::ParticipantFilteringFlags::FILTER_DIFFERENT_HOST | - fastrtps::rtps::ParticipantFilteringFlags::FILTER_DIFFERENT_PROCESS; + fastdds::rtps::ParticipantFilteringFlags::FILTER_DIFFERENT_HOST | + fastdds::rtps::ParticipantFilteringFlags::FILTER_DIFFERENT_PROCESS; pqos.wire_protocol().builtin.discovery_config.ignoreParticipantFlags = - static_cast(ignore_flags); + static_cast(ignore_flags); fastdds::dds::DomainParticipantListener listener; auto listener_to_use = with_listener ? &listener : nullptr; @@ -1824,7 +1824,7 @@ static void test_DDSDiscovery_WaitSetMatchedStatus( fastdds::dds::PublicationMatchedStatus matched_status{}; while (1 > matched_status.current_count) { - ReturnCode_t ret_code = wait_set.wait(triggered_conditions, fastrtps::c_TimeInfinite); + ReturnCode_t ret_code = wait_set.wait(triggered_conditions, fastdds::c_TimeInfinite); if (eprosima::fastdds::dds::RETCODE_OK != ret_code) { continue; @@ -1893,10 +1893,10 @@ TEST(DDSDiscovery, DataracePDP) void on_participant_discovery( DomainParticipant* /*participant*/, - eprosima::fastrtps::rtps::ParticipantDiscoveryInfo&& info, + eprosima::fastdds::rtps::ParticipantDiscoveryInfo&& info, bool& /*should_be_ignored*/) override { - if (info.status == eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT) + if (info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT) { try { @@ -1908,8 +1908,8 @@ TEST(DDSDiscovery, DataracePDP) } destruction_future.wait(); } - else if (info.status == eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::REMOVED_PARTICIPANT || - info.status == eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::DROPPED_PARTICIPANT) + else if (info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::REMOVED_PARTICIPANT || + info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::DROPPED_PARTICIPANT) { try { @@ -2020,7 +2020,7 @@ TEST(DDSDiscovery, pdp_simple_participants_exchange_same_pid_domain_id_and_disco { using namespace eprosima::fastdds::dds; using namespace eprosima::fastdds::rtps; - using namespace eprosima::fastrtps::rtps; + using namespace eprosima::fastdds::rtps; PubSubReader reader(TEST_TOPIC_NAME); PubSubWriter writer(TEST_TOPIC_NAME); @@ -2045,8 +2045,8 @@ TEST(DDSDiscovery, pdp_simple_participants_exchange_same_pid_domain_id_and_disco uint16_t plength = 0; bool valid = true; - valid &= eprosima::fastrtps::rtps::CDRMessage::readUInt16(&msg, (uint16_t*)&pid); - valid &= eprosima::fastrtps::rtps::CDRMessage::readUInt16(&msg, &plength); + valid &= eprosima::fastdds::rtps::CDRMessage::readUInt16(&msg, (uint16_t*)&pid); + valid &= eprosima::fastdds::rtps::CDRMessage::readUInt16(&msg, &plength); if (pid == eprosima::fastdds::dds::PID_SENTINEL) { @@ -2069,7 +2069,7 @@ TEST(DDSDiscovery, pdp_simple_participants_exchange_same_pid_domain_id_and_disco if (pid == eprosima::fastdds::dds::PID_DOMAIN_ID) { uint32_t domain_id = 0; - eprosima::fastrtps::rtps::CDRMessage::readUInt32(&msg, &domain_id); + eprosima::fastdds::rtps::CDRMessage::readUInt32(&msg, &domain_id); if (domain_id == (uint32_t)GET_PID() % 230) { pid_was_found = true; diff --git a/test/blackbox/common/DDSBlackboxTestsEndpointPartitioning.cpp b/test/blackbox/common/DDSBlackboxTestsEndpointPartitioning.cpp index d5bce09152d..d90fcf37512 100644 --- a/test/blackbox/common/DDSBlackboxTestsEndpointPartitioning.cpp +++ b/test/blackbox/common/DDSBlackboxTestsEndpointPartitioning.cpp @@ -18,7 +18,7 @@ #include "PubSubReader.hpp" #include "PubSubWriter.hpp" -using namespace eprosima::fastrtps; +using namespace eprosima::fastdds; /** * This test checks that DataWriter/DataReaders match with each other one to one when the partition diff --git a/test/blackbox/common/DDSBlackboxTestsFindTopic.cpp b/test/blackbox/common/DDSBlackboxTestsFindTopic.cpp index 3cf0d5a3f22..29cec804dae 100644 --- a/test/blackbox/common/DDSBlackboxTestsFindTopic.cpp +++ b/test/blackbox/common/DDSBlackboxTestsFindTopic.cpp @@ -59,13 +59,13 @@ class DDSFindTopicTest : public testing::Test bool serialize( void*, - fastrtps::rtps::SerializedPayload_t*) override + fastdds::rtps::SerializedPayload_t*) override { return true; } bool deserialize( - fastrtps::rtps::SerializedPayload_t*, + fastdds::rtps::SerializedPayload_t*, void*) override { return true; @@ -89,7 +89,7 @@ class DDSFindTopicTest : public testing::Test bool getKey( void*, - fastrtps::rtps::InstanceHandle_t*, + fastdds::rtps::InstanceHandle_t*, bool) override { return false; @@ -170,7 +170,7 @@ TEST_F(DDSFindTopicTest, find_topic_timeout) // Procedure: // 1. Call DomainParticipant::find_topic with a valid topic name and certain, non-infinite, timeout. - eprosima::fastrtps::Duration_t timeout{ 0, 50 * 1000 * 1000 }; + eprosima::fastdds::Duration_t timeout{ 0, 50 * 1000 * 1000 }; auto max_tp = std::chrono::steady_clock::now() + std::chrono::milliseconds(50); auto topic = participant_->find_topic(TEST_TOPIC_NAME, timeout); @@ -196,7 +196,7 @@ TEST_F(DDSFindTopicTest, find_topic_no_timeout) // Procedure: // 1. Call DomainParticipant::find_topic with the same topic name as the input Topic, and infinite timeout. - auto topic = participant_->find_topic(TEST_TOPIC_NAME, fastrtps::c_TimeInfinite); + auto topic = participant_->find_topic(TEST_TOPIC_NAME, fastdds::c_TimeInfinite); // Output: // - The call returns something different from nullptr. @@ -223,7 +223,7 @@ TEST_F(DDSFindTopicTest, find_topic_unblock) // and infinite timeout. auto exec_fn = [this]() { - return participant_->find_topic(TEST_TOPIC_NAME, fastrtps::c_TimeInfinite); + return participant_->find_topic(TEST_TOPIC_NAME, fastdds::c_TimeInfinite); }; std::vector> threads; for (size_t i = 0; i < num_threads; ++i) @@ -277,7 +277,7 @@ TEST_F(DDSFindTopicTest, find_topic_is_proxy) // - A Topic object topic_2 obtained by calling DomainParticipant::find_topic with the same topic name. Topic* topic_1 = create_test_topic(); ASSERT_NE(nullptr, topic_1); - Topic* topic_2 = participant_->find_topic(TEST_TOPIC_NAME, fastrtps::c_TimeInfinite); + Topic* topic_2 = participant_->find_topic(TEST_TOPIC_NAME, fastdds::c_TimeInfinite); ASSERT_NE(nullptr, topic_2); check_topics(topic_1, topic_2); @@ -334,9 +334,9 @@ TEST_F(DDSFindTopicTest, find_topic_delete_topic) // - A DataReader created on topic_2. Topic* topic_1 = create_test_topic(); ASSERT_NE(nullptr, topic_1); - Topic* topic_2 = participant_->find_topic(TEST_TOPIC_NAME, fastrtps::c_TimeInfinite); + Topic* topic_2 = participant_->find_topic(TEST_TOPIC_NAME, fastdds::c_TimeInfinite); ASSERT_NE(nullptr, topic_2); - Topic* topic_3 = participant_->find_topic(TEST_TOPIC_NAME, fastrtps::c_TimeInfinite); + Topic* topic_3 = participant_->find_topic(TEST_TOPIC_NAME, fastdds::c_TimeInfinite); ASSERT_NE(nullptr, topic_3); auto publisher = participant_->create_publisher(PUBLISHER_QOS_DEFAULT); auto data_writer = publisher->create_datawriter(topic_1, DATAWRITER_QOS_DEFAULT); diff --git a/test/blackbox/common/DDSBlackboxTestsListeners.cpp b/test/blackbox/common/DDSBlackboxTestsListeners.cpp index f3c3b7f4500..43c8abec4cd 100644 --- a/test/blackbox/common/DDSBlackboxTestsListeners.cpp +++ b/test/blackbox/common/DDSBlackboxTestsListeners.cpp @@ -29,9 +29,7 @@ #include "PubSubReader.hpp" #include "PubSubWriter.hpp" -using namespace eprosima::fastrtps::rtps; - -using test_UDPv4TransportDescriptor = eprosima::fastdds::rtps::test_UDPv4TransportDescriptor; +using namespace eprosima::fastdds::rtps; #define INCOMPATIBLE_TEST_TOPIC_NAME std::string( \ std::string("incompatible_") + TEST_TOPIC_NAME) @@ -692,7 +690,7 @@ void sample_lost_test_dw_init( testTransport->sendBufferSize = SAMPLE_LOST_TEST_BUFFER_SIZE; testTransport->receiveBufferSize = SAMPLE_LOST_TEST_BUFFER_SIZE; - testTransport->drop_data_messages_filter_ = [](eprosima::fastrtps::rtps::CDRMessage_t& msg)-> bool + testTransport->drop_data_messages_filter_ = [](eprosima::fastdds::rtps::CDRMessage_t& msg)-> bool { uint32_t old_pos = msg.pos; @@ -726,7 +724,7 @@ void sample_lost_test_dw_init( return false; }; - testTransport->drop_data_frag_messages_filter_ = [](eprosima::fastrtps::rtps::CDRMessage_t& msg)-> bool + testTransport->drop_data_frag_messages_filter_ = [](eprosima::fastdds::rtps::CDRMessage_t& msg)-> bool { uint32_t old_pos = msg.pos; @@ -1700,7 +1698,7 @@ void sample_rejected_test_dw_init( auto testTransport = std::make_shared(); testTransport->drop_data_messages_filter_ = - [](eprosima::fastrtps::rtps::CDRMessage_t& msg)-> bool + [](eprosima::fastdds::rtps::CDRMessage_t& msg)-> bool { uint32_t old_pos = msg.pos; @@ -2892,7 +2890,7 @@ TEST(DDSStatus, sample_rejected_waitset) int skip_step = 0; auto testTransport = std::make_shared(); testTransport->drop_data_messages_filter_ = - [&skip_step](eprosima::fastrtps::rtps::CDRMessage_t& msg)-> bool + [&skip_step](eprosima::fastdds::rtps::CDRMessage_t& msg)-> bool { uint32_t old_pos = msg.pos; @@ -3079,7 +3077,7 @@ void reliable_on_unack_test_init( PubSubReader& reader) { auto test_transport = std::make_shared(); - test_transport->drop_data_messages_filter_ = [](eprosima::fastrtps::rtps::CDRMessage_t& msg)-> bool + test_transport->drop_data_messages_filter_ = [](eprosima::fastdds::rtps::CDRMessage_t& msg)-> bool { uint32_t old_pos = msg.pos; @@ -3273,14 +3271,14 @@ void reliable_disable_acks_on_unack_test_init( .asynchronously(eprosima::fastdds::dds::PublishModeQosPolicyKind::ASYNCHRONOUS_PUBLISH_MODE) .add_flow_controller_descriptor_to_pparams( eprosima::fastdds::rtps::FlowControllerSchedulerPolicy::FIFO, 1, 1000) - .keep_duration(eprosima::fastrtps::c_TimeInfinite) + .keep_duration(eprosima::fastdds::c_TimeInfinite) .init(); ASSERT_TRUE(writer_1.isInitialized()); writer_2.reliability(eprosima::fastdds::dds::RELIABLE_RELIABILITY_QOS) .durability_kind(eprosima::fastdds::dds::TRANSIENT_LOCAL_DURABILITY_QOS) .history_kind(eprosima::fastdds::dds::KEEP_ALL_HISTORY_QOS) - .keep_duration(eprosima::fastrtps::c_TimeInfinite) + .keep_duration(eprosima::fastdds::c_TimeInfinite) .init(); ASSERT_TRUE(writer_2.isInitialized()); @@ -3429,7 +3427,7 @@ TEST(DDSStatus, several_writers_on_unack_sample_removed) .asynchronously(eprosima::fastdds::dds::PublishModeQosPolicyKind::ASYNCHRONOUS_PUBLISH_MODE) .add_flow_controller_descriptor_to_pparams( eprosima::fastdds::rtps::FlowControllerSchedulerPolicy::FIFO, 1, 1000) - .keep_duration(eprosima::fastrtps::c_TimeInfinite) + .keep_duration(eprosima::fastdds::c_TimeInfinite) .init(); ASSERT_TRUE(ack_disabled_writer.isInitialized()); diff --git a/test/blackbox/common/DDSBlackboxTestsMonitorService.cpp b/test/blackbox/common/DDSBlackboxTestsMonitorService.cpp index 328f4ad6df3..9e101b6c9ef 100644 --- a/test/blackbox/common/DDSBlackboxTestsMonitorService.cpp +++ b/test/blackbox/common/DDSBlackboxTestsMonitorService.cpp @@ -27,9 +27,7 @@ using namespace eprosima::fastdds; using namespace eprosima::fastdds::dds; - -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; enum communication_type { @@ -1561,7 +1559,7 @@ TEST(DDSMonitorServiceTest, monitor_service_simple_liveliness_lost_status) DataWriterQos dw_qos; dw_qos.liveliness().kind = eprosima::fastdds::dds::MANUAL_BY_TOPIC_LIVELINESS_QOS; - dw_qos.liveliness().lease_duration = eprosima::fastrtps::Time_t{1, 0}; + dw_qos.liveliness().lease_duration = eprosima::fastdds::Time_t{1, 0}; MSP.create_and_add_writer(dw_qos); MSP.assert_liveliness(); @@ -1618,12 +1616,12 @@ TEST(DDSMonitorServiceTest, monitor_service_simple_liveliness_changed_status) dr_qos.reliability().kind = eprosima::fastdds::dds::RELIABLE_RELIABILITY_QOS; dr_qos.liveliness().kind = eprosima::fastdds::dds::MANUAL_BY_TOPIC_LIVELINESS_QOS; - dr_qos.liveliness().lease_duration = eprosima::fastrtps::Time_t{1, 0}; + dr_qos.liveliness().lease_duration = eprosima::fastdds::Time_t{1, 0}; DataWriterQos dw_qos; dw_qos.liveliness().kind = eprosima::fastdds::dds::MANUAL_BY_TOPIC_LIVELINESS_QOS; - dw_qos.liveliness().lease_duration = eprosima::fastrtps::Time_t{1, 0}; + dw_qos.liveliness().lease_duration = eprosima::fastdds::Time_t{1, 0}; MSP.create_and_add_reader(dr_qos); MSP.create_and_add_writer(dw_qos); @@ -1680,8 +1678,8 @@ TEST(DDSMonitorServiceTest, monitor_service_simple_deadline_missed_status) DataReaderQos dr_qos; DataWriterQos dw_qos; - dr_qos.deadline().period = eprosima::fastrtps::Time_t{1, 0}; - dw_qos.deadline().period = eprosima::fastrtps::Time_t{1, 0}; + dr_qos.deadline().period = eprosima::fastdds::Time_t{1, 0}; + dw_qos.deadline().period = eprosima::fastdds::Time_t{1, 0}; MSP.create_and_add_reader(dr_qos); MSP.create_and_add_writer(dw_qos); @@ -1743,7 +1741,7 @@ TEST(DDSMonitorServiceTest, monitor_service_simple_sample_lost_status) DomainParticipantQos dqos; auto testTransport = std::make_shared(); - testTransport->drop_data_messages_filter_ = [](eprosima::fastrtps::rtps::CDRMessage_t& msg)-> bool + testTransport->drop_data_messages_filter_ = [](eprosima::fastdds::rtps::CDRMessage_t& msg)-> bool { uint32_t old_pos = msg.pos; @@ -2331,8 +2329,8 @@ TEST(DDSMonitorServiceTest, monitor_service_properly_handles_topic_instances) // Jump the reader entity id msg.pos += 4; // Read the writer's entity id - eprosima::fastrtps::rtps::EntityId_t writer_entity_id; - eprosima::fastrtps::rtps::CDRMessage::readEntityId(&msg, &writer_entity_id); + eprosima::fastdds::rtps::EntityId_t writer_entity_id; + eprosima::fastdds::rtps::CDRMessage::readEntityId(&msg, &writer_entity_id); if (ENTITYID_MONITOR_SERVICE_WRITER == writer_entity_id) { @@ -2353,8 +2351,8 @@ TEST(DDSMonitorServiceTest, monitor_service_properly_handles_topic_instances) DataWriterQos dw_qos; //! Set deadline as 1 sec - dr_qos.deadline().period = eprosima::fastrtps::Time_t{1, 000000000}; - dw_qos.deadline().period = eprosima::fastrtps::Time_t{1, 000000000}; + dr_qos.deadline().period = eprosima::fastdds::Time_t{1, 000000000}; + dw_qos.deadline().period = eprosima::fastdds::Time_t{1, 000000000}; MSP.create_and_add_reader(dr_qos); MSP.create_and_add_writer(dw_qos); @@ -2395,8 +2393,8 @@ TEST(DDSMonitorServiceTest, monitor_service_late_joiner_consumer_receives_only_ DataWriterQos dw_qos; // Set deadline as 0,5 secs to continously keep missing the deadline later - dr_qos.deadline().period = eprosima::fastrtps::Time_t{0, 500000000}; - dw_qos.deadline().period = eprosima::fastrtps::Time_t{0, 500000000}; + dr_qos.deadline().period = eprosima::fastdds::Time_t{0, 500000000}; + dw_qos.deadline().period = eprosima::fastdds::Time_t{0, 500000000}; MSP.create_and_add_reader(dr_qos); MSP.create_and_add_writer(dw_qos); diff --git a/test/blackbox/common/DDSBlackboxTestsOwnershipQos.cpp b/test/blackbox/common/DDSBlackboxTestsOwnershipQos.cpp index a371067b9ab..90242a6b1d9 100644 --- a/test/blackbox/common/DDSBlackboxTestsOwnershipQos.cpp +++ b/test/blackbox/common/DDSBlackboxTestsOwnershipQos.cpp @@ -23,8 +23,8 @@ #include "PubSubReader.hpp" #include "PubSubWriter.hpp" -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; enum communication_type { @@ -1256,13 +1256,13 @@ void exclusive_kind_non_keyed_lost_liveliness( std::atomic drop_messages1(false); auto testTransport1 = std::make_shared(); - testTransport1->messages_filter_ = [&drop_messages1](eprosima::fastrtps::rtps::CDRMessage_t&) + testTransport1->messages_filter_ = [&drop_messages1](eprosima::fastdds::rtps::CDRMessage_t&) { return drop_messages1.load(); }; std::atomic drop_messages3(false); auto testTransport3 = std::make_shared(); - testTransport3->messages_filter_ = [&drop_messages3](eprosima::fastrtps::rtps::CDRMessage_t&) + testTransport3->messages_filter_ = [&drop_messages3](eprosima::fastdds::rtps::CDRMessage_t&) { return drop_messages3.load(); }; @@ -1414,19 +1414,19 @@ void exclusive_kind_keyed_lost_liveliness( std::atomic drop_messages2(false); auto testTransport2 = std::make_shared(); - testTransport2->messages_filter_ = [&drop_messages2](eprosima::fastrtps::rtps::CDRMessage_t&) + testTransport2->messages_filter_ = [&drop_messages2](eprosima::fastdds::rtps::CDRMessage_t&) { return drop_messages2.load(); }; std::atomic drop_messages3(false); auto testTransport3 = std::make_shared(); - testTransport3->messages_filter_ = [&drop_messages3](eprosima::fastrtps::rtps::CDRMessage_t&) + testTransport3->messages_filter_ = [&drop_messages3](eprosima::fastdds::rtps::CDRMessage_t&) { return drop_messages3.load(); }; std::atomic drop_messages4(false); auto testTransport4 = std::make_shared(); - testTransport4->messages_filter_ = [&drop_messages4](eprosima::fastrtps::rtps::CDRMessage_t&) + testTransport4->messages_filter_ = [&drop_messages4](eprosima::fastdds::rtps::CDRMessage_t&) { return drop_messages4.load(); }; diff --git a/test/blackbox/common/DDSBlackboxTestsPersistence.cpp b/test/blackbox/common/DDSBlackboxTestsPersistence.cpp index 78be1c59d7e..0c494407baf 100644 --- a/test/blackbox/common/DDSBlackboxTestsPersistence.cpp +++ b/test/blackbox/common/DDSBlackboxTestsPersistence.cpp @@ -25,8 +25,8 @@ #include "ReqRepAsReliableHelloWorldReplier.hpp" #include "ReqRepAsReliableHelloWorldRequester.hpp" -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; enum communication_type { diff --git a/test/blackbox/common/DDSBlackboxTestsPersistenceGuid.cpp b/test/blackbox/common/DDSBlackboxTestsPersistenceGuid.cpp index 707109f6e79..22b60dc08d7 100644 --- a/test/blackbox/common/DDSBlackboxTestsPersistenceGuid.cpp +++ b/test/blackbox/common/DDSBlackboxTestsPersistenceGuid.cpp @@ -28,7 +28,7 @@ #include "PubSubReader.hpp" #include "PubSubWriter.hpp" -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; using namespace eprosima::fastdds::dds; enum communication_type diff --git a/test/blackbox/common/DDSBlackboxTestsPropertyQos.cpp b/test/blackbox/common/DDSBlackboxTestsPropertyQos.cpp index beb06dc37b7..d0927be49f1 100644 --- a/test/blackbox/common/DDSBlackboxTestsPropertyQos.cpp +++ b/test/blackbox/common/DDSBlackboxTestsPropertyQos.cpp @@ -29,7 +29,7 @@ const std::string INTERNAL_PROPERTY_VALUE = "Other Value"; } // namespace test -using namespace eprosima::fastrtps; +using namespace eprosima::fastdds; enum communication_type { @@ -88,11 +88,11 @@ class PropertyQos : public testing::TestWithParam TEST_P(PropertyQos, send_property_qos) { // Set Properties that will be sent and those that wont - eprosima::fastrtps::rtps::PropertyPolicy source_property_policy; + eprosima::fastdds::rtps::PropertyPolicy source_property_policy; // Add external property { - eprosima::fastrtps::rtps::Property property; + eprosima::fastdds::rtps::Property property; property.name(test::EXTERNAL_PROPERTY_NAME); property.value(test::EXTERNAL_PROPERTY_VALUE); property.propagate(true); @@ -100,7 +100,7 @@ TEST_P(PropertyQos, send_property_qos) } // Add internal property { - eprosima::fastrtps::rtps::Property property; + eprosima::fastdds::rtps::Property property; property.name(test::INTERNAL_PROPERTY_NAME); property.value(test::INTERNAL_PROPERTY_VALUE); property.propagate(false); diff --git a/test/blackbox/common/DDSBlackboxTestsSecurity.cpp b/test/blackbox/common/DDSBlackboxTestsSecurity.cpp index d067862750b..2175b9e6143 100644 --- a/test/blackbox/common/DDSBlackboxTestsSecurity.cpp +++ b/test/blackbox/common/DDSBlackboxTestsSecurity.cpp @@ -34,8 +34,8 @@ #include namespace fastdds = ::eprosima::fastdds::dds; -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; void set_authentication_config( rtps::PropertySeq& props) diff --git a/test/blackbox/common/DDSBlackboxTestsStatistics.cpp b/test/blackbox/common/DDSBlackboxTestsStatistics.cpp index b30c116b19f..d3e2f5e9a40 100644 --- a/test/blackbox/common/DDSBlackboxTestsStatistics.cpp +++ b/test/blackbox/common/DDSBlackboxTestsStatistics.cpp @@ -192,9 +192,9 @@ void test_discovery_topic_physical_data( // Avoid discovery of participants external to the test pqos.wire_protocol().builtin.discovery_config.ignoreParticipantFlags = - static_cast( - eprosima::fastrtps::rtps::ParticipantFilteringFlags_t::FILTER_DIFFERENT_HOST | - eprosima::fastrtps::rtps::ParticipantFilteringFlags_t::FILTER_DIFFERENT_PROCESS); + static_cast( + eprosima::fastdds::rtps::ParticipantFilteringFlags::FILTER_DIFFERENT_HOST | + eprosima::fastdds::rtps::ParticipantFilteringFlags::FILTER_DIFFERENT_PROCESS); // Configure physical properties according to test case switch (test_kind) @@ -244,11 +244,11 @@ void test_discovery_topic_physical_data( EXPECT_NE(nullptr, discovery_data_reader); // Get the second participant's physical properties - const std::string* p2_host = eprosima::fastrtps::rtps::PropertyPolicyHelper::find_property( + const std::string* p2_host = eprosima::fastdds::rtps::PropertyPolicyHelper::find_property( p2->get_qos().properties(), parameter_policy_physical_data_host); - const std::string* p2_user = eprosima::fastrtps::rtps::PropertyPolicyHelper::find_property( + const std::string* p2_user = eprosima::fastdds::rtps::PropertyPolicyHelper::find_property( p2->get_qos().properties(), parameter_policy_physical_data_user); - const std::string* p2_process = eprosima::fastrtps::rtps::PropertyPolicyHelper::find_property( + const std::string* p2_process = eprosima::fastdds::rtps::PropertyPolicyHelper::find_property( p2->get_qos().properties(), parameter_policy_physical_data_process); // Verify that the second participant's physical properties are set according to specification @@ -304,11 +304,11 @@ void test_discovery_topic_physical_data( waitset.attach_condition(condition); ConditionSeq triggered_conditions; - waitset.wait(triggered_conditions, eprosima::fastrtps::c_TimeInfinite); + waitset.wait(triggered_conditions, eprosima::fastdds::c_TimeInfinite); auto to_guid_prefix = [](const statistics::detail::GuidPrefix_s& prefix) { - eprosima::fastrtps::rtps::GuidPrefix_t guid_prefix; + eprosima::fastdds::rtps::GuidPrefix_t guid_prefix; for (size_t i = 0; i < prefix.value().size(); i++) { guid_prefix.value[i] = prefix.value()[i]; @@ -318,7 +318,7 @@ void test_discovery_topic_physical_data( auto to_entity_id = [](const statistics::detail::EntityId_s& id) { - eprosima::fastrtps::rtps::EntityId_t entity_id; + eprosima::fastdds::rtps::EntityId_t entity_id; for (size_t i = 0; i < id.value().size(); i++) { entity_id.value[i] = id.value()[i]; @@ -336,11 +336,11 @@ void test_discovery_topic_physical_data( if (info_seq[n].valid_data) { /* Get discovery information from the sample */ - eprosima::fastrtps::rtps::GuidPrefix_t local_prefix = to_guid_prefix( + eprosima::fastdds::rtps::GuidPrefix_t local_prefix = to_guid_prefix( discovery_time_seq[n].local_participant_guid().guidPrefix()); - eprosima::fastrtps::rtps::GuidPrefix_t remote_prefix = to_guid_prefix( + eprosima::fastdds::rtps::GuidPrefix_t remote_prefix = to_guid_prefix( discovery_time_seq[n].remote_entity_guid().guidPrefix()); - eprosima::fastrtps::rtps::EntityId_t remote_entity_id = to_entity_id( + eprosima::fastdds::rtps::EntityId_t remote_entity_id = to_entity_id( discovery_time_seq[n].remote_entity_guid().entityId()); /* Validate discovery sample */ @@ -414,9 +414,9 @@ TEST(DDSStatistics, simple_statistics_datareaders) auto depth = static_cast(num_samples); // Reader should be reliable so ACKNACK messages are generated (and accounted) - data_reader.reliability(RELIABLE_RELIABILITY_QOS).history_depth(depth).init(); + data_reader.reliability(eprosima::fastdds::RELIABLE_RELIABILITY_QOS).history_depth(depth).init(); // Enforce synchronous writer to force RTPS_SENT to have at least num_samples - data_writer.asynchronously(SYNCHRONOUS_PUBLISH_MODE).history_depth(depth).init(); + data_writer.asynchronously(eprosima::fastdds::SYNCHRONOUS_PUBLISH_MODE).history_depth(depth).init(); // Ensure discovery traffic is not included on statistics data_reader.wait_discovery(); diff --git a/test/blackbox/common/DDSBlackboxTestsThreadSettingsQos.cpp b/test/blackbox/common/DDSBlackboxTestsThreadSettingsQos.cpp index 1b487f9edda..90ddcfdf4cc 100644 --- a/test/blackbox/common/DDSBlackboxTestsThreadSettingsQos.cpp +++ b/test/blackbox/common/DDSBlackboxTestsThreadSettingsQos.cpp @@ -20,8 +20,8 @@ #include "PubSubReader.hpp" #include "PubSubWriter.hpp" -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; using namespace eprosima::fastdds::dds; class CustomLogConsumer : public LogConsumer diff --git a/test/blackbox/common/DDSBlackboxTestsTransportSHMUDP.cpp b/test/blackbox/common/DDSBlackboxTestsTransportSHMUDP.cpp index 212d03ce0bf..1d8b235a628 100644 --- a/test/blackbox/common/DDSBlackboxTestsTransportSHMUDP.cpp +++ b/test/blackbox/common/DDSBlackboxTestsTransportSHMUDP.cpp @@ -33,9 +33,8 @@ #include "PubSubReader.hpp" #include "PubSubWriter.hpp" -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; -using test_UDPv4Transport = eprosima::fastdds::rtps::test_UDPv4Transport; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; enum communication_type { @@ -192,7 +191,7 @@ static bool has_shm_locators( } static void check_shm_locators( - const eprosima::fastrtps::rtps::ParticipantDiscoveryInfo& info, + const eprosima::fastdds::rtps::ParticipantDiscoveryInfo& info, bool unicast, bool multicast) { @@ -209,7 +208,7 @@ static void shm_metatraffic_test( PubSubWriter writer(topic_name + "/" + value); PubSubReader reader(topic_name + "/" + value); - auto discovery_checker = [unicast, multicast](const eprosima::fastrtps::rtps::ParticipantDiscoveryInfo& info) + auto discovery_checker = [unicast, multicast](const eprosima::fastdds::rtps::ParticipantDiscoveryInfo& info) { check_shm_locators(info, unicast, multicast); return true; diff --git a/test/blackbox/common/DDSBlackboxTestsUserDataQos.cpp b/test/blackbox/common/DDSBlackboxTestsUserDataQos.cpp index 7c11834b750..80cf8c10eff 100644 --- a/test/blackbox/common/DDSBlackboxTestsUserDataQos.cpp +++ b/test/blackbox/common/DDSBlackboxTestsUserDataQos.cpp @@ -21,7 +21,7 @@ #include "BlackboxTests.hpp" #include "PubSubParticipant.hpp" -using namespace eprosima::fastrtps; +using namespace eprosima::fastdds; enum communication_type { diff --git a/test/blackbox/common/DatagramInjectionTransport.hpp b/test/blackbox/common/DatagramInjectionTransport.hpp index 9ef719f28c8..98c850f4ecb 100644 --- a/test/blackbox/common/DatagramInjectionTransport.hpp +++ b/test/blackbox/common/DatagramInjectionTransport.hpp @@ -21,8 +21,6 @@ #include #include -using SenderResource = eprosima::fastrtps::rtps::SenderResource; - namespace eprosima { namespace fastdds { namespace rtps { @@ -71,11 +69,11 @@ class DatagramInjectionTransport : public ChainingTransport } bool send( - eprosima::fastrtps::rtps::SenderResource* low_sender_resource, + eprosima::fastdds::rtps::SenderResource* low_sender_resource, const std::vector& buffers, uint32_t total_bytes, - eprosima::fastrtps::rtps::LocatorsIterator* destination_locators_begin, - eprosima::fastrtps::rtps::LocatorsIterator* destination_locators_end, + eprosima::fastdds::rtps::LocatorsIterator* destination_locators_begin, + eprosima::fastdds::rtps::LocatorsIterator* destination_locators_end, const std::chrono::steady_clock::time_point& timeout) override { return low_sender_resource->send(buffers, total_bytes, destination_locators_begin, @@ -84,16 +82,16 @@ class DatagramInjectionTransport : public ChainingTransport void receive( TransportReceiverInterface* next_receiver, - const eprosima::fastrtps::rtps::octet* receive_buffer, + const eprosima::fastdds::rtps::octet* receive_buffer, uint32_t receive_buffer_size, - const eprosima::fastrtps::rtps::Locator_t& local_locator, - const eprosima::fastrtps::rtps::Locator_t& remote_locator) override + const eprosima::fastdds::rtps::Locator_t& local_locator, + const eprosima::fastdds::rtps::Locator_t& remote_locator) override { next_receiver->OnDataReceived(receive_buffer, receive_buffer_size, local_locator, remote_locator); } bool OpenInputChannel( - const eprosima::fastrtps::rtps::Locator_t& loc, + const eprosima::fastdds::rtps::Locator_t& loc, TransportReceiverInterface* receiver_interface, uint32_t max_message_size) override { diff --git a/test/blackbox/common/RTPSAsSocketReader.hpp b/test/blackbox/common/RTPSAsSocketReader.hpp index e08f655523b..11f2f2d4994 100644 --- a/test/blackbox/common/RTPSAsSocketReader.hpp +++ b/test/blackbox/common/RTPSAsSocketReader.hpp @@ -53,7 +53,7 @@ #include #include -using eprosima::fastrtps::rtps::IPLocator; +using eprosima::fastdds::rtps::IPLocator; template class RTPSAsSocketReader @@ -65,7 +65,7 @@ class RTPSAsSocketReader private: - class Listener : public eprosima::fastrtps::rtps::ReaderListener + class Listener : public eprosima::fastdds::rtps::ReaderListener { public: @@ -80,8 +80,8 @@ class RTPSAsSocketReader } void on_new_cache_change_added( - eprosima::fastrtps::rtps::RTPSReader* reader, - const eprosima::fastrtps::rtps::CacheChange_t* const change) override + eprosima::fastdds::rtps::RTPSReader* reader, + const eprosima::fastdds::rtps::CacheChange_t* const change) override { ASSERT_NE(reader, nullptr); ASSERT_NE(change, nullptr); @@ -117,7 +117,7 @@ class RTPSAsSocketReader magicword_ = mw.str(); // By default, memory mode is PREALLOCATED_WITH_REALLOC_MEMORY_MODE - hattr_.memoryPolicy = eprosima::fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; + hattr_.memoryPolicy = eprosima::fastdds::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; // By default, heartbeat period delay is 100 milliseconds. reader_attr_.times.heartbeat_response_delay.seconds = 0; @@ -128,7 +128,7 @@ class RTPSAsSocketReader { if (participant_ != nullptr) { - eprosima::fastrtps::rtps::RTPSDomain::removeRTPSParticipant(participant_); + eprosima::fastdds::rtps::RTPSDomain::removeRTPSParticipant(participant_); } if (history_ != nullptr) { @@ -139,28 +139,28 @@ class RTPSAsSocketReader // TODO Change api of set_IP4_address to support const string. void init() { - eprosima::fastrtps::rtps::RTPSParticipantAttributes pattr; - pattr.builtin.discovery_config.discoveryProtocol = eprosima::fastrtps::rtps::DiscoveryProtocol::NONE; + eprosima::fastdds::rtps::RTPSParticipantAttributes pattr; + pattr.builtin.discovery_config.discoveryProtocol = eprosima::fastdds::rtps::DiscoveryProtocol::NONE; pattr.builtin.use_WriterLivelinessProtocol = false; pattr.participantID = 1; - participant_ = eprosima::fastrtps::rtps::RTPSDomain::createParticipant((uint32_t)GET_PID() % 230, pattr); + participant_ = eprosima::fastdds::rtps::RTPSDomain::createParticipant((uint32_t)GET_PID() % 230, pattr); ASSERT_NE(participant_, nullptr); //Create readerhistory hattr_.payloadMaxSize = 255 + type_.m_typeSize; - history_ = new eprosima::fastrtps::rtps::ReaderHistory(hattr_); + history_ = new eprosima::fastdds::rtps::ReaderHistory(hattr_); ASSERT_NE(history_, nullptr); //Create reader auto attr = reader_attr_; attr.accept_messages_from_unkown_writers = - eprosima::fastrtps::rtps::RELIABLE != reader_attr_.endpoint.reliabilityKind; - reader_ = eprosima::fastrtps::rtps::RTPSDomain::createRTPSReader(participant_, attr, history_, + eprosima::fastdds::rtps::RELIABLE != reader_attr_.endpoint.reliabilityKind; + reader_ = eprosima::fastdds::rtps::RTPSDomain::createRTPSReader(participant_, attr, history_, &listener_); ASSERT_NE(reader_, nullptr); register_writer(); - + initialized_ = true; } @@ -173,7 +173,7 @@ class RTPSAsSocketReader { if (participant_ != nullptr) { - eprosima::fastrtps::rtps::RTPSDomain::removeRTPSParticipant(participant_); + eprosima::fastdds::rtps::RTPSDomain::removeRTPSParticipant(participant_); participant_ = nullptr; } @@ -214,10 +214,10 @@ class RTPSAsSocketReader receiving_ = true; mutex_.unlock(); - std::unique_lock lock(*history_->getMutex()); + std::unique_lock lock(*history_->getMutex()); while (history_->changesBegin() != history_->changesEnd()) { - eprosima::fastrtps::rtps::CacheChange_t* change = *history_->changesBegin(); + eprosima::fastdds::rtps::CacheChange_t* change = *history_->changesBegin(); receive_one(reader_, change); } } @@ -261,11 +261,11 @@ class RTPSAsSocketReader /*** Function to change QoS ***/ RTPSAsSocketReader& reliability( - const eprosima::fastrtps::rtps::ReliabilityKind_t kind) + const eprosima::fastdds::rtps::ReliabilityKind_t kind) { reader_attr_.endpoint.reliabilityKind = kind; - if (kind == eprosima::fastrtps::rtps::ReliabilityKind_t::RELIABLE) + if (kind == eprosima::fastdds::rtps::ReliabilityKind_t::RELIABLE) { reader_attr_.endpoint.setEntityID(1); } @@ -279,7 +279,7 @@ class RTPSAsSocketReader ip_ = ip; port_ = port; - eprosima::fastrtps::rtps::Locator_t loc; + eprosima::fastdds::rtps::Locator_t loc; IPLocator::setIPv4(loc, ip); loc.port = static_cast(port); reader_attr_.endpoint.multicastLocatorList.push_back(loc); @@ -289,7 +289,7 @@ class RTPSAsSocketReader void register_writer() { - if (reader_attr_.endpoint.reliabilityKind == eprosima::fastrtps::rtps::RELIABLE) + if (reader_attr_.endpoint.reliabilityKind == eprosima::fastdds::rtps::RELIABLE) { if (port_ == 0) { @@ -297,10 +297,10 @@ class RTPSAsSocketReader } //Add remote writer (in this case a reader in the same machine) - eprosima::fastrtps::rtps::GUID_t guid = participant_->getGuid(); + eprosima::fastdds::rtps::GUID_t guid = participant_->getGuid(); - eprosima::fastrtps::rtps::WriterProxyData wattr(4u, 1u); - eprosima::fastrtps::rtps::Locator_t loc; + eprosima::fastdds::rtps::WriterProxyData wattr(4u, 1u); + eprosima::fastdds::rtps::Locator_t loc; IPLocator::setIPv4(loc, ip_); loc.port = static_cast(port_); wattr.add_multicast_locator(loc); @@ -335,8 +335,8 @@ class RTPSAsSocketReader private: void receive_one( - eprosima::fastrtps::rtps::RTPSReader* reader, - const eprosima::fastrtps::rtps::CacheChange_t* change) + eprosima::fastdds::rtps::RTPSReader* reader, + const eprosima::fastdds::rtps::CacheChange_t* change) { std::unique_lock lock(mutex_); @@ -366,28 +366,28 @@ class RTPSAsSocketReader cv_.notify_one(); } - eprosima::fastrtps::rtps::ReaderHistory* history = reader->get_history(); + eprosima::fastdds::rtps::ReaderHistory* history = reader->get_history(); ASSERT_NE(history, nullptr); - history->remove_change((eprosima::fastrtps::rtps::CacheChange_t*)change); + history->remove_change((eprosima::fastdds::rtps::CacheChange_t*)change); } } RTPSAsSocketReader& operator =( const RTPSAsSocketReader&) = delete; - eprosima::fastrtps::rtps::RTPSParticipant* participant_; - eprosima::fastrtps::rtps::ReaderAttributes reader_attr_; - eprosima::fastrtps::rtps::RTPSReader* reader_; - eprosima::fastrtps::rtps::ReaderHistory* history_; - eprosima::fastrtps::rtps::HistoryAttributes hattr_; + eprosima::fastdds::rtps::RTPSParticipant* participant_; + eprosima::fastdds::rtps::ReaderAttributes reader_attr_; + eprosima::fastdds::rtps::RTPSReader* reader_; + eprosima::fastdds::rtps::ReaderHistory* history_; + eprosima::fastdds::rtps::HistoryAttributes hattr_; std::atomic initialized_; std::list total_msgs_; std::mutex mutex_; std::condition_variable cv_; std::string magicword_; std::atomic receiving_; - eprosima::fastrtps::rtps::SequenceNumber_t last_seq_; + eprosima::fastdds::rtps::SequenceNumber_t last_seq_; std::atomic current_received_count_; std::atomic number_samples_expected_; std::string ip_; diff --git a/test/blackbox/common/RTPSAsSocketWriter.hpp b/test/blackbox/common/RTPSAsSocketWriter.hpp index a1615dbbe1e..edfe50f707a 100644 --- a/test/blackbox/common/RTPSAsSocketWriter.hpp +++ b/test/blackbox/common/RTPSAsSocketWriter.hpp @@ -42,10 +42,10 @@ #include -using eprosima::fastrtps::rtps::IPLocator; +using eprosima::fastdds::rtps::IPLocator; template -class RTPSAsSocketWriter : public eprosima::fastrtps::rtps::WriterListener +class RTPSAsSocketWriter : public eprosima::fastdds::rtps::WriterListener { public: @@ -66,7 +66,7 @@ class RTPSAsSocketWriter : public eprosima::fastrtps::rtps::WriterListener magicword_ = mw.str(); // By default, memory mode is PREALLOCATED_WITH_REALLOC_MEMORY_MODE - hattr_.memoryPolicy = eprosima::fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; + hattr_.memoryPolicy = eprosima::fastdds::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; // By default, heartbeat period and nack response delay are 100 milliseconds. writer_attr_.times.heartbeatPeriod.seconds = 0; @@ -79,7 +79,7 @@ class RTPSAsSocketWriter : public eprosima::fastrtps::rtps::WriterListener { if (participant_ != nullptr) { - eprosima::fastrtps::rtps::RTPSDomain::removeRTPSParticipant(participant_); + eprosima::fastdds::rtps::RTPSDomain::removeRTPSParticipant(participant_); } if (history_ != nullptr) { @@ -88,10 +88,10 @@ class RTPSAsSocketWriter : public eprosima::fastrtps::rtps::WriterListener } void onWriterChangeReceivedByAll( - eprosima::fastrtps::rtps::RTPSWriter* /*writer*/, - eprosima::fastrtps::rtps::CacheChange_t* change) override + eprosima::fastdds::rtps::RTPSWriter* /*writer*/, + eprosima::fastdds::rtps::CacheChange_t* change) override { - if (writer_attr_.endpoint.durabilityKind == eprosima::fastrtps::rtps::VOLATILE) + if (writer_attr_.endpoint.durabilityKind == eprosima::fastdds::rtps::VOLATILE) { history_->remove_change_g(change); std::cout << "Change removed" << std::endl; @@ -102,21 +102,21 @@ class RTPSAsSocketWriter : public eprosima::fastrtps::rtps::WriterListener { //Create participant participant_attr_.builtin.discovery_config.discoveryProtocol = - eprosima::fastrtps::rtps::DiscoveryProtocol::NONE; + eprosima::fastdds::rtps::DiscoveryProtocol::NONE; participant_attr_.builtin.use_WriterLivelinessProtocol = false; participant_attr_.participantID = 2; - participant_ = eprosima::fastrtps::rtps::RTPSDomain::createParticipant( + participant_ = eprosima::fastdds::rtps::RTPSDomain::createParticipant( (uint32_t)GET_PID() % 230, participant_attr_); ASSERT_NE(participant_, nullptr); //Create writerhistory hattr_.payloadMaxSize = 255 + type_.m_typeSize; - history_ = new eprosima::fastrtps::rtps::WriterHistory(hattr_); + history_ = new eprosima::fastdds::rtps::WriterHistory(hattr_); //Create writer - eprosima::fastrtps::rtps::WriterListener* listener = auto_remove_ ? this : nullptr; + eprosima::fastdds::rtps::WriterListener* listener = auto_remove_ ? this : nullptr; writer_ = - eprosima::fastrtps::rtps::RTPSDomain::createRTPSWriter(participant_, writer_attr_, history_, listener); + eprosima::fastdds::rtps::RTPSDomain::createRTPSWriter(participant_, writer_attr_, history_, listener); ASSERT_NE(writer_, nullptr); register_reader(); @@ -136,7 +136,7 @@ class RTPSAsSocketWriter : public eprosima::fastrtps::rtps::WriterListener while (it != msgs.end()) { - eprosima::fastrtps::rtps::CacheChange_t* ch = writer_->new_change([&]() -> uint32_t + eprosima::fastdds::rtps::CacheChange_t* ch = writer_->new_change([&]() -> uint32_t { size_t current_alignment = 4 + magicword_.size() + 1; #if FASTCDR_VERSION_MAJOR == 1 @@ -149,7 +149,7 @@ class RTPSAsSocketWriter : public eprosima::fastrtps::rtps::WriterListener calculator.calculate_serialized_size(*it, current_alignment)); #endif // FASTCDR_VERSION_MAJOR == 1 } - , eprosima::fastrtps::rtps::ALIVE); + , eprosima::fastdds::rtps::ALIVE); eprosima::fastcdr::FastBuffer buffer((char*)ch->serializedPayload.data, ch->serializedPayload.max_size); eprosima::fastcdr::Cdr cdr(buffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, @@ -171,7 +171,7 @@ class RTPSAsSocketWriter : public eprosima::fastrtps::rtps::WriterListener bool wait_for_all_acked( const std::chrono::seconds& seconds) { - eprosima::fastrtps::Duration_t max_time(int32_t(seconds.count()), 0); + eprosima::fastdds::Duration_t max_time(int32_t(seconds.count()), 0); return writer_->wait_for_all_acked(max_time); } @@ -188,11 +188,11 @@ class RTPSAsSocketWriter : public eprosima::fastrtps::rtps::WriterListener /*** Function to change QoS ***/ RTPSAsSocketWriter& reliability( - const eprosima::fastrtps::rtps::ReliabilityKind_t kind) + const eprosima::fastdds::rtps::ReliabilityKind_t kind) { writer_attr_.endpoint.reliabilityKind = kind; - if (kind == eprosima::fastrtps::rtps::ReliabilityKind_t::RELIABLE) + if (kind == eprosima::fastdds::rtps::ReliabilityKind_t::RELIABLE) { writer_attr_.endpoint.setEntityID(2); } @@ -200,7 +200,7 @@ class RTPSAsSocketWriter : public eprosima::fastrtps::rtps::WriterListener } RTPSAsSocketWriter& durability( - const eprosima::fastrtps::rtps::DurabilityKind_t kind) + const eprosima::fastdds::rtps::DurabilityKind_t kind) { writer_attr_.endpoint.durabilityKind = kind; @@ -214,7 +214,7 @@ class RTPSAsSocketWriter : public eprosima::fastrtps::rtps::WriterListener ip_ = ip; port_ = port; - eprosima::fastrtps::rtps::Locator_t loc; + eprosima::fastdds::rtps::Locator_t loc; IPLocator::setIPv4(loc, ip); loc.port = static_cast(port); writer_attr_.endpoint.multicastLocatorList.push_back(loc); @@ -230,15 +230,15 @@ class RTPSAsSocketWriter : public eprosima::fastrtps::rtps::WriterListener } //Add remote reader (in this case a reader in the same machine) - eprosima::fastrtps::rtps::GUID_t guid = participant_->getGuid(); + eprosima::fastdds::rtps::GUID_t guid = participant_->getGuid(); - eprosima::fastrtps::rtps::ReaderProxyData rattr(4u, 1u); - eprosima::fastrtps::rtps::Locator_t loc; + eprosima::fastdds::rtps::ReaderProxyData rattr(4u, 1u); + eprosima::fastdds::rtps::Locator_t loc; IPLocator::setIPv4(loc, ip_); loc.port = static_cast(port_); rattr.add_unicast_locator(loc); - if (writer_attr_.endpoint.reliabilityKind == eprosima::fastrtps::rtps::RELIABLE) + if (writer_attr_.endpoint.reliabilityKind == eprosima::fastdds::rtps::RELIABLE) { rattr.m_qos.m_reliability.kind = eprosima::fastdds::dds::RELIABLE_RELIABILITY_QOS; } @@ -271,7 +271,7 @@ class RTPSAsSocketWriter : public eprosima::fastrtps::rtps::WriterListener } RTPSAsSocketWriter& asynchronously( - const eprosima::fastrtps::rtps::RTPSWriterPublishMode mode) + const eprosima::fastdds::rtps::RTPSWriterPublishMode mode) { writer_attr_.mode = mode; @@ -311,13 +311,13 @@ class RTPSAsSocketWriter : public eprosima::fastrtps::rtps::WriterListener int32_t sec) { writer_attr_.disable_positive_acks = disable; - writer_attr_.keep_duration = eprosima::fastrtps::Duration_t(sec, 0); + writer_attr_.keep_duration = eprosima::fastdds::Duration_t(sec, 0); return *this; } /*** Access RTPSWriter functions ***/ void updateAttributes( - const eprosima::fastrtps::rtps::WriterAttributes& att) + const eprosima::fastdds::rtps::WriterAttributes& att) { writer_->updateAttributes(att); return; @@ -330,12 +330,12 @@ class RTPSAsSocketWriter : public eprosima::fastrtps::rtps::WriterListener private: - eprosima::fastrtps::rtps::RTPSParticipant* participant_; - eprosima::fastrtps::rtps::RTPSWriter* writer_; - eprosima::fastrtps::rtps::RTPSParticipantAttributes participant_attr_; - eprosima::fastrtps::rtps::WriterAttributes writer_attr_; - eprosima::fastrtps::rtps::WriterHistory* history_; - eprosima::fastrtps::rtps::HistoryAttributes hattr_; + eprosima::fastdds::rtps::RTPSParticipant* participant_; + eprosima::fastdds::rtps::RTPSWriter* writer_; + eprosima::fastdds::rtps::RTPSParticipantAttributes participant_attr_; + eprosima::fastdds::rtps::WriterAttributes writer_attr_; + eprosima::fastdds::rtps::WriterHistory* history_; + eprosima::fastdds::rtps::HistoryAttributes hattr_; bool initialized_; bool auto_remove_; std::string magicword_; diff --git a/test/blackbox/common/RTPSBlackboxTests.cpp b/test/blackbox/common/RTPSBlackboxTests.cpp index c4eba1e7cdf..525748bf4cf 100644 --- a/test/blackbox/common/RTPSBlackboxTests.cpp +++ b/test/blackbox/common/RTPSBlackboxTests.cpp @@ -28,8 +28,8 @@ #include "RTPSWithRegistrationReader.hpp" #include "RTPSWithRegistrationWriter.hpp" -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; //#define cout "Use Log instead!" @@ -65,7 +65,7 @@ class BlackboxEnvironment : public ::testing::Environment // datasharing are only tested when required. eprosima::fastdds::LibrarySettings att; att.intraprocess_delivery = eprosima::fastdds::INTRAPROCESS_OFF; - eprosima::fastrtps::rtps::RTPSDomain::set_library_settings(att); + eprosima::fastdds::rtps::RTPSDomain::set_library_settings(att); //enable_datasharing = false; //Log::SetVerbosity(eprosima::fastdds::dds::Log::Info); @@ -76,7 +76,7 @@ class BlackboxEnvironment : public ::testing::Environment { //Log::Reset(); eprosima::fastdds::dds::Log::KillThread(); - eprosima::fastrtps::rtps::RTPSDomain::stopAll(); + eprosima::fastdds::rtps::RTPSDomain::stopAll(); } }; diff --git a/test/blackbox/common/RTPSBlackboxTestsBasic.cpp b/test/blackbox/common/RTPSBlackboxTestsBasic.cpp index 8dbf9bd2c44..41ac24f7eb2 100644 --- a/test/blackbox/common/RTPSBlackboxTestsBasic.cpp +++ b/test/blackbox/common/RTPSBlackboxTestsBasic.cpp @@ -37,9 +37,8 @@ #include "RTPSWithRegistrationReader.hpp" #include "RTPSWithRegistrationWriter.hpp" -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; -using test_UDPv4Transport = eprosima::fastdds::rtps::test_UDPv4Transport; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; enum communication_type { @@ -58,7 +57,7 @@ class RTPS : public testing::TestWithParam { case INTRAPROCESS: library_settings.intraprocess_delivery = eprosima::fastdds::IntraprocessDeliveryType::INTRAPROCESS_FULL; - eprosima::fastrtps::rtps::RTPSDomain::set_library_settings(library_settings); + eprosima::fastdds::rtps::RTPSDomain::set_library_settings(library_settings); break; case TRANSPORT: default: @@ -73,7 +72,7 @@ class RTPS : public testing::TestWithParam { case INTRAPROCESS: library_settings.intraprocess_delivery = eprosima::fastdds::IntraprocessDeliveryType::INTRAPROCESS_OFF; - eprosima::fastrtps::rtps::RTPSDomain::set_library_settings(library_settings); + eprosima::fastdds::rtps::RTPSDomain::set_library_settings(library_settings); break; case TRANSPORT: default: @@ -93,7 +92,7 @@ TEST_P(RTPS, RTPSAsNonReliableSocket) ASSERT_TRUE(reader.isInitialized()); - writer.reliability(eprosima::fastrtps::rtps::ReliabilityKind_t::BEST_EFFORT). + writer.reliability(eprosima::fastdds::rtps::ReliabilityKind_t::BEST_EFFORT). add_to_multicast_locator_list(ip, global_port).init(); ASSERT_TRUE(writer.isInitialized()); @@ -120,9 +119,9 @@ TEST_P(RTPS, AsyncRTPSAsNonReliableSocket) ASSERT_TRUE(reader.isInitialized()); - writer.reliability(eprosima::fastrtps::rtps::ReliabilityKind_t::BEST_EFFORT). + writer.reliability(eprosima::fastdds::rtps::ReliabilityKind_t::BEST_EFFORT). add_to_multicast_locator_list(ip, global_port). - asynchronously(eprosima::fastrtps::rtps::RTPSWriterPublishMode::ASYNCHRONOUS_WRITER).init(); + asynchronously(eprosima::fastdds::rtps::RTPSWriterPublishMode::ASYNCHRONOUS_WRITER).init(); ASSERT_TRUE(writer.isInitialized()); @@ -150,9 +149,9 @@ TEST_P(RTPS, AsyncRTPSAsNonReliableSocketWithWriterSpecificFlowControl) uint32_t bytesPerPeriod = 440; // Roughly ten times the size of the payload being sent uint32_t periodMillisecs = 300; - writer.reliability(eprosima::fastrtps::rtps::ReliabilityKind_t::BEST_EFFORT). + writer.reliability(eprosima::fastdds::rtps::ReliabilityKind_t::BEST_EFFORT). add_to_multicast_locator_list(ip, global_port). - asynchronously(eprosima::fastrtps::rtps::RTPSWriterPublishMode::ASYNCHRONOUS_WRITER). + asynchronously(eprosima::fastdds::rtps::RTPSWriterPublishMode::ASYNCHRONOUS_WRITER). add_flow_controller_descriptor_to_pparams(bytesPerPeriod, periodMillisecs).init(); ASSERT_TRUE(writer.isInitialized()); @@ -175,12 +174,12 @@ TEST_P(RTPS, RTPSAsReliableSocket) RTPSAsSocketWriter writer(TEST_TOPIC_NAME); std::string ip("239.255.1.4"); - reader.reliability(eprosima::fastrtps::rtps::ReliabilityKind_t::RELIABLE). + reader.reliability(eprosima::fastdds::rtps::ReliabilityKind_t::RELIABLE). add_to_multicast_locator_list(ip, global_port).init(); ASSERT_TRUE(reader.isInitialized()); - writer.reliability(eprosima::fastrtps::rtps::ReliabilityKind_t::RELIABLE). + writer.reliability(eprosima::fastdds::rtps::ReliabilityKind_t::RELIABLE). add_to_multicast_locator_list(ip, global_port).init(); ASSERT_TRUE(writer.isInitialized()); @@ -204,14 +203,14 @@ TEST_P(RTPS, AsyncRTPSAsReliableSocket) RTPSAsSocketWriter writer(TEST_TOPIC_NAME); std::string ip("239.255.1.4"); - reader.reliability(eprosima::fastrtps::rtps::ReliabilityKind_t::RELIABLE). + reader.reliability(eprosima::fastdds::rtps::ReliabilityKind_t::RELIABLE). add_to_multicast_locator_list(ip, global_port).init(); ASSERT_TRUE(reader.isInitialized()); - writer.reliability(eprosima::fastrtps::rtps::ReliabilityKind_t::RELIABLE). + writer.reliability(eprosima::fastdds::rtps::ReliabilityKind_t::RELIABLE). add_to_multicast_locator_list(ip, global_port). - asynchronously(eprosima::fastrtps::rtps::RTPSWriterPublishMode::ASYNCHRONOUS_WRITER).init(); + asynchronously(eprosima::fastdds::rtps::RTPSWriterPublishMode::ASYNCHRONOUS_WRITER).init(); ASSERT_TRUE(writer.isInitialized()); @@ -238,7 +237,7 @@ TEST_P(RTPS, RTPSAsNonReliableWithRegistration) ASSERT_TRUE(reader.isInitialized()); - writer.reliability(eprosima::fastrtps::rtps::ReliabilityKind_t::BEST_EFFORT).init(); + writer.reliability(eprosima::fastdds::rtps::ReliabilityKind_t::BEST_EFFORT).init(); ASSERT_TRUE(writer.isInitialized()); @@ -268,8 +267,8 @@ TEST_P(RTPS, AsyncRTPSAsNonReliableWithRegistration) ASSERT_TRUE(reader.isInitialized()); - writer.reliability(eprosima::fastrtps::rtps::ReliabilityKind_t::BEST_EFFORT). - asynchronously(eprosima::fastrtps::rtps::RTPSWriterPublishMode::ASYNCHRONOUS_WRITER).init(); + writer.reliability(eprosima::fastdds::rtps::ReliabilityKind_t::BEST_EFFORT). + asynchronously(eprosima::fastdds::rtps::RTPSWriterPublishMode::ASYNCHRONOUS_WRITER).init(); ASSERT_TRUE(writer.isInitialized()); @@ -296,7 +295,7 @@ TEST_P(RTPS, RTPSAsReliableWithRegistration) std::string ip("239.255.1.4"); reader.add_to_multicast_locator_list(ip, global_port). - reliability(eprosima::fastrtps::rtps::ReliabilityKind_t::RELIABLE).init(); + reliability(eprosima::fastdds::rtps::ReliabilityKind_t::RELIABLE).init(); ASSERT_TRUE(reader.isInitialized()); @@ -328,11 +327,11 @@ TEST_P(RTPS, AsyncRTPSAsReliableWithRegistration) std::string ip("239.255.1.4"); reader.add_to_multicast_locator_list(ip, global_port). - reliability(eprosima::fastrtps::rtps::ReliabilityKind_t::RELIABLE).init(); + reliability(eprosima::fastdds::rtps::ReliabilityKind_t::RELIABLE).init(); ASSERT_TRUE(reader.isInitialized()); - writer.asynchronously(eprosima::fastrtps::rtps::RTPSWriterPublishMode::ASYNCHRONOUS_WRITER).init(); + writer.asynchronously(eprosima::fastdds::rtps::RTPSWriterPublishMode::ASYNCHRONOUS_WRITER).init(); ASSERT_TRUE(writer.isInitialized()); @@ -360,13 +359,13 @@ TEST_P(RTPS, RTPSAsReliableVolatileSocket) RTPSAsSocketWriter writer(TEST_TOPIC_NAME); std::string ip("239.255.1.4"); - reader.reliability(eprosima::fastrtps::rtps::ReliabilityKind_t::RELIABLE). + reader.reliability(eprosima::fastdds::rtps::ReliabilityKind_t::RELIABLE). add_to_multicast_locator_list(ip, global_port).init(); ASSERT_TRUE(reader.isInitialized()); - writer.reliability(eprosima::fastrtps::rtps::ReliabilityKind_t::RELIABLE). - durability(eprosima::fastrtps::rtps::DurabilityKind_t::VOLATILE). + writer.reliability(eprosima::fastdds::rtps::ReliabilityKind_t::RELIABLE). + durability(eprosima::fastdds::rtps::DurabilityKind_t::VOLATILE). add_to_multicast_locator_list(ip, global_port). auto_remove_on_volatile().init(); @@ -410,12 +409,12 @@ TEST_P(RTPS, RTPSAsReliableWithRegistrationAndHolesInHistory) testTransport->dropLogLength = 1; reader. - durability(eprosima::fastrtps::rtps::DurabilityKind_t::TRANSIENT_LOCAL). - reliability(eprosima::fastrtps::rtps::ReliabilityKind_t::RELIABLE).init(); + durability(eprosima::fastdds::rtps::DurabilityKind_t::TRANSIENT_LOCAL). + reliability(eprosima::fastdds::rtps::ReliabilityKind_t::RELIABLE).init(); ASSERT_TRUE(reader.isInitialized()); - writer.durability(eprosima::fastrtps::rtps::DurabilityKind_t::TRANSIENT_LOCAL). + writer.durability(eprosima::fastdds::rtps::DurabilityKind_t::TRANSIENT_LOCAL). disable_builtin_transport(). add_user_transport_to_pparams(testTransport).init(); @@ -445,7 +444,7 @@ TEST_P(RTPS, RTPSAsReliableWithRegistrationAndHolesInHistory) { if ((it->index() % 2) == 0) { - eprosima::fastrtps::rtps::SequenceNumber_t seq {0, it->index()}; + eprosima::fastdds::rtps::SequenceNumber_t seq {0, it->index()}; writer.remove_change(seq); it = data.erase(it); } @@ -459,8 +458,8 @@ TEST_P(RTPS, RTPSAsReliableWithRegistrationAndHolesInHistory) RTPSWithRegistrationReader late_joiner(TEST_TOPIC_NAME); late_joiner. - durability(eprosima::fastrtps::rtps::DurabilityKind_t::TRANSIENT_LOCAL). - reliability(eprosima::fastrtps::rtps::ReliabilityKind_t::RELIABLE).init(); + durability(eprosima::fastdds::rtps::DurabilityKind_t::TRANSIENT_LOCAL). + reliability(eprosima::fastdds::rtps::ReliabilityKind_t::RELIABLE).init(); ASSERT_TRUE(late_joiner.isInitialized()); @@ -487,17 +486,17 @@ TEST(RTPS, RTPSUnavailableSampleGapWhenSeparateSending) auto testTransport = std::make_shared(); reader. - durability(eprosima::fastrtps::rtps::DurabilityKind_t::TRANSIENT_LOCAL). + durability(eprosima::fastdds::rtps::DurabilityKind_t::TRANSIENT_LOCAL). history_depth(3). - reliability(eprosima::fastrtps::rtps::ReliabilityKind_t::RELIABLE).init(); + reliability(eprosima::fastdds::rtps::ReliabilityKind_t::RELIABLE).init(); ASSERT_TRUE(reader.isInitialized()); // set_separate_sending - writer.durability(eprosima::fastrtps::rtps::DurabilityKind_t::TRANSIENT_LOCAL). + writer.durability(eprosima::fastdds::rtps::DurabilityKind_t::TRANSIENT_LOCAL). disable_builtin_transport(). - reliability(eprosima::fastrtps::rtps::ReliabilityKind_t::RELIABLE). + reliability(eprosima::fastdds::rtps::ReliabilityKind_t::RELIABLE). history_depth(3). add_user_transport_to_pparams(testTransport).init(); @@ -809,15 +808,15 @@ TEST(RTPS, MultithreadedWriterCreation) auto thread_run = [rtps_participant, flow_controller_name, &finish_mtx, &finish_cv, &should_finish]() { /* Create writer history */ - eprosima::fastrtps::rtps::HistoryAttributes hattr; - eprosima::fastrtps::rtps::WriterHistory* history = new eprosima::fastrtps::rtps::WriterHistory(hattr); - eprosima::fastrtps::TopicAttributes topic_attr; + eprosima::fastdds::rtps::HistoryAttributes hattr; + eprosima::fastdds::rtps::WriterHistory* history = new eprosima::fastdds::rtps::WriterHistory(hattr); + eprosima::fastdds::TopicAttributes topic_attr; /* Create writer with a flow controller */ - eprosima::fastrtps::rtps::WriterAttributes writer_attr; + eprosima::fastdds::rtps::WriterAttributes writer_attr; writer_attr.mode = RTPSWriterPublishMode::ASYNCHRONOUS_WRITER; writer_attr.flow_controller_name = flow_controller_name; - eprosima::fastrtps::rtps::RTPSWriter* writer = eprosima::fastrtps::rtps::RTPSDomain::createRTPSWriter( + eprosima::fastdds::rtps::RTPSWriter* writer = eprosima::fastdds::rtps::RTPSDomain::createRTPSWriter( rtps_participant, writer_attr, history, nullptr); /* Register writer in participant */ @@ -876,8 +875,8 @@ class CustomReaderDataFilter : public eprosima::fastdds::rtps::IReaderDataFilter ~CustomReaderDataFilter() = default; bool is_relevant( - const eprosima::fastrtps::rtps::CacheChange_t& change, - const eprosima::fastrtps::rtps::GUID_t& reader_guid) const override + const eprosima::fastdds::rtps::CacheChange_t& change, + const eprosima::fastdds::rtps::GUID_t& reader_guid) const override { static_cast(reader_guid); if (change.sequenceNumber == SequenceNumber_t{0, 3}) @@ -907,7 +906,7 @@ void has_been_fully_delivered_test( auto data = default_helloworld_data_generator(3); // No matched RTPSReaders: sample considered delivered - eprosima::fastrtps::rtps::CacheChange_t* change = writer_1.send_sample(data.front()); + eprosima::fastdds::rtps::CacheChange_t* change = writer_1.send_sample(data.front()); EXPECT_TRUE(writer_1.has_been_fully_delivered(change->sequenceNumber)); data.pop_front(); @@ -1054,10 +1053,10 @@ TEST(RTPS, participant_ignore_local_endpoints) eprosima::fastdds::dds::Log::RegisterConsumer(std::move(log_consumer_unique_ptr)); // Create the RTPSParticipant with the appropriate value for the property - eprosima::fastrtps::rtps::RTPSParticipantAttributes patt; + eprosima::fastdds::rtps::RTPSParticipantAttributes patt; patt.properties.properties().emplace_back("fastdds.ignore_local_endpoints", test_config.property_value); - eprosima::fastrtps::rtps::RTPSParticipant* participant = - eprosima::fastrtps::rtps::RTPSDomain::createParticipant(static_cast(GET_PID()) % 230, patt); + eprosima::fastdds::rtps::RTPSParticipant* participant = + eprosima::fastdds::rtps::RTPSDomain::createParticipant(static_cast(GET_PID()) % 230, patt); ASSERT_NE(participant, nullptr); /* Procedure */ @@ -1093,7 +1092,7 @@ TEST(RTPS, participant_ignore_local_endpoints) 1)), test_config.log_errors); /* Tear-down */ - eprosima::fastrtps::rtps::RTPSDomain::removeRTPSParticipant(participant); + eprosima::fastdds::rtps::RTPSDomain::removeRTPSParticipant(participant); eprosima::fastdds::dds::Log::Reset(); } } @@ -1112,13 +1111,13 @@ TEST(RTPS, participant_ignore_local_endpoints_two_participants) /* Set up */ // Create the RTPSParticipants with the appropriate value for the property - eprosima::fastrtps::rtps::RTPSParticipantAttributes patt; + eprosima::fastdds::rtps::RTPSParticipantAttributes patt; patt.properties.properties().emplace_back("fastdds.ignore_local_endpoints", "true"); - eprosima::fastrtps::rtps::RTPSParticipant* participant_writer = - eprosima::fastrtps::rtps::RTPSDomain::createParticipant(static_cast(GET_PID()) % 230, patt); + eprosima::fastdds::rtps::RTPSParticipant* participant_writer = + eprosima::fastdds::rtps::RTPSDomain::createParticipant(static_cast(GET_PID()) % 230, patt); ASSERT_NE(participant_writer, nullptr); - eprosima::fastrtps::rtps::RTPSParticipant* participant_reader = - eprosima::fastrtps::rtps::RTPSDomain::createParticipant(static_cast(GET_PID()) % 230, patt); + eprosima::fastdds::rtps::RTPSParticipant* participant_reader = + eprosima::fastdds::rtps::RTPSDomain::createParticipant(static_cast(GET_PID()) % 230, patt); ASSERT_NE(participant_reader, nullptr); /* Procedure */ @@ -1150,8 +1149,8 @@ TEST(RTPS, participant_ignore_local_endpoints_two_participants) EXPECT_EQ(reader.getReceivedCount(), 5u); /* Tear-down */ - eprosima::fastrtps::rtps::RTPSDomain::removeRTPSParticipant(participant_writer); - eprosima::fastrtps::rtps::RTPSDomain::removeRTPSParticipant(participant_reader); + eprosima::fastdds::rtps::RTPSDomain::removeRTPSParticipant(participant_writer); + eprosima::fastdds::rtps::RTPSDomain::removeRTPSParticipant(participant_reader); } /* Maximum number of bytes allowed for an RTPS datagram generated by this participant. */ @@ -1167,19 +1166,19 @@ TEST(RTPS, max_output_message_size_participant) auto testTransport = std::make_shared(); const uint32_t segment_size = 1470; std::string segment_size_str = std::to_string(segment_size); - testTransport->messages_filter_ = [segment_size](eprosima::fastrtps::rtps::CDRMessage_t& datagram) + testTransport->messages_filter_ = [segment_size](eprosima::fastdds::rtps::CDRMessage_t& datagram) { EXPECT_LE(datagram.length, segment_size); // Never drop samples return false; }; - eprosima::fastrtps::rtps::RTPSParticipantAttributes patt; + eprosima::fastdds::rtps::RTPSParticipantAttributes patt; patt.useBuiltinTransports = false; patt.userTransports.push_back(testTransport); patt.properties.properties().emplace_back("fastdds.max_message_size", segment_size_str); - eprosima::fastrtps::rtps::RTPSParticipant* participant_writer = - eprosima::fastrtps::rtps::RTPSDomain::createParticipant(static_cast(GET_PID()) % 230, patt); + eprosima::fastdds::rtps::RTPSParticipant* participant_writer = + eprosima::fastdds::rtps::RTPSDomain::createParticipant(static_cast(GET_PID()) % 230, patt); ASSERT_NE(participant_writer, nullptr); // Create the RTPSWriter @@ -1205,7 +1204,7 @@ TEST(RTPS, max_output_message_size_participant) EXPECT_EQ(reader.getReceivedCount(), 1u); /* Tear-down */ - eprosima::fastrtps::rtps::RTPSDomain::removeRTPSParticipant(participant_writer); + eprosima::fastdds::rtps::RTPSDomain::removeRTPSParticipant(participant_writer); } /* Maximum number of bytes allowed for an RTPS datagram generated by this writer. */ @@ -1215,7 +1214,7 @@ TEST(RTPS, max_output_message_size_writer) std::string segment_size_str = std::to_string(segment_size); auto testTransport = std::make_shared(); - testTransport->messages_filter_ = [segment_size](eprosima::fastrtps::rtps::CDRMessage_t& datagram) + testTransport->messages_filter_ = [segment_size](eprosima::fastdds::rtps::CDRMessage_t& datagram) { EXPECT_LE(datagram.length, segment_size); // Never drop samples diff --git a/test/blackbox/common/RTPSBlackboxTestsDiscovery.cpp b/test/blackbox/common/RTPSBlackboxTestsDiscovery.cpp index 8d21db1a268..8c2ee6d91f8 100644 --- a/test/blackbox/common/RTPSBlackboxTestsDiscovery.cpp +++ b/test/blackbox/common/RTPSBlackboxTestsDiscovery.cpp @@ -21,8 +21,8 @@ #include "RTPSWithRegistrationReader.hpp" #include "RTPSWithRegistrationWriter.hpp" -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; enum communication_type { @@ -41,7 +41,7 @@ class RTPSDiscovery : public testing::TestWithParam { case INTRAPROCESS: library_settings.intraprocess_delivery = eprosima::fastdds::IntraprocessDeliveryType::INTRAPROCESS_FULL; - eprosima::fastrtps::rtps::RTPSDomain::set_library_settings(library_settings); + eprosima::fastdds::rtps::RTPSDomain::set_library_settings(library_settings); break; case TRANSPORT: default: @@ -56,7 +56,7 @@ class RTPSDiscovery : public testing::TestWithParam { case INTRAPROCESS: library_settings.intraprocess_delivery = eprosima::fastdds::IntraprocessDeliveryType::INTRAPROCESS_OFF; - eprosima::fastrtps::rtps::RTPSDomain::set_library_settings(library_settings); + eprosima::fastdds::rtps::RTPSDomain::set_library_settings(library_settings); break; case TRANSPORT: default: @@ -83,7 +83,7 @@ TEST_P(RTPSDiscovery, ReaderListenerOnWriterDiscovery) WITH_ERROR } iteration = NONE; - eprosima::fastrtps::rtps::GUID_t writer_guid; + eprosima::fastdds::rtps::GUID_t writer_guid; std::vector user_data; RTPSWithRegistrationReader reader(TEST_TOPIC_NAME); @@ -182,7 +182,7 @@ TEST_P(RTPSDiscovery, WriterListenerOnReaderDiscovery) WITH_ERROR } iteration = NONE; - eprosima::fastrtps::rtps::GUID_t reader_guid; + eprosima::fastdds::rtps::GUID_t reader_guid; std::vector user_data; RTPSWithRegistrationWriter writer(TEST_TOPIC_NAME); @@ -280,7 +280,7 @@ TEST_P(RTPSDiscovery, ReaderListenerOnWriterDiscoveryIncompatibleQoS) WITH_ERROR } iteration = NONE; - eprosima::fastrtps::rtps::GUID_t writer_guid; + eprosima::fastdds::rtps::GUID_t writer_guid; RTPSWithRegistrationReader reader(TEST_TOPIC_NAME); RTPSWithRegistrationWriter writer(TEST_TOPIC_NAME); @@ -365,7 +365,7 @@ TEST_P(RTPSDiscovery, WriterListenerOnReaderDiscoveryIncompatibleQoS) WITH_ERROR } iteration = NONE; - eprosima::fastrtps::rtps::GUID_t reader_guid; + eprosima::fastdds::rtps::GUID_t reader_guid; RTPSWithRegistrationWriter writer(TEST_TOPIC_NAME); RTPSWithRegistrationReader reader(TEST_TOPIC_NAME); diff --git a/test/blackbox/common/RTPSBlackboxTestsMonitorService.cpp b/test/blackbox/common/RTPSBlackboxTestsMonitorService.cpp index 431f14c6106..0536223aca3 100644 --- a/test/blackbox/common/RTPSBlackboxTestsMonitorService.cpp +++ b/test/blackbox/common/RTPSBlackboxTestsMonitorService.cpp @@ -20,7 +20,7 @@ #include #include -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; /* * Abbreviations diff --git a/test/blackbox/common/RTPSBlackboxTestsPersistence.cpp b/test/blackbox/common/RTPSBlackboxTestsPersistence.cpp index 81c728dcc8b..ebeafdfc153 100644 --- a/test/blackbox/common/RTPSBlackboxTestsPersistence.cpp +++ b/test/blackbox/common/RTPSBlackboxTestsPersistence.cpp @@ -27,8 +27,8 @@ #include "RTPSWithRegistrationReader.hpp" #include "RTPSWithRegistrationWriter.hpp" -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; enum communication_type { @@ -120,7 +120,7 @@ class Persistence : public ::testing::TestWithParam { case INTRAPROCESS: library_settings.intraprocess_delivery = eprosima::fastdds::IntraprocessDeliveryType::INTRAPROCESS_FULL; - eprosima::fastrtps::rtps::RTPSDomain::set_library_settings(att); + eprosima::fastdds::rtps::RTPSDomain::set_library_settings(att); break; case TRANSPORT: default: @@ -168,7 +168,7 @@ class Persistence : public ::testing::TestWithParam { case INTRAPROCESS: library_settings.intraprocess_delivery = eprosima::fastdds::IntraprocessDeliveryType::INTRAPROCESS_OFF; - eprosima::fastrtps::rtps::RTPSDomain::set_library_settings(att); + eprosima::fastdds::rtps::RTPSDomain::set_library_settings(att); break; case TRANSPORT: default: diff --git a/test/blackbox/common/RTPSBlackboxTestsPersistenceGuid.cpp b/test/blackbox/common/RTPSBlackboxTestsPersistenceGuid.cpp index 1f385e5517a..f6d122f4eea 100644 --- a/test/blackbox/common/RTPSBlackboxTestsPersistenceGuid.cpp +++ b/test/blackbox/common/RTPSBlackboxTestsPersistenceGuid.cpp @@ -27,8 +27,8 @@ #include "RTPSWithRegistrationReader.hpp" #include "RTPSWithRegistrationWriter.hpp" -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; enum communication_type { @@ -47,7 +47,7 @@ class PersistenceGuid : public ::testing::TestWithParam { case INTRAPROCESS: library_settings.intraprocess_delivery = eprosima::fastdds::IntraprocessDeliveryType::INTRAPROCESS_FULL; - eprosima::fastrtps::rtps::RTPSDomain::set_library_settings(att); + eprosima::fastdds::rtps::RTPSDomain::set_library_settings(att); break; case TRANSPORT: default: @@ -62,7 +62,7 @@ class PersistenceGuid : public ::testing::TestWithParam { case INTRAPROCESS: library_settings.intraprocess_delivery = eprosima::fastdds::IntraprocessDeliveryType::INTRAPROCESS_OFF; - eprosima::fastrtps::rtps::RTPSDomain::set_library_settings(att); + eprosima::fastdds::rtps::RTPSDomain::set_library_settings(att); break; case TRANSPORT: default: @@ -201,13 +201,13 @@ TEST_P(PersistenceGuid, CheckPrevalenceBetweenManualAndPropertyConfiguration) std::string guidprefix_4 = persistence_lastfour_guidprefix(); std::stringstream guid; // Create the persistence guid to set manually - eprosima::fastrtps::rtps::GuidPrefix_t guidPrefix; + eprosima::fastdds::rtps::GuidPrefix_t guidPrefix; int32_t pid = static_cast(GET_PID()); guidPrefix.value[8] = reinterpret_cast(&pid)[0]; guidPrefix.value[9] = reinterpret_cast(&pid)[1]; guidPrefix.value[10] = reinterpret_cast(&pid)[2]; guidPrefix.value[11] = reinterpret_cast(&pid)[3]; - eprosima::fastrtps::rtps::EntityId_t entityId; + eprosima::fastdds::rtps::EntityId_t entityId; entityId.value[3] = 1; // Create RTPSWriter that use the already created attributes diff --git a/test/blackbox/common/RTPSBlackboxTestsPersistenceNonIntraprocess.cpp b/test/blackbox/common/RTPSBlackboxTestsPersistenceNonIntraprocess.cpp index e76063f61ac..39c0331ed12 100644 --- a/test/blackbox/common/RTPSBlackboxTestsPersistenceNonIntraprocess.cpp +++ b/test/blackbox/common/RTPSBlackboxTestsPersistenceNonIntraprocess.cpp @@ -26,7 +26,7 @@ #include using namespace eprosima::fastdds::dds; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; class PersistenceNonIntraprocess : public ::testing::Test { diff --git a/test/blackbox/common/RTPSBlackboxTestsPools.cpp b/test/blackbox/common/RTPSBlackboxTestsPools.cpp index 9840e57de27..ef0574dd7d7 100644 --- a/test/blackbox/common/RTPSBlackboxTestsPools.cpp +++ b/test/blackbox/common/RTPSBlackboxTestsPools.cpp @@ -23,8 +23,8 @@ #include "RTPSWithRegistrationReader.hpp" #include "RTPSWithRegistrationWriter.hpp" -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; enum communication_type { @@ -43,7 +43,7 @@ class RTPSCustomPools : public testing::TestWithParam { case INTRAPROCESS: library_settings.intraprocess_delivery = eprosima::fastdds::IntraprocessDeliveryType::INTRAPROCESS_FULL; - eprosima::fastrtps::rtps::RTPSDomain::set_library_settings(library_settings); + eprosima::fastdds::rtps::RTPSDomain::set_library_settings(library_settings); break; case TRANSPORT: default: @@ -58,7 +58,7 @@ class RTPSCustomPools : public testing::TestWithParam { case INTRAPROCESS: library_settings.intraprocess_delivery = eprosima::fastdds::IntraprocessDeliveryType::INTRAPROCESS_OFF; - eprosima::fastrtps::rtps::RTPSDomain::set_library_settings(library_settings); + eprosima::fastdds::rtps::RTPSDomain::set_library_settings(library_settings); break; case TRANSPORT: default: @@ -246,7 +246,7 @@ void do_test( RTPSWithRegistrationReader reader(topic_name); RTPSWithRegistrationWriter writer(topic_name); - reader.reliability(eprosima::fastrtps::rtps::ReliabilityKind_t::RELIABLE); + reader.reliability(eprosima::fastdds::rtps::ReliabilityKind_t::RELIABLE); if (pool_on_reader) { reader.payload_pool(pool); diff --git a/test/blackbox/common/RTPSBlackboxTestsPositiveAck.cpp b/test/blackbox/common/RTPSBlackboxTestsPositiveAck.cpp index 53b457b2c65..57fda058004 100644 --- a/test/blackbox/common/RTPSBlackboxTestsPositiveAck.cpp +++ b/test/blackbox/common/RTPSBlackboxTestsPositiveAck.cpp @@ -24,8 +24,8 @@ #include "RTPSWithRegistrationReader.hpp" #include "RTPSWithRegistrationWriter.hpp" -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; TEST(RTPSAck, EnableUpdatabilityOfPositiveAcksPeriodRTPSLayer) { @@ -36,14 +36,14 @@ TEST(RTPSAck, EnableUpdatabilityOfPositiveAcksPeriodRTPSLayer) RTPSAsSocketWriter writer(TEST_TOPIC_NAME); std::string ip("239.255.1.4"); - reader.reliability(eprosima::fastrtps::rtps::ReliabilityKind_t::RELIABLE). + reader.reliability(eprosima::fastdds::rtps::ReliabilityKind_t::RELIABLE). add_to_multicast_locator_list(ip, global_port). disable_positive_acks(true).init(); ASSERT_TRUE(reader.isInitialized()); - writer.reliability(eprosima::fastrtps::rtps::ReliabilityKind_t::RELIABLE). - durability(eprosima::fastrtps::rtps::DurabilityKind_t::VOLATILE). + writer.reliability(eprosima::fastdds::rtps::ReliabilityKind_t::RELIABLE). + durability(eprosima::fastdds::rtps::DurabilityKind_t::VOLATILE). add_to_multicast_locator_list(ip, global_port). auto_remove_on_volatile(). disable_positive_acks_seconds(true, 1).init(); @@ -70,7 +70,7 @@ TEST(RTPSAck, EnableUpdatabilityOfPositiveAcksPeriodRTPSLayer) // Update attributes at RTPS layer WriterAttributes w_att; w_att.disable_positive_acks = true; - w_att.keep_duration = eprosima::fastrtps::Duration_t(2, 0); + w_att.keep_duration = eprosima::fastdds::Duration_t(2, 0); writer.updateAttributes(w_att); diff --git a/test/blackbox/common/RTPSBlackboxTestsVolatile.cpp b/test/blackbox/common/RTPSBlackboxTestsVolatile.cpp index 8d92d9d3b3c..74db064b8cc 100644 --- a/test/blackbox/common/RTPSBlackboxTestsVolatile.cpp +++ b/test/blackbox/common/RTPSBlackboxTestsVolatile.cpp @@ -23,7 +23,7 @@ #include "RTPSAsSocketReader.hpp" #include "RTPSAsSocketWriter.hpp" -using namespace eprosima::fastrtps; +using namespace eprosima::fastdds; enum communication_type { @@ -42,7 +42,7 @@ class Volatile : public testing::TestWithParam { case INTRAPROCESS: library_settings.intraprocess_delivery = eprosima::fastdds::IntraprocessDeliveryType::INTRAPROCESS_FULL; - eprosima::fastrtps::rtps::RTPSDomain::set_library_settings(library_settings); + eprosima::fastdds::rtps::RTPSDomain::set_library_settings(library_settings); break; case TRANSPORT: default: @@ -57,7 +57,7 @@ class Volatile : public testing::TestWithParam { case INTRAPROCESS: library_settings.intraprocess_delivery = eprosima::fastdds::IntraprocessDeliveryType::INTRAPROCESS_OFF; - eprosima::fastrtps::rtps::RTPSDomain::set_library_settings(library_settings); + eprosima::fastdds::rtps::RTPSDomain::set_library_settings(library_settings); break; case TRANSPORT: default: @@ -74,13 +74,13 @@ TEST_P(Volatile, AsyncPubSubAsNonReliableVolatileKeepAllHelloworld) RTPSAsSocketWriter writer(TEST_TOPIC_NAME); std::string ip("239.255.1.4"); - reader.reliability(eprosima::fastrtps::rtps::ReliabilityKind_t::BEST_EFFORT). + reader.reliability(eprosima::fastdds::rtps::ReliabilityKind_t::BEST_EFFORT). add_to_multicast_locator_list(ip, global_port).init(); ASSERT_TRUE(reader.isInitialized()); - writer.reliability(eprosima::fastrtps::rtps::ReliabilityKind_t::BEST_EFFORT). - durability(eprosima::fastrtps::rtps::DurabilityKind_t::VOLATILE). + writer.reliability(eprosima::fastdds::rtps::ReliabilityKind_t::BEST_EFFORT). + durability(eprosima::fastdds::rtps::DurabilityKind_t::VOLATILE). add_to_multicast_locator_list(ip, global_port). auto_remove_on_volatile().init(); diff --git a/test/blackbox/common/RTPSWithRegistrationReader.hpp b/test/blackbox/common/RTPSWithRegistrationReader.hpp index 53493dff52f..d8bad599752 100644 --- a/test/blackbox/common/RTPSWithRegistrationReader.hpp +++ b/test/blackbox/common/RTPSWithRegistrationReader.hpp @@ -46,7 +46,7 @@ #include #include -using eprosima::fastrtps::rtps::IPLocator; +using eprosima::fastdds::rtps::IPLocator; template class RTPSWithRegistrationReader @@ -57,14 +57,14 @@ class RTPSWithRegistrationReader typedef typename type_support::type type; using OnWriterDiscoveryFunctor = std::function; private: - class Listener : public eprosima::fastrtps::rtps::ReaderListener + class Listener : public eprosima::fastdds::rtps::ReaderListener { public: @@ -79,8 +79,8 @@ class RTPSWithRegistrationReader } void on_new_cache_change_added( - eprosima::fastrtps::rtps::RTPSReader* reader, - const eprosima::fastrtps::rtps::CacheChange_t* const change) override + eprosima::fastdds::rtps::RTPSReader* reader, + const eprosima::fastdds::rtps::CacheChange_t* const change) override { ASSERT_NE(reader, nullptr); ASSERT_NE(change, nullptr); @@ -89,24 +89,24 @@ class RTPSWithRegistrationReader } void on_reader_matched( - eprosima::fastrtps::rtps::RTPSReader* /*reader*/, - const eprosima::fastrtps::rtps::MatchingInfo& info) override + eprosima::fastdds::rtps::RTPSReader* /*reader*/, + const eprosima::fastdds::rtps::MatchingInfo& info) override { - if (info.status == eprosima::fastrtps::rtps::MATCHED_MATCHING) + if (info.status == eprosima::fastdds::rtps::MATCHED_MATCHING) { reader_.matched(); } - else if (info.status == eprosima::fastrtps::rtps::REMOVED_MATCHING) + else if (info.status == eprosima::fastdds::rtps::REMOVED_MATCHING) { reader_.unmatched(); } } void on_writer_discovery( - eprosima::fastrtps::rtps::RTPSReader* reader, - eprosima::fastrtps::rtps::WriterDiscoveryInfo::DISCOVERY_STATUS reason, - const eprosima::fastrtps::rtps::GUID_t& writer_guid, - const eprosima::fastrtps::rtps::WriterProxyData* writer_info) override + eprosima::fastdds::rtps::RTPSReader* reader, + eprosima::fastdds::rtps::WriterDiscoveryInfo::DISCOVERY_STATUS reason, + const eprosima::fastdds::rtps::GUID_t& writer_guid, + const eprosima::fastdds::rtps::WriterProxyData* writer_info) override { reader_.on_writer_discovery(reader, reason, writer_guid, writer_info); } @@ -130,7 +130,7 @@ class RTPSWithRegistrationReader RTPSWithRegistrationReader( const std::string& topic_name, - eprosima::fastrtps::rtps::RTPSParticipant* participant) + eprosima::fastdds::rtps::RTPSParticipant* participant) : listener_(*this) , participant_(participant) , destroy_participant_(nullptr == participant) @@ -151,7 +151,7 @@ class RTPSWithRegistrationReader reader_attr_.times.heartbeat_response_delay.nanosec = 100000000; participant_attr_.builtin.discovery_config.discoveryProtocol = - eprosima::fastrtps::rtps::DiscoveryProtocol::SIMPLE; + eprosima::fastdds::rtps::DiscoveryProtocol::SIMPLE; participant_attr_.builtin.use_WriterLivelinessProtocol = true; } @@ -166,25 +166,25 @@ class RTPSWithRegistrationReader if (nullptr == participant_) { - participant_ = eprosima::fastrtps::rtps::RTPSDomain::createParticipant( + participant_ = eprosima::fastdds::rtps::RTPSDomain::createParticipant( static_cast(GET_PID()) % 230, participant_attr_); ASSERT_NE(participant_, nullptr); } //Create readerhistory hattr_.payloadMaxSize = type_.m_typeSize; - history_ = new eprosima::fastrtps::rtps::ReaderHistory(hattr_); + history_ = new eprosima::fastdds::rtps::ReaderHistory(hattr_); ASSERT_NE(history_, nullptr); // Create reader if (has_payload_pool_) { - reader_ = eprosima::fastrtps::rtps::RTPSDomain::createRTPSReader(participant_, reader_attr_, payload_pool_, + reader_ = eprosima::fastdds::rtps::RTPSDomain::createRTPSReader(participant_, reader_attr_, payload_pool_, history_, &listener_); } else { - reader_ = eprosima::fastrtps::rtps::RTPSDomain::createRTPSReader(participant_, reader_attr_, + reader_ = eprosima::fastdds::rtps::RTPSDomain::createRTPSReader(participant_, reader_attr_, history_, &listener_); } @@ -215,7 +215,7 @@ class RTPSWithRegistrationReader { if (destroy_participant_ && participant_ != nullptr) { - eprosima::fastrtps::rtps::RTPSDomain::removeRTPSParticipant(participant_); + eprosima::fastdds::rtps::RTPSDomain::removeRTPSParticipant(participant_); } participant_ = nullptr; @@ -240,7 +240,7 @@ class RTPSWithRegistrationReader if (reset_seq) { - last_seq_ = eprosima::fastrtps::rtps::SequenceNumber_t(); + last_seq_ = eprosima::fastdds::rtps::SequenceNumber_t(); } } @@ -272,10 +272,10 @@ class RTPSWithRegistrationReader receiving_ = true; mutex_.unlock(); - std::unique_lock lock(*history_->getMutex()); + std::unique_lock lock(*history_->getMutex()); while (history_->changesBegin() != history_->changesEnd()) { - eprosima::fastrtps::rtps::CacheChange_t* change = *history_->changesBegin(); + eprosima::fastdds::rtps::CacheChange_t* change = *history_->changesBegin(); std::cout << "Late processing change " << change->sequenceNumber << std::endl; receive_one(reader_, change, false); } @@ -324,7 +324,7 @@ class RTPSWithRegistrationReader } void block_until_seq_number_greater_or_equal( - const eprosima::fastrtps::rtps::SequenceNumber_t& min_seq) + const eprosima::fastdds::rtps::SequenceNumber_t& min_seq) { block([this, min_seq]() -> bool { @@ -332,7 +332,7 @@ class RTPSWithRegistrationReader }); } - eprosima::fastrtps::rtps::SequenceNumber_t get_last_received_sequence_number() const + eprosima::fastdds::rtps::SequenceNumber_t get_last_received_sequence_number() const { std::lock_guard lock(mutex_); return last_seq_; @@ -387,7 +387,7 @@ class RTPSWithRegistrationReader } void check_seq_number_greater_or_equal( - const eprosima::fastrtps::rtps::SequenceNumber_t& min_seq) + const eprosima::fastdds::rtps::SequenceNumber_t& min_seq) { ASSERT_GE(last_seq_, min_seq); } @@ -413,7 +413,7 @@ class RTPSWithRegistrationReader /*** Function to change QoS ***/ RTPSWithRegistrationReader& payload_pool( - const std::shared_ptr& pool) + const std::shared_ptr& pool) { payload_pool_ = pool; has_payload_pool_ = true; @@ -421,7 +421,7 @@ class RTPSWithRegistrationReader } RTPSWithRegistrationReader& memoryMode( - const eprosima::fastrtps::rtps::MemoryManagementPolicy_t memoryPolicy) + const eprosima::fastdds::rtps::MemoryManagementPolicy_t memoryPolicy) { hattr_.memoryPolicy = memoryPolicy; return *this; @@ -435,11 +435,11 @@ class RTPSWithRegistrationReader } RTPSWithRegistrationReader& reliability( - const eprosima::fastrtps::rtps::ReliabilityKind_t kind) + const eprosima::fastdds::rtps::ReliabilityKind_t kind) { reader_attr_.endpoint.reliabilityKind = kind; - if (kind == eprosima::fastrtps::rtps::ReliabilityKind_t::RELIABLE) + if (kind == eprosima::fastdds::rtps::ReliabilityKind_t::RELIABLE) { reader_qos_.m_reliability.kind = eprosima::fastdds::dds::RELIABLE_RELIABILITY_QOS; } @@ -452,7 +452,7 @@ class RTPSWithRegistrationReader } RTPSWithRegistrationReader& durability( - const eprosima::fastrtps::rtps::DurabilityKind_t kind) + const eprosima::fastdds::rtps::DurabilityKind_t kind) { reader_attr_.endpoint.durabilityKind = kind; reader_qos_.m_durability.durabilityKind(kind); @@ -464,7 +464,7 @@ class RTPSWithRegistrationReader const std::string& ip, uint32_t port) { - eprosima::fastrtps::rtps::Locator_t loc; + eprosima::fastdds::rtps::Locator_t loc; IPLocator::setIPv4(loc, ip); loc.port = static_cast(port); reader_attr_.endpoint.multicastLocatorList.push_back(loc); @@ -482,8 +482,8 @@ class RTPSWithRegistrationReader } RTPSWithRegistrationReader& persistence_guid_att( - const eprosima::fastrtps::rtps::GuidPrefix_t& guidPrefix, - const eprosima::fastrtps::rtps::EntityId_t& entityId) + const eprosima::fastdds::rtps::GuidPrefix_t& guidPrefix, + const eprosima::fastdds::rtps::EntityId_t& entityId) { reader_attr_.endpoint.persistence_guid.guidPrefix = guidPrefix; reader_attr_.endpoint.persistence_guid.entityId = entityId; @@ -498,7 +498,7 @@ class RTPSWithRegistrationReader #if HAVE_SQLITE3 RTPSWithRegistrationReader& make_persistent( const std::string& filename, - const eprosima::fastrtps::rtps::GuidPrefix_t& guidPrefix) + const eprosima::fastdds::rtps::GuidPrefix_t& guidPrefix) { reader_attr_.endpoint.persistence_guid.guidPrefix = guidPrefix; reader_attr_.endpoint.persistence_guid.entityId = 0x55555555; @@ -506,7 +506,7 @@ class RTPSWithRegistrationReader std::cout << "Initializing persistent READER " << reader_attr_.endpoint.persistence_guid << " with file " << filename << std::endl; - return durability(eprosima::fastrtps::rtps::DurabilityKind_t::TRANSIENT) + return durability(eprosima::fastdds::rtps::DurabilityKind_t::TRANSIENT) .add_property("dds.persistence.plugin", "builtin.SQLITE3") .add_property("dds.persistence.sqlite3.filename", filename); } @@ -514,7 +514,7 @@ class RTPSWithRegistrationReader #endif // if HAVE_SQLITE3 RTPSWithRegistrationReader& user_data( - const std::vector& user_data) + const std::vector& user_data) { reader_qos_.m_userData = user_data; return *this; @@ -541,12 +541,12 @@ class RTPSWithRegistrationReader return *this; } - const eprosima::fastrtps::rtps::GUID_t& guid() const + const eprosima::fastdds::rtps::GUID_t& guid() const { return reader_->getGuid(); } - eprosima::fastrtps::rtps::RTPSReader& get_native_reader() const + eprosima::fastdds::rtps::RTPSReader& get_native_reader() const { return *reader_; } @@ -554,8 +554,8 @@ class RTPSWithRegistrationReader private: void receive_one( - eprosima::fastrtps::rtps::RTPSReader* reader, - const eprosima::fastrtps::rtps::CacheChange_t* change, + eprosima::fastdds::rtps::RTPSReader* reader, + const eprosima::fastdds::rtps::CacheChange_t* change, bool check_seq = true) { std::unique_lock lock(mutex_); @@ -598,10 +598,10 @@ class RTPSWithRegistrationReader cv_.notify_one(); } - eprosima::fastrtps::rtps::ReaderHistory* history = reader->get_history(); + eprosima::fastdds::rtps::ReaderHistory* history = reader->get_history(); EXPECT_EQ(history, history_); - history->remove_change((eprosima::fastrtps::rtps::CacheChange_t*)change); + history->remove_change((eprosima::fastdds::rtps::CacheChange_t*)change); } else { @@ -610,10 +610,10 @@ class RTPSWithRegistrationReader } void on_writer_discovery( - eprosima::fastrtps::rtps::RTPSReader* reader, - eprosima::fastrtps::rtps::WriterDiscoveryInfo::DISCOVERY_STATUS reason, - const eprosima::fastrtps::rtps::GUID_t& writer_guid, - const eprosima::fastrtps::rtps::WriterProxyData* writer_info) + eprosima::fastdds::rtps::RTPSReader* reader, + eprosima::fastdds::rtps::WriterDiscoveryInfo::DISCOVERY_STATUS reason, + const eprosima::fastdds::rtps::GUID_t& writer_guid, + const eprosima::fastdds::rtps::WriterProxyData* writer_info) { ASSERT_EQ(reader_, reader); @@ -626,15 +626,15 @@ class RTPSWithRegistrationReader RTPSWithRegistrationReader& operator =( const RTPSWithRegistrationReader&) = delete; - eprosima::fastrtps::rtps::RTPSParticipant* participant_; - eprosima::fastrtps::rtps::RTPSParticipantAttributes participant_attr_; + eprosima::fastdds::rtps::RTPSParticipant* participant_; + eprosima::fastdds::rtps::RTPSParticipantAttributes participant_attr_; bool destroy_participant_{false}; - eprosima::fastrtps::rtps::RTPSReader* reader_; - eprosima::fastrtps::rtps::ReaderAttributes reader_attr_; - eprosima::fastrtps::TopicAttributes topic_attr_; + eprosima::fastdds::rtps::RTPSReader* reader_; + eprosima::fastdds::rtps::ReaderAttributes reader_attr_; + eprosima::fastdds::TopicAttributes topic_attr_; eprosima::fastdds::dds::ReaderQos reader_qos_; - eprosima::fastrtps::rtps::ReaderHistory* history_; - eprosima::fastrtps::rtps::HistoryAttributes hattr_; + eprosima::fastdds::rtps::ReaderHistory* history_; + eprosima::fastdds::rtps::HistoryAttributes hattr_; std::atomic initialized_; std::list total_msgs_; mutable std::mutex mutex_; @@ -643,11 +643,11 @@ class RTPSWithRegistrationReader std::condition_variable cvDiscovery_; std::atomic receiving_; std::atomic matched_; - eprosima::fastrtps::rtps::SequenceNumber_t last_seq_; + eprosima::fastdds::rtps::SequenceNumber_t last_seq_; std::atomic current_received_count_; std::atomic number_samples_expected_; type_support type_; - std::shared_ptr payload_pool_; + std::shared_ptr payload_pool_; bool has_payload_pool_ = false; OnWriterDiscoveryFunctor on_writer_discovery_functor; const eprosima::fastdds::rtps::ContentFilterProperty* content_filter_property_ = nullptr; diff --git a/test/blackbox/common/RTPSWithRegistrationWriter.hpp b/test/blackbox/common/RTPSWithRegistrationWriter.hpp index 66a78b722ca..7b6fd3436fd 100644 --- a/test/blackbox/common/RTPSWithRegistrationWriter.hpp +++ b/test/blackbox/common/RTPSWithRegistrationWriter.hpp @@ -51,14 +51,14 @@ class RTPSWithRegistrationWriter typedef typename type_support::type type; using OnReaderDiscoveryFunctor = std::function ; private: - class Listener : public eprosima::fastrtps::rtps::WriterListener + class Listener : public eprosima::fastdds::rtps::WriterListener { public: @@ -73,31 +73,31 @@ class RTPSWithRegistrationWriter } void onWriterMatched( - eprosima::fastrtps::rtps::RTPSWriter* /*writer*/, - eprosima::fastrtps::rtps::MatchingInfo& info) override + eprosima::fastdds::rtps::RTPSWriter* /*writer*/, + eprosima::fastdds::rtps::MatchingInfo& info) override { - if (info.status == eprosima::fastrtps::rtps::MATCHED_MATCHING) + if (info.status == eprosima::fastdds::rtps::MATCHED_MATCHING) { writer_.matched(); } - else if (info.status == eprosima::fastrtps::rtps::REMOVED_MATCHING) + else if (info.status == eprosima::fastdds::rtps::REMOVED_MATCHING) { writer_.unmatched(); } } void on_reader_discovery( - eprosima::fastrtps::rtps::RTPSWriter* writer, - eprosima::fastrtps::rtps::ReaderDiscoveryInfo::DISCOVERY_STATUS reason, - const eprosima::fastrtps::rtps::GUID_t& reader_guid, - const eprosima::fastrtps::rtps::ReaderProxyData* reader_info) override + eprosima::fastdds::rtps::RTPSWriter* writer, + eprosima::fastdds::rtps::ReaderDiscoveryInfo::DISCOVERY_STATUS reason, + const eprosima::fastdds::rtps::GUID_t& reader_guid, + const eprosima::fastdds::rtps::ReaderProxyData* reader_info) override { writer_.on_reader_discovery(writer, reason, reader_guid, reader_info); } private: - using eprosima::fastrtps::rtps::WriterListener::onWriterMatched; + using eprosima::fastdds::rtps::WriterListener::onWriterMatched; Listener& operator =( const Listener&) = delete; @@ -117,7 +117,7 @@ class RTPSWithRegistrationWriter RTPSWithRegistrationWriter( const std::string& topic_name, - eprosima::fastrtps::rtps::RTPSParticipant* participant) + eprosima::fastdds::rtps::RTPSParticipant* participant) : listener_(*this) , participant_(participant) , destroy_participant_(nullptr == participant) @@ -139,7 +139,7 @@ class RTPSWithRegistrationWriter writer_attr_.times.nackResponseDelay.nanosec = 100000000; participant_attr_.builtin.discovery_config.discoveryProtocol = - eprosima::fastrtps::rtps::DiscoveryProtocol::SIMPLE; + eprosima::fastdds::rtps::DiscoveryProtocol::SIMPLE; participant_attr_.builtin.use_WriterLivelinessProtocol = true; } @@ -155,24 +155,24 @@ class RTPSWithRegistrationWriter //Create participant if (nullptr == participant_) { - participant_ = eprosima::fastrtps::rtps::RTPSDomain::createParticipant( + participant_ = eprosima::fastdds::rtps::RTPSDomain::createParticipant( static_cast(GET_PID()) % 230, participant_attr_); } ASSERT_NE(participant_, nullptr); //Create writerhistory hattr_.payloadMaxSize = type_.m_typeSize; - history_ = new eprosima::fastrtps::rtps::WriterHistory(hattr_); + history_ = new eprosima::fastdds::rtps::WriterHistory(hattr_); //Create writer if (has_payload_pool_) { - writer_ = eprosima::fastrtps::rtps::RTPSDomain::createRTPSWriter( + writer_ = eprosima::fastdds::rtps::RTPSDomain::createRTPSWriter( participant_, writer_attr_, payload_pool_, history_, &listener_); } else { - writer_ = eprosima::fastrtps::rtps::RTPSDomain::createRTPSWriter( + writer_ = eprosima::fastdds::rtps::RTPSDomain::createRTPSWriter( participant_, writer_attr_, history_, &listener_); } @@ -200,7 +200,7 @@ class RTPSWithRegistrationWriter { if (destroy_participant_ && participant_ != nullptr) { - eprosima::fastrtps::rtps::RTPSDomain::removeRTPSParticipant(participant_); + eprosima::fastdds::rtps::RTPSDomain::removeRTPSParticipant(participant_); } if (history_ != nullptr) { @@ -226,7 +226,7 @@ class RTPSWithRegistrationWriter while (it != msgs.end()) { - eprosima::fastrtps::rtps::CacheChange_t* ch = writer_->new_change(*it, eprosima::fastrtps::rtps::ALIVE); + eprosima::fastdds::rtps::CacheChange_t* ch = writer_->new_change(*it, eprosima::fastdds::rtps::ALIVE); eprosima::fastcdr::FastBuffer buffer((char*)ch->serializedPayload.data, ch->serializedPayload.max_size); eprosima::fastcdr::Cdr cdr(buffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, @@ -250,10 +250,10 @@ class RTPSWithRegistrationWriter } } - eprosima::fastrtps::rtps::CacheChange_t* send_sample( + eprosima::fastdds::rtps::CacheChange_t* send_sample( type& msg) { - eprosima::fastrtps::rtps::CacheChange_t* ch = writer_->new_change(msg, eprosima::fastrtps::rtps::ALIVE); + eprosima::fastdds::rtps::CacheChange_t* ch = writer_->new_change(msg, eprosima::fastdds::rtps::ALIVE); eprosima::fastcdr::FastBuffer buffer((char*)ch->serializedPayload.data, ch->serializedPayload.max_size); eprosima::fastcdr::Cdr cdr(buffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, @@ -277,7 +277,7 @@ class RTPSWithRegistrationWriter } bool remove_change ( - const eprosima::fastrtps::rtps::SequenceNumber_t& sequence_number) + const eprosima::fastdds::rtps::SequenceNumber_t& sequence_number) { return history_->remove_change(sequence_number); } @@ -350,10 +350,10 @@ class RTPSWithRegistrationWriter bool waitForAllAcked( const std::chrono::duration<_Rep, _Period>& max_wait) { - eprosima::fastrtps::Duration_t timeout; + eprosima::fastdds::Duration_t timeout; if (max_wait == std::chrono::seconds::zero()) { - timeout = eprosima::fastrtps::c_TimeInfinite; + timeout = eprosima::fastdds::c_TimeInfinite; } else { @@ -368,7 +368,7 @@ class RTPSWithRegistrationWriter /*** Function to change QoS ***/ RTPSWithRegistrationWriter& payload_pool( - const std::shared_ptr& pool) + const std::shared_ptr& pool) { payload_pool_ = pool; has_payload_pool_ = true; @@ -376,18 +376,18 @@ class RTPSWithRegistrationWriter } RTPSWithRegistrationWriter& memoryMode( - const eprosima::fastrtps::rtps::MemoryManagementPolicy_t memoryPolicy) + const eprosima::fastdds::rtps::MemoryManagementPolicy_t memoryPolicy) { hattr_.memoryPolicy = memoryPolicy; return *this; } RTPSWithRegistrationWriter& reliability( - const eprosima::fastrtps::rtps::ReliabilityKind_t kind) + const eprosima::fastdds::rtps::ReliabilityKind_t kind) { writer_attr_.endpoint.reliabilityKind = kind; - if (kind == eprosima::fastrtps::rtps::ReliabilityKind_t::BEST_EFFORT) + if (kind == eprosima::fastdds::rtps::ReliabilityKind_t::BEST_EFFORT) { writer_qos_.m_reliability.kind = eprosima::fastdds::dds::BEST_EFFORT_RELIABILITY_QOS; } @@ -400,7 +400,7 @@ class RTPSWithRegistrationWriter } RTPSWithRegistrationWriter& durability( - const eprosima::fastrtps::rtps::DurabilityKind_t kind) + const eprosima::fastdds::rtps::DurabilityKind_t kind) { writer_attr_.endpoint.durabilityKind = kind; writer_qos_.m_durability.durabilityKind(kind); @@ -409,7 +409,7 @@ class RTPSWithRegistrationWriter } RTPSWithRegistrationWriter& asynchronously( - const eprosima::fastrtps::rtps::RTPSWriterPublishMode mode) + const eprosima::fastdds::rtps::RTPSWriterPublishMode mode) { writer_attr_.mode = mode; @@ -439,8 +439,8 @@ class RTPSWithRegistrationWriter } RTPSWithRegistrationWriter& persistence_guid_att( - const eprosima::fastrtps::rtps::GuidPrefix_t& guidPrefix, - const eprosima::fastrtps::rtps::EntityId_t& entityId) + const eprosima::fastdds::rtps::GuidPrefix_t& guidPrefix, + const eprosima::fastdds::rtps::EntityId_t& entityId) { writer_attr_.endpoint.persistence_guid.guidPrefix = guidPrefix; writer_attr_.endpoint.persistence_guid.entityId = entityId; @@ -450,7 +450,7 @@ class RTPSWithRegistrationWriter #if HAVE_SQLITE3 RTPSWithRegistrationWriter& make_persistent( const std::string& filename, - const eprosima::fastrtps::rtps::GuidPrefix_t& guidPrefix) + const eprosima::fastdds::rtps::GuidPrefix_t& guidPrefix) { writer_attr_.endpoint.persistence_guid.guidPrefix = guidPrefix; writer_attr_.endpoint.persistence_guid.entityId = 0xAAAAAAAA; @@ -458,7 +458,7 @@ class RTPSWithRegistrationWriter std::cout << "Initializing persistent WRITER " << writer_attr_.endpoint.persistence_guid << " with file " << filename << std::endl; - return durability(eprosima::fastrtps::rtps::DurabilityKind_t::PERSISTENT) + return durability(eprosima::fastdds::rtps::DurabilityKind_t::PERSISTENT) .add_property("dds.persistence.plugin", "builtin.SQLITE3") .add_property("dds.persistence.sqlite3.filename", filename); } @@ -515,7 +515,7 @@ class RTPSWithRegistrationWriter } RTPSWithRegistrationWriter& user_data( - const std::vector& user_data) + const std::vector& user_data) { writer_qos_.m_userData = user_data; return *this; @@ -547,7 +547,7 @@ class RTPSWithRegistrationWriter } bool has_been_fully_delivered( - const eprosima::fastrtps::rtps::SequenceNumber_t& seq_num) + const eprosima::fastdds::rtps::SequenceNumber_t& seq_num) { return writer_->has_been_fully_delivered(seq_num); } @@ -557,7 +557,7 @@ class RTPSWithRegistrationWriter participant_->update_attributes(participant_attr_); } - const eprosima::fastrtps::rtps::GUID_t& guid() const + const eprosima::fastdds::rtps::GUID_t& guid() const { return writer_->getGuid(); } @@ -565,10 +565,10 @@ class RTPSWithRegistrationWriter private: void on_reader_discovery( - eprosima::fastrtps::rtps::RTPSWriter* writer, - eprosima::fastrtps::rtps::ReaderDiscoveryInfo::DISCOVERY_STATUS reason, - const eprosima::fastrtps::rtps::GUID_t& reader_guid, - const eprosima::fastrtps::rtps::ReaderProxyData* reader_info) + eprosima::fastdds::rtps::RTPSWriter* writer, + eprosima::fastdds::rtps::ReaderDiscoveryInfo::DISCOVERY_STATUS reason, + const eprosima::fastdds::rtps::GUID_t& reader_guid, + const eprosima::fastdds::rtps::ReaderProxyData* reader_info) { ASSERT_EQ(writer_, writer); @@ -581,21 +581,21 @@ class RTPSWithRegistrationWriter RTPSWithRegistrationWriter& operator =( const RTPSWithRegistrationWriter&) = delete; - eprosima::fastrtps::rtps::RTPSParticipant* participant_; - eprosima::fastrtps::rtps::RTPSParticipantAttributes participant_attr_; + eprosima::fastdds::rtps::RTPSParticipant* participant_; + eprosima::fastdds::rtps::RTPSParticipantAttributes participant_attr_; bool destroy_participant_{false}; - eprosima::fastrtps::rtps::RTPSWriter* writer_; - eprosima::fastrtps::rtps::WriterAttributes writer_attr_; + eprosima::fastdds::rtps::RTPSWriter* writer_; + eprosima::fastdds::rtps::WriterAttributes writer_attr_; eprosima::fastdds::dds::WriterQos writer_qos_; - eprosima::fastrtps::TopicAttributes topic_attr_; - eprosima::fastrtps::rtps::WriterHistory* history_; - eprosima::fastrtps::rtps::HistoryAttributes hattr_; + eprosima::fastdds::TopicAttributes topic_attr_; + eprosima::fastdds::rtps::WriterHistory* history_; + eprosima::fastdds::rtps::HistoryAttributes hattr_; bool initialized_; std::mutex mutex_; std::condition_variable cv_; uint32_t matched_; type_support type_; - std::shared_ptr payload_pool_; + std::shared_ptr payload_pool_; bool has_payload_pool_ = false; OnReaderDiscoveryFunctor on_reader_discovery_functor; }; diff --git a/test/blackbox/common/UDPMessageSender.hpp b/test/blackbox/common/UDPMessageSender.hpp index 123e46b1873..d80ecf115b5 100644 --- a/test/blackbox/common/UDPMessageSender.hpp +++ b/test/blackbox/common/UDPMessageSender.hpp @@ -4,8 +4,8 @@ #include #include -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; struct UDPMessageSender { diff --git a/test/blackbox/types/Data1mbPubSubTypes.cxx b/test/blackbox/types/Data1mbPubSubTypes.cxx index a1afa559b08..302bf3ea1e2 100644 --- a/test/blackbox/types/Data1mbPubSubTypes.cxx +++ b/test/blackbox/types/Data1mbPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "Data1mbCdrAux.hpp" #include "Data1mbTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; Data1mbPubSubType::Data1mbPubSubType() diff --git a/test/blackbox/types/Data1mbPubSubTypes.h b/test/blackbox/types/Data1mbPubSubTypes.h index 5bab268fc61..975cd044734 100644 --- a/test/blackbox/types/Data1mbPubSubTypes.h +++ b/test/blackbox/types/Data1mbPubSubTypes.h @@ -54,18 +54,18 @@ class Data1mbPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -80,7 +80,7 @@ class Data1mbPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/blackbox/types/Data64kbPubSubTypes.cxx b/test/blackbox/types/Data64kbPubSubTypes.cxx index 6184964c72d..28890b281e5 100644 --- a/test/blackbox/types/Data64kbPubSubTypes.cxx +++ b/test/blackbox/types/Data64kbPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "Data64kbCdrAux.hpp" #include "Data64kbTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; Data64kbPubSubType::Data64kbPubSubType() diff --git a/test/blackbox/types/Data64kbPubSubTypes.h b/test/blackbox/types/Data64kbPubSubTypes.h index d209d7a6d66..72a2dc8c798 100644 --- a/test/blackbox/types/Data64kbPubSubTypes.h +++ b/test/blackbox/types/Data64kbPubSubTypes.h @@ -54,18 +54,18 @@ class Data64kbPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -80,7 +80,7 @@ class Data64kbPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/blackbox/types/FixedSizedPubSubTypes.cxx b/test/blackbox/types/FixedSizedPubSubTypes.cxx index fd53c02358f..eb5c91dda95 100644 --- a/test/blackbox/types/FixedSizedPubSubTypes.cxx +++ b/test/blackbox/types/FixedSizedPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "FixedSizedCdrAux.hpp" #include "FixedSizedTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; FixedSizedPubSubType::FixedSizedPubSubType() diff --git a/test/blackbox/types/FixedSizedPubSubTypes.h b/test/blackbox/types/FixedSizedPubSubTypes.h index c6589e3c60a..d69c6dc320d 100644 --- a/test/blackbox/types/FixedSizedPubSubTypes.h +++ b/test/blackbox/types/FixedSizedPubSubTypes.h @@ -87,18 +87,18 @@ class FixedSizedPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -113,7 +113,7 @@ class FixedSizedPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/blackbox/types/HelloWorldPubSubTypes.cxx b/test/blackbox/types/HelloWorldPubSubTypes.cxx index 0218144b5cb..932364c18fc 100644 --- a/test/blackbox/types/HelloWorldPubSubTypes.cxx +++ b/test/blackbox/types/HelloWorldPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "HelloWorldCdrAux.hpp" #include "HelloWorldTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; HelloWorldPubSubType::HelloWorldPubSubType() diff --git a/test/blackbox/types/HelloWorldPubSubTypes.h b/test/blackbox/types/HelloWorldPubSubTypes.h index 4b09a679ee5..25f8edc4b7d 100644 --- a/test/blackbox/types/HelloWorldPubSubTypes.h +++ b/test/blackbox/types/HelloWorldPubSubTypes.h @@ -54,18 +54,18 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -80,7 +80,7 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/blackbox/types/KeyedData1mbPubSubTypes.cxx b/test/blackbox/types/KeyedData1mbPubSubTypes.cxx index 34adec26bab..4c341261e55 100644 --- a/test/blackbox/types/KeyedData1mbPubSubTypes.cxx +++ b/test/blackbox/types/KeyedData1mbPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "KeyedData1mbCdrAux.hpp" #include "KeyedData1mbTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; KeyedData1mbPubSubType::KeyedData1mbPubSubType() diff --git a/test/blackbox/types/KeyedData1mbPubSubTypes.h b/test/blackbox/types/KeyedData1mbPubSubTypes.h index 8113f23441c..ef6702ee109 100644 --- a/test/blackbox/types/KeyedData1mbPubSubTypes.h +++ b/test/blackbox/types/KeyedData1mbPubSubTypes.h @@ -54,18 +54,18 @@ class KeyedData1mbPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -80,7 +80,7 @@ class KeyedData1mbPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/blackbox/types/KeyedHelloWorldPubSubTypes.cxx b/test/blackbox/types/KeyedHelloWorldPubSubTypes.cxx index ff493273b66..d5be62b8687 100644 --- a/test/blackbox/types/KeyedHelloWorldPubSubTypes.cxx +++ b/test/blackbox/types/KeyedHelloWorldPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "KeyedHelloWorldCdrAux.hpp" #include "KeyedHelloWorldTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; KeyedHelloWorldPubSubType::KeyedHelloWorldPubSubType() diff --git a/test/blackbox/types/KeyedHelloWorldPubSubTypes.h b/test/blackbox/types/KeyedHelloWorldPubSubTypes.h index 97ed4d8bd09..0f37ce12994 100644 --- a/test/blackbox/types/KeyedHelloWorldPubSubTypes.h +++ b/test/blackbox/types/KeyedHelloWorldPubSubTypes.h @@ -54,18 +54,18 @@ class KeyedHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -80,7 +80,7 @@ class KeyedHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/blackbox/types/StringTestPubSubTypes.cxx b/test/blackbox/types/StringTestPubSubTypes.cxx index 84c53c34e99..33a5ef5d2ec 100644 --- a/test/blackbox/types/StringTestPubSubTypes.cxx +++ b/test/blackbox/types/StringTestPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "StringTestCdrAux.hpp" #include "StringTestTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; StringTestPubSubType::StringTestPubSubType() diff --git a/test/blackbox/types/StringTestPubSubTypes.h b/test/blackbox/types/StringTestPubSubTypes.h index d30d9d24b2c..47c8b13dfee 100644 --- a/test/blackbox/types/StringTestPubSubTypes.h +++ b/test/blackbox/types/StringTestPubSubTypes.h @@ -54,18 +54,18 @@ class StringTestPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -80,7 +80,7 @@ class StringTestPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/blackbox/types/TestRegression3361PubSubTypes.cxx b/test/blackbox/types/TestRegression3361PubSubTypes.cxx index 72d208b454e..654b3c30f9f 100644 --- a/test/blackbox/types/TestRegression3361PubSubTypes.cxx +++ b/test/blackbox/types/TestRegression3361PubSubTypes.cxx @@ -27,8 +27,8 @@ #include "TestRegression3361CdrAux.hpp" #include "TestRegression3361TypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; TestRegression3361PubSubType::TestRegression3361PubSubType() diff --git a/test/blackbox/types/TestRegression3361PubSubTypes.h b/test/blackbox/types/TestRegression3361PubSubTypes.h index f5c5dd38622..59367fcee12 100644 --- a/test/blackbox/types/TestRegression3361PubSubTypes.h +++ b/test/blackbox/types/TestRegression3361PubSubTypes.h @@ -55,18 +55,18 @@ class TestRegression3361PubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -81,7 +81,7 @@ class TestRegression3361PubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.cxx b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.cxx index feb3fd6303e..dd94bfc521b 100644 --- a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.cxx +++ b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "UnboundedHelloWorldCdrAux.hpp" #include "UnboundedHelloWorldTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; UnboundedHelloWorldPubSubType::UnboundedHelloWorldPubSubType() diff --git a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.h b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.h index c58268627ce..7bafebbf69f 100644 --- a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.h +++ b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.h @@ -54,18 +54,18 @@ class UnboundedHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -80,7 +80,7 @@ class UnboundedHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.cxx b/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.cxx index 4dc788af245..ef76e3741b4 100644 --- a/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.cxx +++ b/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "monitorservice_typesCdrAux.hpp" #include "monitorservice_typesTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; namespace eprosima { diff --git a/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.h b/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.h index c6d5c8faa2d..56d242c7b0d 100644 --- a/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.h +++ b/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.h @@ -61,18 +61,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -87,7 +87,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -152,18 +152,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -178,7 +178,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -243,18 +243,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -269,7 +269,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -335,18 +335,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -361,7 +361,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -426,18 +426,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -452,7 +452,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -517,18 +517,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -543,7 +543,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -625,18 +625,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -651,7 +651,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/blackbox/types/statistics/typesPubSubTypes.cxx b/test/blackbox/types/statistics/typesPubSubTypes.cxx index fb048b99c9b..0bbd09f19f6 100644 --- a/test/blackbox/types/statistics/typesPubSubTypes.cxx +++ b/test/blackbox/types/statistics/typesPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "typesCdrAux.hpp" #include "typesTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; namespace eprosima { diff --git a/test/blackbox/types/statistics/typesPubSubTypes.h b/test/blackbox/types/statistics/typesPubSubTypes.h index 653945fdddb..a11fbd43131 100644 --- a/test/blackbox/types/statistics/typesPubSubTypes.h +++ b/test/blackbox/types/statistics/typesPubSubTypes.h @@ -62,18 +62,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -88,7 +88,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -153,18 +153,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -179,7 +179,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -244,18 +244,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -270,7 +270,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -335,18 +335,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -361,7 +361,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -426,18 +426,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -452,7 +452,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -517,18 +517,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -543,7 +543,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -609,18 +609,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -635,7 +635,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -700,18 +700,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -726,7 +726,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -791,18 +791,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -817,7 +817,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -882,18 +882,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -908,7 +908,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -973,18 +973,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -999,7 +999,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1064,18 +1064,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1090,7 +1090,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1155,18 +1155,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1181,7 +1181,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1246,18 +1246,18 @@ namespace eprosima eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1272,7 +1272,7 @@ namespace eprosima eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/blackbox/xfail_tests.cmake b/test/blackbox/xfail_tests.cmake index 31038d792dc..eca34fd36b4 100644 --- a/test/blackbox/xfail_tests.cmake +++ b/test/blackbox/xfail_tests.cmake @@ -22,34 +22,6 @@ set(XFAIL_DDS_PIM_TESTS ########################################################## ) -set(XFAIL_FASTRTPS_TESTS - BlackboxTests_FastRTPS.Discovery.ParticipantLivelinessAssertion - BlackboxTests_FastRTPS.LivelinessQos/LivelinessQos.LongLiveliness_ManualByParticipant_BestEffort/Transport - BlackboxTests_FastRTPS.LivelinessQos/LivelinessQos.ShortLiveliness_ManualByParticipant_Automatic_BestEffort/Intraprocess - BlackboxTests_FastRTPS.LivelinessQos/LivelinessQos.ShortLiveliness_ManualByParticipant_BestEffort/Intraprocess - BlackboxTests_FastRTPS.LivelinessQos/LivelinessQos.ShortLiveliness_ManualByTopic_Automatic_BestEffort/Transport - BlackboxTests_FastRTPS.LivelinessQos/LivelinessQos.ShortLiveliness_ManualByTopic_Automatic_Reliable/Transport - BlackboxTests_FastRTPS.LivelinessQos/LivelinessQos.ThreeWriters_ThreeReaders/Intraprocess - BlackboxTests_FastRTPS.LivelinessQos/LivelinessQos.ThreeWriters_ThreeReaders/Transport - BlackboxTests_FastRTPS.LivelinessQos/LivelinessQos.TwoWriters_OneReader_ManualByParticipant/Intraprocess - BlackboxTests_FastRTPS.PersistenceLargeData/PersistenceLargeData.PubSubAsReliablePubPersistentWithFrag/Transport - - ########################################################## - # These test are here because of TCP instabilities - ########################################################## - BlackboxTests_FastRTPS.ChainingTransportTests.builtin_transports_api_large_data - BlackboxTests_FastRTPS.ChainingTransportTests.builtin_transports_api_large_datav6 - BlackboxTests_FastRTPS.ChainingTransportTests.builtin_transports_env_large_data - BlackboxTests_FastRTPS.ChainingTransportTests.builtin_transports_env_large_datav6 - BlackboxTests_FastRTPS.ChainingTransportTests.builtin_transports_xml_large_data - BlackboxTests_FastRTPS.ChainingTransportTests.builtin_transports_xml_large_datav6 - ########################################################## - ) - set_tests_properties(${XFAIL_DDS_PIM_TESTS} PROPERTIES LABELS xfail ) - -set_tests_properties(${XFAIL_FASTRTPS_TESTS} - PROPERTIES LABELS xfail - ) diff --git a/test/dds-types-test/aliasesPubSubTypes.cxx b/test/dds-types-test/aliasesPubSubTypes.cxx index 67f27a86904..6a244672124 100644 --- a/test/dds-types-test/aliasesPubSubTypes.cxx +++ b/test/dds-types-test/aliasesPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "aliasesCdrAux.hpp" #include "aliasesTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; AliasInt16PubSubType::AliasInt16PubSubType() diff --git a/test/dds-types-test/aliasesPubSubTypes.h b/test/dds-types-test/aliasesPubSubTypes.h index 3d25dd8d5c3..23c977cf63f 100644 --- a/test/dds-types-test/aliasesPubSubTypes.h +++ b/test/dds-types-test/aliasesPubSubTypes.h @@ -80,18 +80,18 @@ class AliasInt16PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -106,7 +106,7 @@ class AliasInt16PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -171,18 +171,18 @@ class AliasUint16PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -197,7 +197,7 @@ class AliasUint16PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -262,18 +262,18 @@ class AliasInt32PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -288,7 +288,7 @@ class AliasInt32PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -353,18 +353,18 @@ class AliasUInt32PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -379,7 +379,7 @@ class AliasUInt32PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -444,18 +444,18 @@ class AliasInt64PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -470,7 +470,7 @@ class AliasInt64PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -535,18 +535,18 @@ class AliasUInt64PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -561,7 +561,7 @@ class AliasUInt64PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -626,18 +626,18 @@ class AliasFloat32PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -652,7 +652,7 @@ class AliasFloat32PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -717,18 +717,18 @@ class AliasFloat64PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -743,7 +743,7 @@ class AliasFloat64PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -808,18 +808,18 @@ class AliasFloat128PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -834,7 +834,7 @@ class AliasFloat128PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -899,18 +899,18 @@ class AliasBoolPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -925,7 +925,7 @@ class AliasBoolPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -990,18 +990,18 @@ class AliasOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1016,7 +1016,7 @@ class AliasOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1081,18 +1081,18 @@ class AliasChar8PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1107,7 +1107,7 @@ class AliasChar8PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1172,18 +1172,18 @@ class AliasChar16PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1198,7 +1198,7 @@ class AliasChar16PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1263,18 +1263,18 @@ class AliasString8PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1289,7 +1289,7 @@ class AliasString8PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1354,18 +1354,18 @@ class AliasString16PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1380,7 +1380,7 @@ class AliasString16PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1445,18 +1445,18 @@ class AliasEnumPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1471,7 +1471,7 @@ class AliasEnumPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1536,18 +1536,18 @@ class AliasBitmaskPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1562,7 +1562,7 @@ class AliasBitmaskPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1627,18 +1627,18 @@ class AliasAliasPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1653,7 +1653,7 @@ class AliasAliasPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1718,18 +1718,18 @@ class AliasArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1744,7 +1744,7 @@ class AliasArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1809,18 +1809,18 @@ class AliasMultiArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1835,7 +1835,7 @@ class AliasMultiArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1900,18 +1900,18 @@ class AliasSequencePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1926,7 +1926,7 @@ class AliasSequencePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1991,18 +1991,18 @@ class AliasMapPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2017,7 +2017,7 @@ class AliasMapPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2082,18 +2082,18 @@ class AliasUnionPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2108,7 +2108,7 @@ class AliasUnionPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2173,18 +2173,18 @@ class AliasStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2199,7 +2199,7 @@ class AliasStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2264,18 +2264,18 @@ class AliasBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2290,7 +2290,7 @@ class AliasBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/dds-types-test/annotationsPubSubTypes.cxx b/test/dds-types-test/annotationsPubSubTypes.cxx index 7879d666a5a..3c9835ac2aa 100644 --- a/test/dds-types-test/annotationsPubSubTypes.cxx +++ b/test/dds-types-test/annotationsPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "annotationsCdrAux.hpp" #include "annotationsTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; AnnotatedStructPubSubType::AnnotatedStructPubSubType() diff --git a/test/dds-types-test/annotationsPubSubTypes.h b/test/dds-types-test/annotationsPubSubTypes.h index dcf09c3dd6a..2db8a8ab9fa 100644 --- a/test/dds-types-test/annotationsPubSubTypes.h +++ b/test/dds-types-test/annotationsPubSubTypes.h @@ -55,18 +55,18 @@ class AnnotatedStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -81,7 +81,7 @@ class AnnotatedStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -146,18 +146,18 @@ class EmptyAnnotatedStructPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -172,7 +172,7 @@ class EmptyAnnotatedStructPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -238,18 +238,18 @@ class BasicAnnotationsStructPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -264,7 +264,7 @@ class BasicAnnotationsStructPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/dds-types-test/appendablePubSubTypes.cxx b/test/dds-types-test/appendablePubSubTypes.cxx index fce8a5bb834..cc320a70a9a 100644 --- a/test/dds-types-test/appendablePubSubTypes.cxx +++ b/test/dds-types-test/appendablePubSubTypes.cxx @@ -27,8 +27,8 @@ #include "appendableCdrAux.hpp" #include "appendableTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; AppendableShortStructPubSubType::AppendableShortStructPubSubType() diff --git a/test/dds-types-test/appendablePubSubTypes.h b/test/dds-types-test/appendablePubSubTypes.h index 5fde4a63691..a689a45579d 100644 --- a/test/dds-types-test/appendablePubSubTypes.h +++ b/test/dds-types-test/appendablePubSubTypes.h @@ -55,18 +55,18 @@ class AppendableShortStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -81,7 +81,7 @@ class AppendableShortStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -146,18 +146,18 @@ class AppendableUShortStructPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -172,7 +172,7 @@ class AppendableUShortStructPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -237,18 +237,18 @@ class AppendableLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -263,7 +263,7 @@ class AppendableLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -328,18 +328,18 @@ class AppendableULongStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -354,7 +354,7 @@ class AppendableULongStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -419,18 +419,18 @@ class AppendableLongLongStructPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -445,7 +445,7 @@ class AppendableLongLongStructPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -510,18 +510,18 @@ class AppendableULongLongStructPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -536,7 +536,7 @@ class AppendableULongLongStructPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -601,18 +601,18 @@ class AppendableFloatStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -627,7 +627,7 @@ class AppendableFloatStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -692,18 +692,18 @@ class AppendableDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -718,7 +718,7 @@ class AppendableDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -783,18 +783,18 @@ class AppendableLongDoubleStructPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -809,7 +809,7 @@ class AppendableLongDoubleStructPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -874,18 +874,18 @@ class AppendableBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -900,7 +900,7 @@ class AppendableBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -965,18 +965,18 @@ class AppendableOctetStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -991,7 +991,7 @@ class AppendableOctetStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1056,18 +1056,18 @@ class AppendableCharStructPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1082,7 +1082,7 @@ class AppendableCharStructPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1147,18 +1147,18 @@ class AppendableWCharStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1173,7 +1173,7 @@ class AppendableWCharStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1238,18 +1238,18 @@ class AppendableUnionStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1264,7 +1264,7 @@ class AppendableUnionStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1329,18 +1329,18 @@ class AppendableEmptyStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1355,7 +1355,7 @@ class AppendableEmptyStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1420,18 +1420,18 @@ class AppendableEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1446,7 +1446,7 @@ class AppendableEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1511,18 +1511,18 @@ class AppendableInheritanceStructPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1537,7 +1537,7 @@ class AppendableInheritanceStructPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1602,18 +1602,18 @@ class AppendableInheritanceEmptyStructPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1628,7 +1628,7 @@ class AppendableInheritanceEmptyStructPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1693,18 +1693,18 @@ class AppendableExtensibilityInheritancePubSubType : public eprosima::fastdds::d eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1719,7 +1719,7 @@ class AppendableExtensibilityInheritancePubSubType : public eprosima::fastdds::d eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/dds-types-test/arraysPubSubTypes.cxx b/test/dds-types-test/arraysPubSubTypes.cxx index 2f51f7da108..b725171c2f5 100644 --- a/test/dds-types-test/arraysPubSubTypes.cxx +++ b/test/dds-types-test/arraysPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "arraysCdrAux.hpp" #include "arraysTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; ArrayShortPubSubType::ArrayShortPubSubType() diff --git a/test/dds-types-test/arraysPubSubTypes.h b/test/dds-types-test/arraysPubSubTypes.h index 5f699814261..6a11747c37f 100644 --- a/test/dds-types-test/arraysPubSubTypes.h +++ b/test/dds-types-test/arraysPubSubTypes.h @@ -55,18 +55,18 @@ class ArrayShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -81,7 +81,7 @@ class ArrayShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -146,18 +146,18 @@ class ArrayUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -172,7 +172,7 @@ class ArrayUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -237,18 +237,18 @@ class ArrayLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -263,7 +263,7 @@ class ArrayLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -328,18 +328,18 @@ class ArrayULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -354,7 +354,7 @@ class ArrayULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -419,18 +419,18 @@ class ArrayLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -445,7 +445,7 @@ class ArrayLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -510,18 +510,18 @@ class ArrayULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -536,7 +536,7 @@ class ArrayULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -601,18 +601,18 @@ class ArrayFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -627,7 +627,7 @@ class ArrayFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -692,18 +692,18 @@ class ArrayDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -718,7 +718,7 @@ class ArrayDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -783,18 +783,18 @@ class ArrayLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -809,7 +809,7 @@ class ArrayLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -874,18 +874,18 @@ class ArrayBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -900,7 +900,7 @@ class ArrayBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -965,18 +965,18 @@ class ArrayOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -991,7 +991,7 @@ class ArrayOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1056,18 +1056,18 @@ class ArrayCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1082,7 +1082,7 @@ class ArrayCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1147,18 +1147,18 @@ class ArrayWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1173,7 +1173,7 @@ class ArrayWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1238,18 +1238,18 @@ class ArrayStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1264,7 +1264,7 @@ class ArrayStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1329,18 +1329,18 @@ class ArrayWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1355,7 +1355,7 @@ class ArrayWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1420,18 +1420,18 @@ class ArrayBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1446,7 +1446,7 @@ class ArrayBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1511,18 +1511,18 @@ class ArrayBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1537,7 +1537,7 @@ class ArrayBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1602,18 +1602,18 @@ class ArrayEnumPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1628,7 +1628,7 @@ class ArrayEnumPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1693,18 +1693,18 @@ class ArrayBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1719,7 +1719,7 @@ class ArrayBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1784,18 +1784,18 @@ class ArrayAliasPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1810,7 +1810,7 @@ class ArrayAliasPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1875,18 +1875,18 @@ class ArrayShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1901,7 +1901,7 @@ class ArrayShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1966,18 +1966,18 @@ class ArraySequencePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1992,7 +1992,7 @@ class ArraySequencePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2057,18 +2057,18 @@ class ArrayMapPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2083,7 +2083,7 @@ class ArrayMapPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2148,18 +2148,18 @@ class ArrayUnionPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2174,7 +2174,7 @@ class ArrayUnionPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2239,18 +2239,18 @@ class ArrayStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2265,7 +2265,7 @@ class ArrayStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2330,18 +2330,18 @@ class ArrayBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2356,7 +2356,7 @@ class ArrayBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2421,18 +2421,18 @@ class ArrayMultiDimensionShortPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2447,7 +2447,7 @@ class ArrayMultiDimensionShortPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2512,18 +2512,18 @@ class ArrayMultiDimensionUShortPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2538,7 +2538,7 @@ class ArrayMultiDimensionUShortPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2603,18 +2603,18 @@ class ArrayMultiDimensionLongPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2629,7 +2629,7 @@ class ArrayMultiDimensionLongPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2694,18 +2694,18 @@ class ArrayMultiDimensionULongPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2720,7 +2720,7 @@ class ArrayMultiDimensionULongPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2785,18 +2785,18 @@ class ArrayMultiDimensionLongLongPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2811,7 +2811,7 @@ class ArrayMultiDimensionLongLongPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2876,18 +2876,18 @@ class ArrayMultiDimensionULongLongPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2902,7 +2902,7 @@ class ArrayMultiDimensionULongLongPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2967,18 +2967,18 @@ class ArrayMultiDimensionFloatPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2993,7 +2993,7 @@ class ArrayMultiDimensionFloatPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3058,18 +3058,18 @@ class ArrayMultiDimensionDoublePubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3084,7 +3084,7 @@ class ArrayMultiDimensionDoublePubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3149,18 +3149,18 @@ class ArrayMultiDimensionLongDoublePubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3175,7 +3175,7 @@ class ArrayMultiDimensionLongDoublePubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3240,18 +3240,18 @@ class ArrayMultiDimensionBooleanPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3266,7 +3266,7 @@ class ArrayMultiDimensionBooleanPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3331,18 +3331,18 @@ class ArrayMultiDimensionOctetPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3357,7 +3357,7 @@ class ArrayMultiDimensionOctetPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3422,18 +3422,18 @@ class ArrayMultiDimensionCharPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3448,7 +3448,7 @@ class ArrayMultiDimensionCharPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3513,18 +3513,18 @@ class ArrayMultiDimensionWCharPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3539,7 +3539,7 @@ class ArrayMultiDimensionWCharPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3604,18 +3604,18 @@ class ArrayMultiDimensionStringPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3630,7 +3630,7 @@ class ArrayMultiDimensionStringPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3695,18 +3695,18 @@ class ArrayMultiDimensionWStringPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3721,7 +3721,7 @@ class ArrayMultiDimensionWStringPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3786,18 +3786,18 @@ class ArrayMultiDimensionBoundedStringPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3812,7 +3812,7 @@ class ArrayMultiDimensionBoundedStringPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3877,18 +3877,18 @@ class ArrayMultiDimensionBoundedWStringPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3903,7 +3903,7 @@ class ArrayMultiDimensionBoundedWStringPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3968,18 +3968,18 @@ class ArrayMultiDimensionEnumPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3994,7 +3994,7 @@ class ArrayMultiDimensionEnumPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4059,18 +4059,18 @@ class ArrayMultiDimensionBitMaskPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4085,7 +4085,7 @@ class ArrayMultiDimensionBitMaskPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4150,18 +4150,18 @@ class ArrayMultiDimensionAliasPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4176,7 +4176,7 @@ class ArrayMultiDimensionAliasPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4241,18 +4241,18 @@ class ArrayMultiDimensionSequencePubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4267,7 +4267,7 @@ class ArrayMultiDimensionSequencePubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4332,18 +4332,18 @@ class ArrayMultiDimensionMapPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4358,7 +4358,7 @@ class ArrayMultiDimensionMapPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4423,18 +4423,18 @@ class ArrayMultiDimensionUnionPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4449,7 +4449,7 @@ class ArrayMultiDimensionUnionPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4514,18 +4514,18 @@ class ArrayMultiDimensionStructurePubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4540,7 +4540,7 @@ class ArrayMultiDimensionStructurePubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4605,18 +4605,18 @@ class ArrayMultiDimensionBitsetPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4631,7 +4631,7 @@ class ArrayMultiDimensionBitsetPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4698,18 +4698,18 @@ class ArraySingleDimensionLiteralsShortPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4724,7 +4724,7 @@ class ArraySingleDimensionLiteralsShortPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4789,18 +4789,18 @@ class ArraySingleDimensionLiteralsUnsignedShortPubSubType : public eprosima::fas eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4815,7 +4815,7 @@ class ArraySingleDimensionLiteralsUnsignedShortPubSubType : public eprosima::fas eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4880,18 +4880,18 @@ class ArraySingleDimensionLiteralsLongPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4906,7 +4906,7 @@ class ArraySingleDimensionLiteralsLongPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4971,18 +4971,18 @@ class ArraySingleDimensionLiteralsUnsignedLongPubSubType : public eprosima::fast eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4997,7 +4997,7 @@ class ArraySingleDimensionLiteralsUnsignedLongPubSubType : public eprosima::fast eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5062,18 +5062,18 @@ class ArraySingleDimensionLiteralsLongLongPubSubType : public eprosima::fastdds: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5088,7 +5088,7 @@ class ArraySingleDimensionLiteralsLongLongPubSubType : public eprosima::fastdds: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5153,18 +5153,18 @@ class ArraySingleDimensionLiteralsUnsignedLongLongPubSubType : public eprosima:: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5179,7 +5179,7 @@ class ArraySingleDimensionLiteralsUnsignedLongLongPubSubType : public eprosima:: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5244,18 +5244,18 @@ class ArraySingleDimensionLiteralsFloatPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5270,7 +5270,7 @@ class ArraySingleDimensionLiteralsFloatPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5335,18 +5335,18 @@ class ArraySingleDimensionLiteralsDoublePubSubType : public eprosima::fastdds::d eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5361,7 +5361,7 @@ class ArraySingleDimensionLiteralsDoublePubSubType : public eprosima::fastdds::d eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5426,18 +5426,18 @@ class ArraySingleDimensionLiteralsLongDoublePubSubType : public eprosima::fastdd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5452,7 +5452,7 @@ class ArraySingleDimensionLiteralsLongDoublePubSubType : public eprosima::fastdd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5517,18 +5517,18 @@ class ArraySingleDimensionLiteralsBooleanPubSubType : public eprosima::fastdds:: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5543,7 +5543,7 @@ class ArraySingleDimensionLiteralsBooleanPubSubType : public eprosima::fastdds:: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5608,18 +5608,18 @@ class ArraySingleDimensionLiteralsOctetPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5634,7 +5634,7 @@ class ArraySingleDimensionLiteralsOctetPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5699,18 +5699,18 @@ class ArraySingleDimensionLiteralsCharPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5725,7 +5725,7 @@ class ArraySingleDimensionLiteralsCharPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5790,18 +5790,18 @@ class ArraySingleDimensionLiteralsWCharPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5816,7 +5816,7 @@ class ArraySingleDimensionLiteralsWCharPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5881,18 +5881,18 @@ class ArraySingleDimensionLiteralsStringPubSubType : public eprosima::fastdds::d eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5907,7 +5907,7 @@ class ArraySingleDimensionLiteralsStringPubSubType : public eprosima::fastdds::d eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5972,18 +5972,18 @@ class ArraySingleDimensionLiteralsWStringPubSubType : public eprosima::fastdds:: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5998,7 +5998,7 @@ class ArraySingleDimensionLiteralsWStringPubSubType : public eprosima::fastdds:: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6063,18 +6063,18 @@ class ArraySingleDimensionLiteralsBoundedStringPubSubType : public eprosima::fas eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6089,7 +6089,7 @@ class ArraySingleDimensionLiteralsBoundedStringPubSubType : public eprosima::fas eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6154,18 +6154,18 @@ class ArraySingleDimensionLiteralsBoundedWStringPubSubType : public eprosima::fa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6180,7 +6180,7 @@ class ArraySingleDimensionLiteralsBoundedWStringPubSubType : public eprosima::fa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6245,18 +6245,18 @@ class ArraySingleDimensionLiteralsEnumPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6271,7 +6271,7 @@ class ArraySingleDimensionLiteralsEnumPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6336,18 +6336,18 @@ class ArraySingleDimensionLiteralsBitMaskPubSubType : public eprosima::fastdds:: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6362,7 +6362,7 @@ class ArraySingleDimensionLiteralsBitMaskPubSubType : public eprosima::fastdds:: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6427,18 +6427,18 @@ class ArraySingleDimensionLiteralsAliasPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6453,7 +6453,7 @@ class ArraySingleDimensionLiteralsAliasPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6518,18 +6518,18 @@ class ArraySingleDimensionLiteralsShortArrayPubSubType : public eprosima::fastdd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6544,7 +6544,7 @@ class ArraySingleDimensionLiteralsShortArrayPubSubType : public eprosima::fastdd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6609,18 +6609,18 @@ class ArraySingleDimensionLiteralsSequencePubSubType : public eprosima::fastdds: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6635,7 +6635,7 @@ class ArraySingleDimensionLiteralsSequencePubSubType : public eprosima::fastdds: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6700,18 +6700,18 @@ class ArraySingleDimensionLiteralsMapPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6726,7 +6726,7 @@ class ArraySingleDimensionLiteralsMapPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6791,18 +6791,18 @@ class ArraySingleDimensionLiteralsUnionPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6817,7 +6817,7 @@ class ArraySingleDimensionLiteralsUnionPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6882,18 +6882,18 @@ class ArraySingleDimensionLiteralsStructurePubSubType : public eprosima::fastdds eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6908,7 +6908,7 @@ class ArraySingleDimensionLiteralsStructurePubSubType : public eprosima::fastdds eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6973,18 +6973,18 @@ class ArraySingleDimensionLiteralsBitsetPubSubType : public eprosima::fastdds::d eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6999,7 +6999,7 @@ class ArraySingleDimensionLiteralsBitsetPubSubType : public eprosima::fastdds::d eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7064,18 +7064,18 @@ class ArrayMultiDimensionLiteralsShortPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7090,7 +7090,7 @@ class ArrayMultiDimensionLiteralsShortPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7155,18 +7155,18 @@ class ArrayMultiDimensionLiteralsUShortPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7181,7 +7181,7 @@ class ArrayMultiDimensionLiteralsUShortPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7246,18 +7246,18 @@ class ArrayMultiDimensionLiteralsLongPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7272,7 +7272,7 @@ class ArrayMultiDimensionLiteralsLongPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7337,18 +7337,18 @@ class ArrayMultiDimensionLiteralsULongPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7363,7 +7363,7 @@ class ArrayMultiDimensionLiteralsULongPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7428,18 +7428,18 @@ class ArrayMultiDimensionLiteralsLongLongPubSubType : public eprosima::fastdds:: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7454,7 +7454,7 @@ class ArrayMultiDimensionLiteralsLongLongPubSubType : public eprosima::fastdds:: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7519,18 +7519,18 @@ class ArrayMultiDimensionLiteralsULongLongPubSubType : public eprosima::fastdds: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7545,7 +7545,7 @@ class ArrayMultiDimensionLiteralsULongLongPubSubType : public eprosima::fastdds: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7610,18 +7610,18 @@ class ArrayMultiDimensionLiteralsFloatPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7636,7 +7636,7 @@ class ArrayMultiDimensionLiteralsFloatPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7701,18 +7701,18 @@ class ArrayMultiDimensionLiteralsDoublePubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7727,7 +7727,7 @@ class ArrayMultiDimensionLiteralsDoublePubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7792,18 +7792,18 @@ class ArrayMultiDimensionLiteralsLongDoublePubSubType : public eprosima::fastdds eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7818,7 +7818,7 @@ class ArrayMultiDimensionLiteralsLongDoublePubSubType : public eprosima::fastdds eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7883,18 +7883,18 @@ class ArrayMultiDimensionLiteralsBooleanPubSubType : public eprosima::fastdds::d eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7909,7 +7909,7 @@ class ArrayMultiDimensionLiteralsBooleanPubSubType : public eprosima::fastdds::d eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7974,18 +7974,18 @@ class ArrayMultiDimensionLiteralsOctetPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8000,7 +8000,7 @@ class ArrayMultiDimensionLiteralsOctetPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8065,18 +8065,18 @@ class ArrayMultiDimensionLiteralsCharPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8091,7 +8091,7 @@ class ArrayMultiDimensionLiteralsCharPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8156,18 +8156,18 @@ class ArrayMultiDimensionLiteralsWCharPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8182,7 +8182,7 @@ class ArrayMultiDimensionLiteralsWCharPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8247,18 +8247,18 @@ class ArrayMultiDimensionLiteralsStringPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8273,7 +8273,7 @@ class ArrayMultiDimensionLiteralsStringPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8338,18 +8338,18 @@ class ArrayMultiDimensionLiteralsWStringPubSubType : public eprosima::fastdds::d eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8364,7 +8364,7 @@ class ArrayMultiDimensionLiteralsWStringPubSubType : public eprosima::fastdds::d eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8429,18 +8429,18 @@ class ArrayMultiDimensionLiteralsBoundedStringPubSubType : public eprosima::fast eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8455,7 +8455,7 @@ class ArrayMultiDimensionLiteralsBoundedStringPubSubType : public eprosima::fast eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8520,18 +8520,18 @@ class ArrayMultiDimensionLiteralsBoundedWStringPubSubType : public eprosima::fas eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8546,7 +8546,7 @@ class ArrayMultiDimensionLiteralsBoundedWStringPubSubType : public eprosima::fas eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8611,18 +8611,18 @@ class ArrayMultiDimensionLiteralsEnumPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8637,7 +8637,7 @@ class ArrayMultiDimensionLiteralsEnumPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8702,18 +8702,18 @@ class ArrayMultiDimensionLiteralsBitMaskPubSubType : public eprosima::fastdds::d eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8728,7 +8728,7 @@ class ArrayMultiDimensionLiteralsBitMaskPubSubType : public eprosima::fastdds::d eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8793,18 +8793,18 @@ class ArrayMultiDimensionLiteralsAliasPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8819,7 +8819,7 @@ class ArrayMultiDimensionLiteralsAliasPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8884,18 +8884,18 @@ class ArrayMultiDimensionLiteralsSequencePubSubType : public eprosima::fastdds:: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8910,7 +8910,7 @@ class ArrayMultiDimensionLiteralsSequencePubSubType : public eprosima::fastdds:: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8975,18 +8975,18 @@ class ArrayMultiDimensionLiteralsMapPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -9001,7 +9001,7 @@ class ArrayMultiDimensionLiteralsMapPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -9066,18 +9066,18 @@ class ArrayMultiDimensionLiteralsUnionPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -9092,7 +9092,7 @@ class ArrayMultiDimensionLiteralsUnionPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -9157,18 +9157,18 @@ class ArrayMultiDimensionLiteralsStructurePubSubType : public eprosima::fastdds: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -9183,7 +9183,7 @@ class ArrayMultiDimensionLiteralsStructurePubSubType : public eprosima::fastdds: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -9248,18 +9248,18 @@ class ArrayMultiDimensionLiteralsBitSetPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -9274,7 +9274,7 @@ class ArrayMultiDimensionLiteralsBitSetPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -9339,18 +9339,18 @@ class BoundedSmallArraysPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -9365,7 +9365,7 @@ class BoundedSmallArraysPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -9430,18 +9430,18 @@ class BoundedBigArraysPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -9456,7 +9456,7 @@ class BoundedBigArraysPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/dds-types-test/bitsetsPubSubTypes.cxx b/test/dds-types-test/bitsetsPubSubTypes.cxx index e5669aac86b..495b6dcee8e 100644 --- a/test/dds-types-test/bitsetsPubSubTypes.cxx +++ b/test/dds-types-test/bitsetsPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "bitsetsCdrAux.hpp" #include "bitsetsTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; BitsetStructPubSubType::BitsetStructPubSubType() diff --git a/test/dds-types-test/bitsetsPubSubTypes.h b/test/dds-types-test/bitsetsPubSubTypes.h index fd2ce4d8ffd..e5472507430 100644 --- a/test/dds-types-test/bitsetsPubSubTypes.h +++ b/test/dds-types-test/bitsetsPubSubTypes.h @@ -55,18 +55,18 @@ class BitsetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -81,7 +81,7 @@ class BitsetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/dds-types-test/constantsPubSubTypes.cxx b/test/dds-types-test/constantsPubSubTypes.cxx index 6849ce4fe56..fea6487e3c0 100644 --- a/test/dds-types-test/constantsPubSubTypes.cxx +++ b/test/dds-types-test/constantsPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "constantsCdrAux.hpp" #include "constantsTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; namespace const_module1 { diff --git a/test/dds-types-test/constantsPubSubTypes.h b/test/dds-types-test/constantsPubSubTypes.h index 632b39aef55..5e5cd3bb707 100644 --- a/test/dds-types-test/constantsPubSubTypes.h +++ b/test/dds-types-test/constantsPubSubTypes.h @@ -61,18 +61,18 @@ namespace const_module1 eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -87,7 +87,7 @@ namespace const_module1 eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -155,18 +155,18 @@ namespace const_module2 eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -181,7 +181,7 @@ namespace const_module2 eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -247,18 +247,18 @@ class ConstsLiteralsStructPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -273,7 +273,7 @@ class ConstsLiteralsStructPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/dds-types-test/declarationsPubSubTypes.cxx b/test/dds-types-test/declarationsPubSubTypes.cxx index 1ec7beb5034..e0f0a37177f 100644 --- a/test/dds-types-test/declarationsPubSubTypes.cxx +++ b/test/dds-types-test/declarationsPubSubTypes.cxx @@ -25,8 +25,8 @@ #include #include "declarationsCdrAux.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; ForwardDeclarationsRecursiveStructPubSubType::ForwardDeclarationsRecursiveStructPubSubType() diff --git a/test/dds-types-test/declarationsPubSubTypes.h b/test/dds-types-test/declarationsPubSubTypes.h index f2fcc7a2e7f..6eb099cc535 100644 --- a/test/dds-types-test/declarationsPubSubTypes.h +++ b/test/dds-types-test/declarationsPubSubTypes.h @@ -59,18 +59,18 @@ class ForwardDeclarationsRecursiveStructPubSubType : public eprosima::fastdds::d eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -85,7 +85,7 @@ class ForwardDeclarationsRecursiveStructPubSubType : public eprosima::fastdds::d eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -151,18 +151,18 @@ class ForwardStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -177,7 +177,7 @@ class ForwardStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -248,18 +248,18 @@ namespace declarations_module eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -274,7 +274,7 @@ namespace declarations_module eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -340,18 +340,18 @@ class ModuledForwardDeclarationsRecursiveStructPubSubType : public eprosima::fas eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -366,7 +366,7 @@ class ModuledForwardDeclarationsRecursiveStructPubSubType : public eprosima::fas eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -433,18 +433,18 @@ namespace declarations_module eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -459,7 +459,7 @@ namespace declarations_module eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -527,18 +527,18 @@ class ModuledCommonNameStructurePubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -553,7 +553,7 @@ class ModuledCommonNameStructurePubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/dds-types-test/enumerationsPubSubTypes.cxx b/test/dds-types-test/enumerationsPubSubTypes.cxx index 32f82c08045..a9e2541df63 100644 --- a/test/dds-types-test/enumerationsPubSubTypes.cxx +++ b/test/dds-types-test/enumerationsPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "enumerationsCdrAux.hpp" #include "enumerationsTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; namespace Test { diff --git a/test/dds-types-test/enumerationsPubSubTypes.h b/test/dds-types-test/enumerationsPubSubTypes.h index 0aba598f784..4aa119eb485 100644 --- a/test/dds-types-test/enumerationsPubSubTypes.h +++ b/test/dds-types-test/enumerationsPubSubTypes.h @@ -58,18 +58,18 @@ class EnumStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -84,7 +84,7 @@ class EnumStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -149,18 +149,18 @@ class BitMaskStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -175,7 +175,7 @@ class BitMaskStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -240,18 +240,18 @@ class BoundedBitMaskStructurePubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -266,7 +266,7 @@ class BoundedBitMaskStructurePubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/dds-types-test/externalPubSubTypes.cxx b/test/dds-types-test/externalPubSubTypes.cxx index 7376fe0a2d5..43c07082de5 100644 --- a/test/dds-types-test/externalPubSubTypes.cxx +++ b/test/dds-types-test/externalPubSubTypes.cxx @@ -25,8 +25,8 @@ #include #include "externalCdrAux.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; short_externalPubSubType::short_externalPubSubType() diff --git a/test/dds-types-test/externalPubSubTypes.h b/test/dds-types-test/externalPubSubTypes.h index 6f5486b3a27..a624ad2ef31 100644 --- a/test/dds-types-test/externalPubSubTypes.h +++ b/test/dds-types-test/externalPubSubTypes.h @@ -55,18 +55,18 @@ class short_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -81,7 +81,7 @@ class short_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -146,18 +146,18 @@ class ushort_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -172,7 +172,7 @@ class ushort_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -237,18 +237,18 @@ class long_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -263,7 +263,7 @@ class long_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -328,18 +328,18 @@ class ulong_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -354,7 +354,7 @@ class ulong_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -419,18 +419,18 @@ class longlong_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -445,7 +445,7 @@ class longlong_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -510,18 +510,18 @@ class ulonglong_externalPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -536,7 +536,7 @@ class ulonglong_externalPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -601,18 +601,18 @@ class float_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -627,7 +627,7 @@ class float_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -692,18 +692,18 @@ class double_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -718,7 +718,7 @@ class double_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -783,18 +783,18 @@ class longdouble_externalPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -809,7 +809,7 @@ class longdouble_externalPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -874,18 +874,18 @@ class boolean_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -900,7 +900,7 @@ class boolean_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -965,18 +965,18 @@ class octet_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -991,7 +991,7 @@ class octet_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1056,18 +1056,18 @@ class char_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1082,7 +1082,7 @@ class char_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1147,18 +1147,18 @@ class wchar_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1173,7 +1173,7 @@ class wchar_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1238,18 +1238,18 @@ class sequence_short_externalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1264,7 +1264,7 @@ class sequence_short_externalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1329,18 +1329,18 @@ class string_unbounded_externalPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1355,7 +1355,7 @@ class string_unbounded_externalPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1420,18 +1420,18 @@ class string_bounded_externalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1446,7 +1446,7 @@ class string_bounded_externalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1511,18 +1511,18 @@ class map_short_externalPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1537,7 +1537,7 @@ class map_short_externalPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1602,18 +1602,18 @@ class array_short_externalPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1628,7 +1628,7 @@ class array_short_externalPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1693,18 +1693,18 @@ class struct_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1719,7 +1719,7 @@ class struct_externalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1784,18 +1784,18 @@ class InnerStructExternalPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1810,7 +1810,7 @@ class InnerStructExternalPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1875,18 +1875,18 @@ class ext_struct_externalPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1901,7 +1901,7 @@ class ext_struct_externalPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1966,18 +1966,18 @@ class ext_and_inner_struct_externalPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1992,7 +1992,7 @@ class ext_and_inner_struct_externalPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2057,18 +2057,18 @@ class struct_external_optionalPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2083,7 +2083,7 @@ class struct_external_optionalPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2149,18 +2149,18 @@ class recursive_union_containerPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2175,7 +2175,7 @@ class recursive_union_containerPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2241,18 +2241,18 @@ class recursive_test_1PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2267,7 +2267,7 @@ class recursive_test_1PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2334,18 +2334,18 @@ class recursive_structurePubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2360,7 +2360,7 @@ class recursive_structurePubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2425,18 +2425,18 @@ class recursive_test_2PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2451,7 +2451,7 @@ class recursive_test_2PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/dds-types-test/finalPubSubTypes.cxx b/test/dds-types-test/finalPubSubTypes.cxx index 24db7726388..e1a38487532 100644 --- a/test/dds-types-test/finalPubSubTypes.cxx +++ b/test/dds-types-test/finalPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "finalCdrAux.hpp" #include "finalTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; FinalShortStructPubSubType::FinalShortStructPubSubType() diff --git a/test/dds-types-test/finalPubSubTypes.h b/test/dds-types-test/finalPubSubTypes.h index d33b90f4dbe..6476bbfb2f0 100644 --- a/test/dds-types-test/finalPubSubTypes.h +++ b/test/dds-types-test/finalPubSubTypes.h @@ -88,18 +88,18 @@ class FinalShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -114,7 +114,7 @@ class FinalShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -234,18 +234,18 @@ class FinalUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -260,7 +260,7 @@ class FinalUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -380,18 +380,18 @@ class FinalLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -406,7 +406,7 @@ class FinalLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -526,18 +526,18 @@ class FinalULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -552,7 +552,7 @@ class FinalULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -672,18 +672,18 @@ class FinalLongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -698,7 +698,7 @@ class FinalLongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -818,18 +818,18 @@ class FinalULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -844,7 +844,7 @@ class FinalULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -964,18 +964,18 @@ class FinalFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -990,7 +990,7 @@ class FinalFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1110,18 +1110,18 @@ class FinalDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1136,7 +1136,7 @@ class FinalDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1256,18 +1256,18 @@ class FinalLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1282,7 +1282,7 @@ class FinalLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1402,18 +1402,18 @@ class FinalBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1428,7 +1428,7 @@ class FinalBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1548,18 +1548,18 @@ class FinalOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1574,7 +1574,7 @@ class FinalOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1694,18 +1694,18 @@ class FinalCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1720,7 +1720,7 @@ class FinalCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1840,18 +1840,18 @@ class FinalWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1866,7 +1866,7 @@ class FinalWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1953,18 +1953,18 @@ class FinalUnionStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1979,7 +1979,7 @@ class FinalUnionStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2044,18 +2044,18 @@ class FinalEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2070,7 +2070,7 @@ class FinalEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2153,18 +2153,18 @@ class FinalEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2179,7 +2179,7 @@ class FinalEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2244,18 +2244,18 @@ class FinalInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2270,7 +2270,7 @@ class FinalInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2335,18 +2335,18 @@ class InheritanceEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2361,7 +2361,7 @@ class InheritanceEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2481,18 +2481,18 @@ class FinalExtensibilityInheritancePubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2507,7 +2507,7 @@ class FinalExtensibilityInheritancePubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.cxx b/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.cxx index f8dbe9da934..0893a0def3c 100644 --- a/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.cxx +++ b/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "basic_inner_typesCdrAux.hpp" #include "basic_inner_typesTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; InnerStructureHelperPubSubType::InnerStructureHelperPubSubType() diff --git a/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.h b/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.h index fc6c933a90a..275c50c5dfe 100644 --- a/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.h +++ b/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.h @@ -55,18 +55,18 @@ class InnerStructureHelperPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -81,7 +81,7 @@ class InnerStructureHelperPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -146,18 +146,18 @@ class InnerEmptyStructureHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -172,7 +172,7 @@ class InnerEmptyStructureHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/dds-types-test/inheritancePubSubTypes.cxx b/test/dds-types-test/inheritancePubSubTypes.cxx index 60d1fd03024..70d66307c20 100644 --- a/test/dds-types-test/inheritancePubSubTypes.cxx +++ b/test/dds-types-test/inheritancePubSubTypes.cxx @@ -27,8 +27,8 @@ #include "inheritanceCdrAux.hpp" #include "inheritanceTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; InnerStructureHelperChildPubSubType::InnerStructureHelperChildPubSubType() diff --git a/test/dds-types-test/inheritancePubSubTypes.h b/test/dds-types-test/inheritancePubSubTypes.h index 3facbd34834..9b7184bce1f 100644 --- a/test/dds-types-test/inheritancePubSubTypes.h +++ b/test/dds-types-test/inheritancePubSubTypes.h @@ -55,18 +55,18 @@ class InnerStructureHelperChildPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -81,7 +81,7 @@ class InnerStructureHelperChildPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -146,18 +146,18 @@ class InnerStructureHelperChildChildPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -172,7 +172,7 @@ class InnerStructureHelperChildChildPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -237,18 +237,18 @@ class InnerStructureHelperEmptyChildPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -263,7 +263,7 @@ class InnerStructureHelperEmptyChildPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -328,18 +328,18 @@ class InnerStructureHelperEmptyChildChildPubSubType : public eprosima::fastdds:: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -354,7 +354,7 @@ class InnerStructureHelperEmptyChildChildPubSubType : public eprosima::fastdds:: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -419,18 +419,18 @@ class InnerEmptyStructureHelperChildPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -445,7 +445,7 @@ class InnerEmptyStructureHelperChildPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -510,18 +510,18 @@ class StructAliasInheritanceStructPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -536,7 +536,7 @@ class StructAliasInheritanceStructPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -601,18 +601,18 @@ class StructuresInheritanceStructPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -627,7 +627,7 @@ class StructuresInheritanceStructPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -695,18 +695,18 @@ class BitsetsChildInheritanceStructPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -721,7 +721,7 @@ class BitsetsChildInheritanceStructPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/dds-types-test/keyPubSubTypes.cxx b/test/dds-types-test/keyPubSubTypes.cxx index caa75672bca..74e231cf70b 100644 --- a/test/dds-types-test/keyPubSubTypes.cxx +++ b/test/dds-types-test/keyPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "keyCdrAux.hpp" #include "keyTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; KeyedShortStructPubSubType::KeyedShortStructPubSubType() diff --git a/test/dds-types-test/keyPubSubTypes.h b/test/dds-types-test/keyPubSubTypes.h index 7bd07d08e75..40475f4d82e 100644 --- a/test/dds-types-test/keyPubSubTypes.h +++ b/test/dds-types-test/keyPubSubTypes.h @@ -54,18 +54,18 @@ class KeyedShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -80,7 +80,7 @@ class KeyedShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -145,18 +145,18 @@ class KeyedUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -171,7 +171,7 @@ class KeyedUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -236,18 +236,18 @@ class KeyedLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -262,7 +262,7 @@ class KeyedLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -327,18 +327,18 @@ class KeyedULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -353,7 +353,7 @@ class KeyedULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -418,18 +418,18 @@ class KeyedLongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -444,7 +444,7 @@ class KeyedLongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -509,18 +509,18 @@ class KeyedULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -535,7 +535,7 @@ class KeyedULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -600,18 +600,18 @@ class KeyedFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -626,7 +626,7 @@ class KeyedFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -691,18 +691,18 @@ class KeyedDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -717,7 +717,7 @@ class KeyedDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -782,18 +782,18 @@ class KeyedLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -808,7 +808,7 @@ class KeyedLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -873,18 +873,18 @@ class KeyedBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -899,7 +899,7 @@ class KeyedBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -964,18 +964,18 @@ class KeyedOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -990,7 +990,7 @@ class KeyedOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1055,18 +1055,18 @@ class KeyedCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1081,7 +1081,7 @@ class KeyedCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1146,18 +1146,18 @@ class KeyedWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1172,7 +1172,7 @@ class KeyedWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1237,18 +1237,18 @@ class KeyedEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1263,7 +1263,7 @@ class KeyedEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1328,18 +1328,18 @@ class KeyedEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1354,7 +1354,7 @@ class KeyedEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1419,18 +1419,18 @@ class KeyedInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1445,7 +1445,7 @@ class KeyedInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1510,18 +1510,18 @@ class InheritanceKeyedEmptyStructPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1536,7 +1536,7 @@ class InheritanceKeyedEmptyStructPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/dds-types-test/mapsPubSubTypes.cxx b/test/dds-types-test/mapsPubSubTypes.cxx index 4994efc2f07..2e52d6d113d 100644 --- a/test/dds-types-test/mapsPubSubTypes.cxx +++ b/test/dds-types-test/mapsPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "mapsCdrAux.hpp" #include "mapsTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; MapShortShortPubSubType::MapShortShortPubSubType() diff --git a/test/dds-types-test/mapsPubSubTypes.h b/test/dds-types-test/mapsPubSubTypes.h index eb3a5981c74..177d8b639bd 100644 --- a/test/dds-types-test/mapsPubSubTypes.h +++ b/test/dds-types-test/mapsPubSubTypes.h @@ -55,18 +55,18 @@ class MapShortShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -81,7 +81,7 @@ class MapShortShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -146,18 +146,18 @@ class MapShortUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -172,7 +172,7 @@ class MapShortUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -237,18 +237,18 @@ class MapShortLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -263,7 +263,7 @@ class MapShortLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -328,18 +328,18 @@ class MapShortULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -354,7 +354,7 @@ class MapShortULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -419,18 +419,18 @@ class MapShortLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -445,7 +445,7 @@ class MapShortLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -510,18 +510,18 @@ class MapShortULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -536,7 +536,7 @@ class MapShortULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -601,18 +601,18 @@ class MapShortFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -627,7 +627,7 @@ class MapShortFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -692,18 +692,18 @@ class MapShortDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -718,7 +718,7 @@ class MapShortDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -783,18 +783,18 @@ class MapShortLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -809,7 +809,7 @@ class MapShortLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -874,18 +874,18 @@ class MapShortBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -900,7 +900,7 @@ class MapShortBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -965,18 +965,18 @@ class MapShortOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -991,7 +991,7 @@ class MapShortOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1056,18 +1056,18 @@ class MapShortCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1082,7 +1082,7 @@ class MapShortCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1147,18 +1147,18 @@ class MapShortWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1173,7 +1173,7 @@ class MapShortWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1238,18 +1238,18 @@ class MapShortStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1264,7 +1264,7 @@ class MapShortStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1329,18 +1329,18 @@ class MapShortWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1355,7 +1355,7 @@ class MapShortWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1420,18 +1420,18 @@ class MapShortInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1446,7 +1446,7 @@ class MapShortInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1511,18 +1511,18 @@ class MapShortInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1537,7 +1537,7 @@ class MapShortInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1602,18 +1602,18 @@ class MapShortInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1628,7 +1628,7 @@ class MapShortInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1693,18 +1693,18 @@ class MapShortInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1719,7 +1719,7 @@ class MapShortInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1784,18 +1784,18 @@ class MapShortInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1810,7 +1810,7 @@ class MapShortInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1875,18 +1875,18 @@ class MapShortInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1901,7 +1901,7 @@ class MapShortInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1966,18 +1966,18 @@ class MapShortInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1992,7 +1992,7 @@ class MapShortInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2057,18 +2057,18 @@ class MapShortInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2083,7 +2083,7 @@ class MapShortInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2148,18 +2148,18 @@ class MapShortInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2174,7 +2174,7 @@ class MapShortInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2239,18 +2239,18 @@ class MapShortInnerStructureHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2265,7 +2265,7 @@ class MapShortInnerStructureHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2330,18 +2330,18 @@ class MapShortInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2356,7 +2356,7 @@ class MapShortInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2421,18 +2421,18 @@ class MapUShortShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2447,7 +2447,7 @@ class MapUShortShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2512,18 +2512,18 @@ class MapUShortUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2538,7 +2538,7 @@ class MapUShortUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2603,18 +2603,18 @@ class MapUShortLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2629,7 +2629,7 @@ class MapUShortLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2694,18 +2694,18 @@ class MapUShortULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2720,7 +2720,7 @@ class MapUShortULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2785,18 +2785,18 @@ class MapUShortLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2811,7 +2811,7 @@ class MapUShortLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2876,18 +2876,18 @@ class MapUShortULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2902,7 +2902,7 @@ class MapUShortULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2967,18 +2967,18 @@ class MapUShortFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2993,7 +2993,7 @@ class MapUShortFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3058,18 +3058,18 @@ class MapUShortDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3084,7 +3084,7 @@ class MapUShortDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3149,18 +3149,18 @@ class MapUShortLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3175,7 +3175,7 @@ class MapUShortLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3240,18 +3240,18 @@ class MapUShortBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3266,7 +3266,7 @@ class MapUShortBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3331,18 +3331,18 @@ class MapUShortOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3357,7 +3357,7 @@ class MapUShortOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3422,18 +3422,18 @@ class MapUShortCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3448,7 +3448,7 @@ class MapUShortCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3513,18 +3513,18 @@ class MapUShortWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3539,7 +3539,7 @@ class MapUShortWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3604,18 +3604,18 @@ class MapUShortStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3630,7 +3630,7 @@ class MapUShortStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3695,18 +3695,18 @@ class MapUShortWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3721,7 +3721,7 @@ class MapUShortWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3786,18 +3786,18 @@ class MapUShortInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3812,7 +3812,7 @@ class MapUShortInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3877,18 +3877,18 @@ class MapUShortInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3903,7 +3903,7 @@ class MapUShortInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3968,18 +3968,18 @@ class MapUShortInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3994,7 +3994,7 @@ class MapUShortInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4059,18 +4059,18 @@ class MapUShortInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4085,7 +4085,7 @@ class MapUShortInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4150,18 +4150,18 @@ class MapUShortInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4176,7 +4176,7 @@ class MapUShortInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4241,18 +4241,18 @@ class MapUShortInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4267,7 +4267,7 @@ class MapUShortInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4332,18 +4332,18 @@ class MapUShortInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4358,7 +4358,7 @@ class MapUShortInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4423,18 +4423,18 @@ class MapUShortInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4449,7 +4449,7 @@ class MapUShortInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4514,18 +4514,18 @@ class MapUShortInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4540,7 +4540,7 @@ class MapUShortInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4605,18 +4605,18 @@ class MapUShortInnerStructureHelperPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4631,7 +4631,7 @@ class MapUShortInnerStructureHelperPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4696,18 +4696,18 @@ class MapUShortInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4722,7 +4722,7 @@ class MapUShortInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4787,18 +4787,18 @@ class MapLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4813,7 +4813,7 @@ class MapLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4878,18 +4878,18 @@ class MapLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4904,7 +4904,7 @@ class MapLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4969,18 +4969,18 @@ class MapLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4995,7 +4995,7 @@ class MapLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5060,18 +5060,18 @@ class MapLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5086,7 +5086,7 @@ class MapLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5151,18 +5151,18 @@ class MapLongKeyLongLongValuePubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5177,7 +5177,7 @@ class MapLongKeyLongLongValuePubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5242,18 +5242,18 @@ class MapLongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5268,7 +5268,7 @@ class MapLongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5333,18 +5333,18 @@ class MapLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5359,7 +5359,7 @@ class MapLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5424,18 +5424,18 @@ class MapLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5450,7 +5450,7 @@ class MapLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5515,18 +5515,18 @@ class MapLongKeyLongDoubleValuePubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5541,7 +5541,7 @@ class MapLongKeyLongDoubleValuePubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5606,18 +5606,18 @@ class MapLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5632,7 +5632,7 @@ class MapLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5697,18 +5697,18 @@ class MapLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5723,7 +5723,7 @@ class MapLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5788,18 +5788,18 @@ class MapLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5814,7 +5814,7 @@ class MapLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5879,18 +5879,18 @@ class MapLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5905,7 +5905,7 @@ class MapLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5970,18 +5970,18 @@ class MapLongStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5996,7 +5996,7 @@ class MapLongStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6061,18 +6061,18 @@ class MapLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6087,7 +6087,7 @@ class MapLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6152,18 +6152,18 @@ class MapLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6178,7 +6178,7 @@ class MapLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6243,18 +6243,18 @@ class MapLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdds eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6269,7 +6269,7 @@ class MapLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdds eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6334,18 +6334,18 @@ class MapLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6360,7 +6360,7 @@ class MapLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6425,18 +6425,18 @@ class MapLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6451,7 +6451,7 @@ class MapLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6516,18 +6516,18 @@ class MapLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6542,7 +6542,7 @@ class MapLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6607,18 +6607,18 @@ class MapLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6633,7 +6633,7 @@ class MapLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6698,18 +6698,18 @@ class MapLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6724,7 +6724,7 @@ class MapLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6789,18 +6789,18 @@ class MapLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6815,7 +6815,7 @@ class MapLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6880,18 +6880,18 @@ class MapLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6906,7 +6906,7 @@ class MapLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6971,18 +6971,18 @@ class MapLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6997,7 +6997,7 @@ class MapLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7062,18 +7062,18 @@ class MapLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7088,7 +7088,7 @@ class MapLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7153,18 +7153,18 @@ class MapULongShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7179,7 +7179,7 @@ class MapULongShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7244,18 +7244,18 @@ class MapULongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7270,7 +7270,7 @@ class MapULongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7335,18 +7335,18 @@ class MapULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7361,7 +7361,7 @@ class MapULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7426,18 +7426,18 @@ class MapULongULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7452,7 +7452,7 @@ class MapULongULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7517,18 +7517,18 @@ class MapKeyULongValueLongLongPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7543,7 +7543,7 @@ class MapKeyULongValueLongLongPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7608,18 +7608,18 @@ class MapULongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7634,7 +7634,7 @@ class MapULongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7699,18 +7699,18 @@ class MapULongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7725,7 +7725,7 @@ class MapULongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7790,18 +7790,18 @@ class MapULongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7816,7 +7816,7 @@ class MapULongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7881,18 +7881,18 @@ class MapKeyULongValueLongDoublePubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7907,7 +7907,7 @@ class MapKeyULongValueLongDoublePubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7972,18 +7972,18 @@ class MapULongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7998,7 +7998,7 @@ class MapULongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8063,18 +8063,18 @@ class MapULongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8089,7 +8089,7 @@ class MapULongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8154,18 +8154,18 @@ class MapULongCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8180,7 +8180,7 @@ class MapULongCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8245,18 +8245,18 @@ class MapULongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8271,7 +8271,7 @@ class MapULongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8336,18 +8336,18 @@ class MapULongStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8362,7 +8362,7 @@ class MapULongStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8427,18 +8427,18 @@ class MapULongWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8453,7 +8453,7 @@ class MapULongWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8518,18 +8518,18 @@ class MapULongInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8544,7 +8544,7 @@ class MapULongInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8609,18 +8609,18 @@ class MapULongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8635,7 +8635,7 @@ class MapULongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8700,18 +8700,18 @@ class MapULongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8726,7 +8726,7 @@ class MapULongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8791,18 +8791,18 @@ class MapULongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8817,7 +8817,7 @@ class MapULongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8882,18 +8882,18 @@ class MapULongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8908,7 +8908,7 @@ class MapULongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -8973,18 +8973,18 @@ class MapULongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -8999,7 +8999,7 @@ class MapULongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -9064,18 +9064,18 @@ class MapULongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -9090,7 +9090,7 @@ class MapULongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -9155,18 +9155,18 @@ class MapULongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -9181,7 +9181,7 @@ class MapULongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -9246,18 +9246,18 @@ class MapULongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -9272,7 +9272,7 @@ class MapULongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -9337,18 +9337,18 @@ class MapULongInnerStructureHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -9363,7 +9363,7 @@ class MapULongInnerStructureHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -9428,18 +9428,18 @@ class MapULongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -9454,7 +9454,7 @@ class MapULongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -9519,18 +9519,18 @@ class MapLongLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -9545,7 +9545,7 @@ class MapLongLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -9610,18 +9610,18 @@ class MapLongLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -9636,7 +9636,7 @@ class MapLongLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -9701,18 +9701,18 @@ class MapLongLongKeyLongValuePubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -9727,7 +9727,7 @@ class MapLongLongKeyLongValuePubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -9792,18 +9792,18 @@ class MapLongLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -9818,7 +9818,7 @@ class MapLongLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -9883,18 +9883,18 @@ class MapLongLongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -9909,7 +9909,7 @@ class MapLongLongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -9974,18 +9974,18 @@ class MapLongLongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -10000,7 +10000,7 @@ class MapLongLongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -10065,18 +10065,18 @@ class MapLongLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -10091,7 +10091,7 @@ class MapLongLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -10156,18 +10156,18 @@ class MapLongLongKeyDoubleValuePubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -10182,7 +10182,7 @@ class MapLongLongKeyDoubleValuePubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -10247,18 +10247,18 @@ class MapLongLongLongDoublePubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -10273,7 +10273,7 @@ class MapLongLongLongDoublePubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -10338,18 +10338,18 @@ class MapLongLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -10364,7 +10364,7 @@ class MapLongLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -10429,18 +10429,18 @@ class MapLongLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -10455,7 +10455,7 @@ class MapLongLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -10520,18 +10520,18 @@ class MapLongLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -10546,7 +10546,7 @@ class MapLongLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -10611,18 +10611,18 @@ class MapLongLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -10637,7 +10637,7 @@ class MapLongLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -10702,18 +10702,18 @@ class MapLongLongStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -10728,7 +10728,7 @@ class MapLongLongStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -10793,18 +10793,18 @@ class MapLongLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -10819,7 +10819,7 @@ class MapLongLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -10884,18 +10884,18 @@ class MapLongLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fast eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -10910,7 +10910,7 @@ class MapLongLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fast eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -10975,18 +10975,18 @@ class MapLongLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fas eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -11001,7 +11001,7 @@ class MapLongLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fas eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -11066,18 +11066,18 @@ class MapLongLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -11092,7 +11092,7 @@ class MapLongLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -11157,18 +11157,18 @@ class MapLongLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -11183,7 +11183,7 @@ class MapLongLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -11248,18 +11248,18 @@ class MapLongLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -11274,7 +11274,7 @@ class MapLongLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -11339,18 +11339,18 @@ class MapLongLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -11365,7 +11365,7 @@ class MapLongLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -11430,18 +11430,18 @@ class MapLongLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds:: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -11456,7 +11456,7 @@ class MapLongLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds:: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -11521,18 +11521,18 @@ class MapLongLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -11547,7 +11547,7 @@ class MapLongLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -11612,18 +11612,18 @@ class MapLongLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -11638,7 +11638,7 @@ class MapLongLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -11703,18 +11703,18 @@ class MapLongLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -11729,7 +11729,7 @@ class MapLongLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -11794,18 +11794,18 @@ class MapLongLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -11820,7 +11820,7 @@ class MapLongLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -11885,18 +11885,18 @@ class MapULongLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -11911,7 +11911,7 @@ class MapULongLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -11976,18 +11976,18 @@ class MapULongLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -12002,7 +12002,7 @@ class MapULongLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -12067,18 +12067,18 @@ class MapULongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -12093,7 +12093,7 @@ class MapULongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -12158,18 +12158,18 @@ class MapULongLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -12184,7 +12184,7 @@ class MapULongLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -12249,18 +12249,18 @@ class MapULongLongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -12275,7 +12275,7 @@ class MapULongLongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -12340,18 +12340,18 @@ class MapULongLongULongLongPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -12366,7 +12366,7 @@ class MapULongLongULongLongPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -12431,18 +12431,18 @@ class MapULongLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -12457,7 +12457,7 @@ class MapULongLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -12522,18 +12522,18 @@ class MapKeyULongLongValueDoublePubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -12548,7 +12548,7 @@ class MapKeyULongLongValueDoublePubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -12613,18 +12613,18 @@ class MapULongLongLongDoublePubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -12639,7 +12639,7 @@ class MapULongLongLongDoublePubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -12704,18 +12704,18 @@ class MapULongLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -12730,7 +12730,7 @@ class MapULongLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -12795,18 +12795,18 @@ class MapULongLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -12821,7 +12821,7 @@ class MapULongLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -12886,18 +12886,18 @@ class MapULongLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -12912,7 +12912,7 @@ class MapULongLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -12977,18 +12977,18 @@ class MapULongLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -13003,7 +13003,7 @@ class MapULongLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -13068,18 +13068,18 @@ class MapULongLongStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -13094,7 +13094,7 @@ class MapULongLongStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -13159,18 +13159,18 @@ class MapULongLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -13185,7 +13185,7 @@ class MapULongLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -13250,18 +13250,18 @@ class MapULongLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fas eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -13276,7 +13276,7 @@ class MapULongLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fas eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -13341,18 +13341,18 @@ class MapULongLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -13367,7 +13367,7 @@ class MapULongLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -13432,18 +13432,18 @@ class MapULongLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -13458,7 +13458,7 @@ class MapULongLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -13523,18 +13523,18 @@ class MapULongLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -13549,7 +13549,7 @@ class MapULongLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -13614,18 +13614,18 @@ class MapULongLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -13640,7 +13640,7 @@ class MapULongLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -13705,18 +13705,18 @@ class MapULongLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -13731,7 +13731,7 @@ class MapULongLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -13796,18 +13796,18 @@ class MapULongLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -13822,7 +13822,7 @@ class MapULongLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -13887,18 +13887,18 @@ class MapULongLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -13913,7 +13913,7 @@ class MapULongLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -13978,18 +13978,18 @@ class MapULongLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -14004,7 +14004,7 @@ class MapULongLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -14069,18 +14069,18 @@ class MapULongLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -14095,7 +14095,7 @@ class MapULongLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -14160,18 +14160,18 @@ class MapULongLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -14186,7 +14186,7 @@ class MapULongLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -14251,18 +14251,18 @@ class MapStringShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -14277,7 +14277,7 @@ class MapStringShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -14342,18 +14342,18 @@ class MapStringUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -14368,7 +14368,7 @@ class MapStringUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -14433,18 +14433,18 @@ class MapStringLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -14459,7 +14459,7 @@ class MapStringLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -14524,18 +14524,18 @@ class MapStringULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -14550,7 +14550,7 @@ class MapStringULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -14615,18 +14615,18 @@ class MapStringLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -14641,7 +14641,7 @@ class MapStringLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -14706,18 +14706,18 @@ class MapStringULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -14732,7 +14732,7 @@ class MapStringULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -14797,18 +14797,18 @@ class MapStringFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -14823,7 +14823,7 @@ class MapStringFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -14888,18 +14888,18 @@ class MapStringDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -14914,7 +14914,7 @@ class MapStringDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -14979,18 +14979,18 @@ class MapStringLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -15005,7 +15005,7 @@ class MapStringLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -15070,18 +15070,18 @@ class MapStringBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -15096,7 +15096,7 @@ class MapStringBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -15161,18 +15161,18 @@ class MapStringOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -15187,7 +15187,7 @@ class MapStringOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -15252,18 +15252,18 @@ class MapStringCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -15278,7 +15278,7 @@ class MapStringCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -15343,18 +15343,18 @@ class MapStringWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -15369,7 +15369,7 @@ class MapStringWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -15434,18 +15434,18 @@ class MapStringStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -15460,7 +15460,7 @@ class MapStringStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -15525,18 +15525,18 @@ class MapStringWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -15551,7 +15551,7 @@ class MapStringWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -15616,18 +15616,18 @@ class MapStringInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -15642,7 +15642,7 @@ class MapStringInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -15707,18 +15707,18 @@ class MapStringInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -15733,7 +15733,7 @@ class MapStringInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -15798,18 +15798,18 @@ class MapStringInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -15824,7 +15824,7 @@ class MapStringInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -15889,18 +15889,18 @@ class MapStringInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -15915,7 +15915,7 @@ class MapStringInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -15980,18 +15980,18 @@ class MapStringInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -16006,7 +16006,7 @@ class MapStringInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -16071,18 +16071,18 @@ class MapStringInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -16097,7 +16097,7 @@ class MapStringInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -16162,18 +16162,18 @@ class MapStringInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -16188,7 +16188,7 @@ class MapStringInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -16253,18 +16253,18 @@ class MapStringInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -16279,7 +16279,7 @@ class MapStringInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -16344,18 +16344,18 @@ class MapStringInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -16370,7 +16370,7 @@ class MapStringInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -16435,18 +16435,18 @@ class MapStringInnerStructureHelperPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -16461,7 +16461,7 @@ class MapStringInnerStructureHelperPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -16526,18 +16526,18 @@ class MapStringInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -16552,7 +16552,7 @@ class MapStringInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -16617,18 +16617,18 @@ class MapWStringShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -16643,7 +16643,7 @@ class MapWStringShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -16708,18 +16708,18 @@ class MapWStringUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -16734,7 +16734,7 @@ class MapWStringUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -16799,18 +16799,18 @@ class MapWStringLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -16825,7 +16825,7 @@ class MapWStringLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -16890,18 +16890,18 @@ class MapWStringULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -16916,7 +16916,7 @@ class MapWStringULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -16981,18 +16981,18 @@ class MapWStringLongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -17007,7 +17007,7 @@ class MapWStringLongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -17072,18 +17072,18 @@ class MapWStringULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -17098,7 +17098,7 @@ class MapWStringULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -17163,18 +17163,18 @@ class MapWStringFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -17189,7 +17189,7 @@ class MapWStringFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -17254,18 +17254,18 @@ class MapWStringDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -17280,7 +17280,7 @@ class MapWStringDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -17345,18 +17345,18 @@ class MapWStringLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -17371,7 +17371,7 @@ class MapWStringLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -17436,18 +17436,18 @@ class MapWStringBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -17462,7 +17462,7 @@ class MapWStringBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -17527,18 +17527,18 @@ class MapWStringOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -17553,7 +17553,7 @@ class MapWStringOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -17618,18 +17618,18 @@ class MapWStringCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -17644,7 +17644,7 @@ class MapWStringCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -17709,18 +17709,18 @@ class MapWStringWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -17735,7 +17735,7 @@ class MapWStringWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -17800,18 +17800,18 @@ class MapWStringStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -17826,7 +17826,7 @@ class MapWStringStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -17891,18 +17891,18 @@ class MapWStringWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -17917,7 +17917,7 @@ class MapWStringWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -17982,18 +17982,18 @@ class MapWStringInnerAliasBoundedStringHelperPubSubType : public eprosima::fastd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -18008,7 +18008,7 @@ class MapWStringInnerAliasBoundedStringHelperPubSubType : public eprosima::fastd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -18073,18 +18073,18 @@ class MapWStringInnerAliasBoundedWStringHelperPubSubType : public eprosima::fast eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -18099,7 +18099,7 @@ class MapWStringInnerAliasBoundedWStringHelperPubSubType : public eprosima::fast eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -18164,18 +18164,18 @@ class MapWStringInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -18190,7 +18190,7 @@ class MapWStringInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -18255,18 +18255,18 @@ class MapWStringInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -18281,7 +18281,7 @@ class MapWStringInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -18346,18 +18346,18 @@ class MapWStringInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -18372,7 +18372,7 @@ class MapWStringInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -18437,18 +18437,18 @@ class MapWStringInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -18463,7 +18463,7 @@ class MapWStringInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -18528,18 +18528,18 @@ class MapWStringInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::d eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -18554,7 +18554,7 @@ class MapWStringInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::d eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -18619,18 +18619,18 @@ class MapWStringInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -18645,7 +18645,7 @@ class MapWStringInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -18710,18 +18710,18 @@ class MapWStringInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -18736,7 +18736,7 @@ class MapWStringInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -18801,18 +18801,18 @@ class MapWStringInnerStructureHelperPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -18827,7 +18827,7 @@ class MapWStringInnerStructureHelperPubSubType : public eprosima::fastdds::dds:: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -18892,18 +18892,18 @@ class MapWStringInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -18918,7 +18918,7 @@ class MapWStringInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -18983,18 +18983,18 @@ class MapInnerAliasBoundedStringHelperShortPubSubType : public eprosima::fastdds eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -19009,7 +19009,7 @@ class MapInnerAliasBoundedStringHelperShortPubSubType : public eprosima::fastdds eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -19074,18 +19074,18 @@ class MapInnerAliasBoundedStringHelperUShortPubSubType : public eprosima::fastdd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -19100,7 +19100,7 @@ class MapInnerAliasBoundedStringHelperUShortPubSubType : public eprosima::fastdd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -19165,18 +19165,18 @@ class MapInnerAliasBoundedStringHelperLongPubSubType : public eprosima::fastdds: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -19191,7 +19191,7 @@ class MapInnerAliasBoundedStringHelperLongPubSubType : public eprosima::fastdds: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -19256,18 +19256,18 @@ class MapInnerAliasBoundedStringHelperULongPubSubType : public eprosima::fastdds eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -19282,7 +19282,7 @@ class MapInnerAliasBoundedStringHelperULongPubSubType : public eprosima::fastdds eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -19347,18 +19347,18 @@ class MapInnerAliasBoundedStringHelperLongLongPubSubType : public eprosima::fast eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -19373,7 +19373,7 @@ class MapInnerAliasBoundedStringHelperLongLongPubSubType : public eprosima::fast eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -19438,18 +19438,18 @@ class MapInnerAliasBoundedStringHelperULongLongPubSubType : public eprosima::fas eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -19464,7 +19464,7 @@ class MapInnerAliasBoundedStringHelperULongLongPubSubType : public eprosima::fas eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -19529,18 +19529,18 @@ class MapInnerAliasBoundedStringHelperFloatPubSubType : public eprosima::fastdds eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -19555,7 +19555,7 @@ class MapInnerAliasBoundedStringHelperFloatPubSubType : public eprosima::fastdds eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -19620,18 +19620,18 @@ class MapInnerAliasBoundedStringHelperDoublePubSubType : public eprosima::fastdd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -19646,7 +19646,7 @@ class MapInnerAliasBoundedStringHelperDoublePubSubType : public eprosima::fastdd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -19711,18 +19711,18 @@ class MapInnerAliasBoundedStringHelperLongDoublePubSubType : public eprosima::fa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -19737,7 +19737,7 @@ class MapInnerAliasBoundedStringHelperLongDoublePubSubType : public eprosima::fa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -19802,18 +19802,18 @@ class MapInnerAliasBoundedStringHelperBooleanPubSubType : public eprosima::fastd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -19828,7 +19828,7 @@ class MapInnerAliasBoundedStringHelperBooleanPubSubType : public eprosima::fastd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -19893,18 +19893,18 @@ class MapInnerAliasBoundedStringHelperOctetPubSubType : public eprosima::fastdds eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -19919,7 +19919,7 @@ class MapInnerAliasBoundedStringHelperOctetPubSubType : public eprosima::fastdds eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -19984,18 +19984,18 @@ class MapInnerAliasBoundedStringHelperCharPubSubType : public eprosima::fastdds: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -20010,7 +20010,7 @@ class MapInnerAliasBoundedStringHelperCharPubSubType : public eprosima::fastdds: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -20075,18 +20075,18 @@ class MapInnerAliasBoundedStringHelperWCharPubSubType : public eprosima::fastdds eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -20101,7 +20101,7 @@ class MapInnerAliasBoundedStringHelperWCharPubSubType : public eprosima::fastdds eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -20166,18 +20166,18 @@ class MapInnerAliasBoundedStringHelperStringPubSubType : public eprosima::fastdd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -20192,7 +20192,7 @@ class MapInnerAliasBoundedStringHelperStringPubSubType : public eprosima::fastdd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -20257,18 +20257,18 @@ class MapInnerAliasBoundedStringHelperWStringPubSubType : public eprosima::fastd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -20283,7 +20283,7 @@ class MapInnerAliasBoundedStringHelperWStringPubSubType : public eprosima::fastd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -20348,18 +20348,18 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType : eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -20374,7 +20374,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType : eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -20439,18 +20439,18 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType : eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -20465,7 +20465,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType : eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -20530,18 +20530,18 @@ class MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType : public eprosim eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -20556,7 +20556,7 @@ class MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType : public eprosim eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -20621,18 +20621,18 @@ class MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType : public epro eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -20647,7 +20647,7 @@ class MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType : public epro eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -20712,18 +20712,18 @@ class MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType : public eprosi eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -20738,7 +20738,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType : public eprosi eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -20803,18 +20803,18 @@ class MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType : public e eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -20829,7 +20829,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType : public e eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -20894,18 +20894,18 @@ class MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType : publi eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -20920,7 +20920,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType : publi eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -20985,18 +20985,18 @@ class MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType : public epr eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -21011,7 +21011,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType : public epr eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -21076,18 +21076,18 @@ class MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType : public eprosi eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -21102,7 +21102,7 @@ class MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType : public eprosi eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -21167,18 +21167,18 @@ class MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType : public ep eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -21193,7 +21193,7 @@ class MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType : public ep eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -21258,18 +21258,18 @@ class MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType : public epros eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -21284,7 +21284,7 @@ class MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType : public epros eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -21349,18 +21349,18 @@ class MapInnerAliasBoundedWStringHelperShortPubSubType : public eprosima::fastdd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -21375,7 +21375,7 @@ class MapInnerAliasBoundedWStringHelperShortPubSubType : public eprosima::fastdd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -21440,18 +21440,18 @@ class MapInnerAliasBoundedWStringHelperUShortPubSubType : public eprosima::fastd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -21466,7 +21466,7 @@ class MapInnerAliasBoundedWStringHelperUShortPubSubType : public eprosima::fastd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -21531,18 +21531,18 @@ class MapInnerAliasBoundedWStringHelperLongPubSubType : public eprosima::fastdds eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -21557,7 +21557,7 @@ class MapInnerAliasBoundedWStringHelperLongPubSubType : public eprosima::fastdds eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -21622,18 +21622,18 @@ class MapInnerAliasBoundedWStringHelperULongPubSubType : public eprosima::fastdd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -21648,7 +21648,7 @@ class MapInnerAliasBoundedWStringHelperULongPubSubType : public eprosima::fastdd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -21713,18 +21713,18 @@ class MapInnerAliasBoundedWStringHelperLongLongPubSubType : public eprosima::fas eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -21739,7 +21739,7 @@ class MapInnerAliasBoundedWStringHelperLongLongPubSubType : public eprosima::fas eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -21804,18 +21804,18 @@ class MapInnerAliasBoundedWStringHelperULongLongPubSubType : public eprosima::fa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -21830,7 +21830,7 @@ class MapInnerAliasBoundedWStringHelperULongLongPubSubType : public eprosima::fa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -21895,18 +21895,18 @@ class MapInnerAliasBoundedWStringHelperFloatPubSubType : public eprosima::fastdd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -21921,7 +21921,7 @@ class MapInnerAliasBoundedWStringHelperFloatPubSubType : public eprosima::fastdd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -21986,18 +21986,18 @@ class MapInnerAliasBoundedWStringHelperDoublePubSubType : public eprosima::fastd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -22012,7 +22012,7 @@ class MapInnerAliasBoundedWStringHelperDoublePubSubType : public eprosima::fastd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -22077,18 +22077,18 @@ class MapInnerAliasBoundedWStringHelperLongDoublePubSubType : public eprosima::f eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -22103,7 +22103,7 @@ class MapInnerAliasBoundedWStringHelperLongDoublePubSubType : public eprosima::f eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -22168,18 +22168,18 @@ class MapInnerAliasBoundedWStringHelperBooleanPubSubType : public eprosima::fast eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -22194,7 +22194,7 @@ class MapInnerAliasBoundedWStringHelperBooleanPubSubType : public eprosima::fast eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -22259,18 +22259,18 @@ class MapInnerAliasBoundedWStringHelperOctetPubSubType : public eprosima::fastdd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -22285,7 +22285,7 @@ class MapInnerAliasBoundedWStringHelperOctetPubSubType : public eprosima::fastdd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -22350,18 +22350,18 @@ class MapInnerAliasBoundedWStringHelperCharPubSubType : public eprosima::fastdds eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -22376,7 +22376,7 @@ class MapInnerAliasBoundedWStringHelperCharPubSubType : public eprosima::fastdds eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -22441,18 +22441,18 @@ class MapInnerAliasBoundedWStringHelperWCharPubSubType : public eprosima::fastdd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -22467,7 +22467,7 @@ class MapInnerAliasBoundedWStringHelperWCharPubSubType : public eprosima::fastdd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -22532,18 +22532,18 @@ class MapInnerAliasBoundedWStringHelperStringPubSubType : public eprosima::fastd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -22558,7 +22558,7 @@ class MapInnerAliasBoundedWStringHelperStringPubSubType : public eprosima::fastd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -22623,18 +22623,18 @@ class MapInnerAliasBoundedWStringHelperWStringPubSubType : public eprosima::fast eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -22649,7 +22649,7 @@ class MapInnerAliasBoundedWStringHelperWStringPubSubType : public eprosima::fast eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -22714,18 +22714,18 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType : eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -22740,7 +22740,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType : eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -22805,18 +22805,18 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -22831,7 +22831,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -22896,18 +22896,18 @@ class MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType : public eprosi eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -22922,7 +22922,7 @@ class MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType : public eprosi eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -22987,18 +22987,18 @@ class MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType : public epr eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -23013,7 +23013,7 @@ class MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType : public epr eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -23078,18 +23078,18 @@ class MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType : public epros eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -23104,7 +23104,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType : public epros eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -23169,18 +23169,18 @@ class MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType : public eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -23195,7 +23195,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType : public eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -23260,18 +23260,18 @@ class MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType : publ eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -23286,7 +23286,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType : publ eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -23351,18 +23351,18 @@ class MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType : public ep eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -23377,7 +23377,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType : public ep eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -23442,18 +23442,18 @@ class MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType : public epros eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -23468,7 +23468,7 @@ class MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType : public epros eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -23533,18 +23533,18 @@ class MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType : public e eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -23559,7 +23559,7 @@ class MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType : public e eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -23624,18 +23624,18 @@ class MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType : public epro eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -23650,7 +23650,7 @@ class MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType : public epro eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -23715,18 +23715,18 @@ class BoundedSmallMapPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -23741,7 +23741,7 @@ class BoundedSmallMapPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -23806,18 +23806,18 @@ class BoundedLargeMapPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -23832,7 +23832,7 @@ class BoundedLargeMapPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/dds-types-test/member_idPubSubTypes.cxx b/test/dds-types-test/member_idPubSubTypes.cxx index 32379122784..65d94681f9f 100644 --- a/test/dds-types-test/member_idPubSubTypes.cxx +++ b/test/dds-types-test/member_idPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "member_idCdrAux.hpp" #include "member_idTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; FixIdPubSubType::FixIdPubSubType() diff --git a/test/dds-types-test/member_idPubSubTypes.h b/test/dds-types-test/member_idPubSubTypes.h index 5df18b22d0d..c1adf588f81 100644 --- a/test/dds-types-test/member_idPubSubTypes.h +++ b/test/dds-types-test/member_idPubSubTypes.h @@ -54,18 +54,18 @@ class FixIdPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -80,7 +80,7 @@ class FixIdPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -145,18 +145,18 @@ class FixHexIdPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -171,7 +171,7 @@ class FixHexIdPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -236,18 +236,18 @@ class FixHashidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -262,7 +262,7 @@ class FixHashidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -327,18 +327,18 @@ class FixHashidPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -353,7 +353,7 @@ class FixHashidPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -418,18 +418,18 @@ class FixMixPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -444,7 +444,7 @@ class FixMixPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -509,18 +509,18 @@ class AutoidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -535,7 +535,7 @@ class AutoidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -600,18 +600,18 @@ class AutoidSequentialPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -626,7 +626,7 @@ class AutoidSequentialPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -691,18 +691,18 @@ class AutoidHashPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -717,7 +717,7 @@ class AutoidHashPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -782,18 +782,18 @@ class DerivedAutoidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -808,7 +808,7 @@ class DerivedAutoidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -873,18 +873,18 @@ class DerivedEmptyAutoidSequentialPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -899,7 +899,7 @@ class DerivedEmptyAutoidSequentialPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -964,18 +964,18 @@ class DerivedAutoidSequentialPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -990,7 +990,7 @@ class DerivedAutoidSequentialPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1055,18 +1055,18 @@ class DerivedAutoidHashPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1081,7 +1081,7 @@ class DerivedAutoidHashPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/dds-types-test/mutablePubSubTypes.cxx b/test/dds-types-test/mutablePubSubTypes.cxx index 28855de83b9..106c2b19cff 100644 --- a/test/dds-types-test/mutablePubSubTypes.cxx +++ b/test/dds-types-test/mutablePubSubTypes.cxx @@ -27,8 +27,8 @@ #include "mutableCdrAux.hpp" #include "mutableTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; MutableShortStructPubSubType::MutableShortStructPubSubType() diff --git a/test/dds-types-test/mutablePubSubTypes.h b/test/dds-types-test/mutablePubSubTypes.h index 70760bd0566..ebb3378b767 100644 --- a/test/dds-types-test/mutablePubSubTypes.h +++ b/test/dds-types-test/mutablePubSubTypes.h @@ -55,18 +55,18 @@ class MutableShortStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -81,7 +81,7 @@ class MutableShortStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -146,18 +146,18 @@ class MutableUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -172,7 +172,7 @@ class MutableUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -237,18 +237,18 @@ class MutableLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -263,7 +263,7 @@ class MutableLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -328,18 +328,18 @@ class MutableULongStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -354,7 +354,7 @@ class MutableULongStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -419,18 +419,18 @@ class MutableLongLongStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -445,7 +445,7 @@ class MutableLongLongStructPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -510,18 +510,18 @@ class MutableULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -536,7 +536,7 @@ class MutableULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -601,18 +601,18 @@ class MutableFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -627,7 +627,7 @@ class MutableFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -692,18 +692,18 @@ class MutableDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -718,7 +718,7 @@ class MutableDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -783,18 +783,18 @@ class MutableLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -809,7 +809,7 @@ class MutableLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -874,18 +874,18 @@ class MutableBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -900,7 +900,7 @@ class MutableBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -965,18 +965,18 @@ class MutableOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -991,7 +991,7 @@ class MutableOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1056,18 +1056,18 @@ class MutableCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1082,7 +1082,7 @@ class MutableCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1147,18 +1147,18 @@ class MutableWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1173,7 +1173,7 @@ class MutableWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1238,18 +1238,18 @@ class MutableUnionStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1264,7 +1264,7 @@ class MutableUnionStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1329,18 +1329,18 @@ class MutableEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1355,7 +1355,7 @@ class MutableEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1420,18 +1420,18 @@ class MutableEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1446,7 +1446,7 @@ class MutableEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1511,18 +1511,18 @@ class MutableInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1537,7 +1537,7 @@ class MutableInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1602,18 +1602,18 @@ class MutableInheritanceEmptyStructPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1628,7 +1628,7 @@ class MutableInheritanceEmptyStructPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1693,18 +1693,18 @@ class MutableExtensibilityInheritancePubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1719,7 +1719,7 @@ class MutableExtensibilityInheritancePubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/dds-types-test/optionalPubSubTypes.cxx b/test/dds-types-test/optionalPubSubTypes.cxx index 9bcb5fc0e55..82807b5c792 100644 --- a/test/dds-types-test/optionalPubSubTypes.cxx +++ b/test/dds-types-test/optionalPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "optionalCdrAux.hpp" #include "optionalTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; short_optionalPubSubType::short_optionalPubSubType() diff --git a/test/dds-types-test/optionalPubSubTypes.h b/test/dds-types-test/optionalPubSubTypes.h index 543dc9c8506..0bf193f7e21 100644 --- a/test/dds-types-test/optionalPubSubTypes.h +++ b/test/dds-types-test/optionalPubSubTypes.h @@ -55,18 +55,18 @@ class short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -81,7 +81,7 @@ class short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -146,18 +146,18 @@ class ushort_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -172,7 +172,7 @@ class ushort_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -237,18 +237,18 @@ class long_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -263,7 +263,7 @@ class long_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -328,18 +328,18 @@ class ulong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -354,7 +354,7 @@ class ulong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -419,18 +419,18 @@ class longlong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -445,7 +445,7 @@ class longlong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -510,18 +510,18 @@ class ulonglong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -536,7 +536,7 @@ class ulonglong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -601,18 +601,18 @@ class float_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -627,7 +627,7 @@ class float_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -692,18 +692,18 @@ class double_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -718,7 +718,7 @@ class double_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -783,18 +783,18 @@ class longdouble_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -809,7 +809,7 @@ class longdouble_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -874,18 +874,18 @@ class boolean_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -900,7 +900,7 @@ class boolean_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -965,18 +965,18 @@ class octet_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -991,7 +991,7 @@ class octet_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1056,18 +1056,18 @@ class char_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1082,7 +1082,7 @@ class char_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1147,18 +1147,18 @@ class wchar_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1173,7 +1173,7 @@ class wchar_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1238,18 +1238,18 @@ class short_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1264,7 +1264,7 @@ class short_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1329,18 +1329,18 @@ class short_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1355,7 +1355,7 @@ class short_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1420,18 +1420,18 @@ class short_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1446,7 +1446,7 @@ class short_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1511,18 +1511,18 @@ class ushort_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1537,7 +1537,7 @@ class ushort_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1602,18 +1602,18 @@ class ushort_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1628,7 +1628,7 @@ class ushort_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1693,18 +1693,18 @@ class ushort_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1719,7 +1719,7 @@ class ushort_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1784,18 +1784,18 @@ class long_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1810,7 +1810,7 @@ class long_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1875,18 +1875,18 @@ class long_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1901,7 +1901,7 @@ class long_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1966,18 +1966,18 @@ class long_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1992,7 +1992,7 @@ class long_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2057,18 +2057,18 @@ class ulong_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2083,7 +2083,7 @@ class ulong_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2148,18 +2148,18 @@ class ulong_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2174,7 +2174,7 @@ class ulong_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2239,18 +2239,18 @@ class ulong_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2265,7 +2265,7 @@ class ulong_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2330,18 +2330,18 @@ class longlong_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2356,7 +2356,7 @@ class longlong_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2421,18 +2421,18 @@ class longlong_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2447,7 +2447,7 @@ class longlong_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2512,18 +2512,18 @@ class longlong_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2538,7 +2538,7 @@ class longlong_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2603,18 +2603,18 @@ class ulonglong_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2629,7 +2629,7 @@ class ulonglong_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2694,18 +2694,18 @@ class ulonglong_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2720,7 +2720,7 @@ class ulonglong_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2785,18 +2785,18 @@ class ulonglong_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2811,7 +2811,7 @@ class ulonglong_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2876,18 +2876,18 @@ class float_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2902,7 +2902,7 @@ class float_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2967,18 +2967,18 @@ class float_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2993,7 +2993,7 @@ class float_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3058,18 +3058,18 @@ class float_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3084,7 +3084,7 @@ class float_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3149,18 +3149,18 @@ class double_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3175,7 +3175,7 @@ class double_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3240,18 +3240,18 @@ class double_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3266,7 +3266,7 @@ class double_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3331,18 +3331,18 @@ class double_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3357,7 +3357,7 @@ class double_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3422,18 +3422,18 @@ class longdouble_align_1_optionalPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3448,7 +3448,7 @@ class longdouble_align_1_optionalPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3513,18 +3513,18 @@ class longdouble_align_2_optionalPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3539,7 +3539,7 @@ class longdouble_align_2_optionalPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3604,18 +3604,18 @@ class longdouble_align_4_optionalPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3630,7 +3630,7 @@ class longdouble_align_4_optionalPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3695,18 +3695,18 @@ class boolean_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3721,7 +3721,7 @@ class boolean_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3786,18 +3786,18 @@ class boolean_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3812,7 +3812,7 @@ class boolean_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3877,18 +3877,18 @@ class boolean_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3903,7 +3903,7 @@ class boolean_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3968,18 +3968,18 @@ class octet_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3994,7 +3994,7 @@ class octet_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4059,18 +4059,18 @@ class octet_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4085,7 +4085,7 @@ class octet_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4150,18 +4150,18 @@ class octet_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4176,7 +4176,7 @@ class octet_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4241,18 +4241,18 @@ class char_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4267,7 +4267,7 @@ class char_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4332,18 +4332,18 @@ class char_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4358,7 +4358,7 @@ class char_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4423,18 +4423,18 @@ class char_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4449,7 +4449,7 @@ class char_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4514,18 +4514,18 @@ class wchar_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4540,7 +4540,7 @@ class wchar_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4605,18 +4605,18 @@ class wchar_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4631,7 +4631,7 @@ class wchar_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4696,18 +4696,18 @@ class wchar_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4722,7 +4722,7 @@ class wchar_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4787,18 +4787,18 @@ class sequence_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4813,7 +4813,7 @@ class sequence_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4878,18 +4878,18 @@ class sequence_short_align_1_optionalPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4904,7 +4904,7 @@ class sequence_short_align_1_optionalPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -4969,18 +4969,18 @@ class sequence_short_align_2_optionalPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -4995,7 +4995,7 @@ class sequence_short_align_2_optionalPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5060,18 +5060,18 @@ class sequence_short_align_4_optionalPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5086,7 +5086,7 @@ class sequence_short_align_4_optionalPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5151,18 +5151,18 @@ class string_unbounded_optionalPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5177,7 +5177,7 @@ class string_unbounded_optionalPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5242,18 +5242,18 @@ class string_unbounded_align_1_optionalPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5268,7 +5268,7 @@ class string_unbounded_align_1_optionalPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5333,18 +5333,18 @@ class string_unbounded_align_2_optionalPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5359,7 +5359,7 @@ class string_unbounded_align_2_optionalPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5424,18 +5424,18 @@ class string_unbounded_align_4_optionalPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5450,7 +5450,7 @@ class string_unbounded_align_4_optionalPubSubType : public eprosima::fastdds::dd eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5515,18 +5515,18 @@ class string_bounded_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5541,7 +5541,7 @@ class string_bounded_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5606,18 +5606,18 @@ class string_bounded_align_1_optionalPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5632,7 +5632,7 @@ class string_bounded_align_1_optionalPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5697,18 +5697,18 @@ class string_bounded_align_2_optionalPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5723,7 +5723,7 @@ class string_bounded_align_2_optionalPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5788,18 +5788,18 @@ class string_bounded_align_4_optionalPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5814,7 +5814,7 @@ class string_bounded_align_4_optionalPubSubType : public eprosima::fastdds::dds: eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5879,18 +5879,18 @@ class map_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5905,7 +5905,7 @@ class map_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -5970,18 +5970,18 @@ class map_short_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -5996,7 +5996,7 @@ class map_short_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6061,18 +6061,18 @@ class map_short_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6087,7 +6087,7 @@ class map_short_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6152,18 +6152,18 @@ class map_short_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6178,7 +6178,7 @@ class map_short_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6243,18 +6243,18 @@ class array_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6269,7 +6269,7 @@ class array_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6334,18 +6334,18 @@ class array_short_align_1_optionalPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6360,7 +6360,7 @@ class array_short_align_1_optionalPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6425,18 +6425,18 @@ class array_short_align_2_optionalPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6451,7 +6451,7 @@ class array_short_align_2_optionalPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6516,18 +6516,18 @@ class array_short_align_4_optionalPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6542,7 +6542,7 @@ class array_short_align_4_optionalPubSubType : public eprosima::fastdds::dds::To eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6607,18 +6607,18 @@ class struct_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6633,7 +6633,7 @@ class struct_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6698,18 +6698,18 @@ class struct_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6724,7 +6724,7 @@ class struct_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6789,18 +6789,18 @@ class struct_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6815,7 +6815,7 @@ class struct_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6880,18 +6880,18 @@ class struct_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6906,7 +6906,7 @@ class struct_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -6971,18 +6971,18 @@ class InnerStructOptionalPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -6997,7 +6997,7 @@ class InnerStructOptionalPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7062,18 +7062,18 @@ class opt_struct_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7088,7 +7088,7 @@ class opt_struct_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7153,18 +7153,18 @@ class opt_struct_align_1_optionalPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7179,7 +7179,7 @@ class opt_struct_align_1_optionalPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7244,18 +7244,18 @@ class opt_struct_align_2_optionalPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7270,7 +7270,7 @@ class opt_struct_align_2_optionalPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -7335,18 +7335,18 @@ class opt_struct_align_4_optionalPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -7361,7 +7361,7 @@ class opt_struct_align_4_optionalPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/dds-types-test/primitivesPubSubTypes.cxx b/test/dds-types-test/primitivesPubSubTypes.cxx index 614a8862136..da020beca81 100644 --- a/test/dds-types-test/primitivesPubSubTypes.cxx +++ b/test/dds-types-test/primitivesPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "primitivesCdrAux.hpp" #include "primitivesTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; ShortStructPubSubType::ShortStructPubSubType() diff --git a/test/dds-types-test/primitivesPubSubTypes.h b/test/dds-types-test/primitivesPubSubTypes.h index 8f2432454f7..2974a3e9b0b 100644 --- a/test/dds-types-test/primitivesPubSubTypes.h +++ b/test/dds-types-test/primitivesPubSubTypes.h @@ -54,18 +54,18 @@ class ShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -80,7 +80,7 @@ class ShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -145,18 +145,18 @@ class UShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -171,7 +171,7 @@ class UShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -236,18 +236,18 @@ class LongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -262,7 +262,7 @@ class LongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -327,18 +327,18 @@ class ULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -353,7 +353,7 @@ class ULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -418,18 +418,18 @@ class LongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -444,7 +444,7 @@ class LongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -509,18 +509,18 @@ class ULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -535,7 +535,7 @@ class ULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -600,18 +600,18 @@ class FloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -626,7 +626,7 @@ class FloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -691,18 +691,18 @@ class DoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -717,7 +717,7 @@ class DoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -782,18 +782,18 @@ class LongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -808,7 +808,7 @@ class LongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -873,18 +873,18 @@ class BooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -899,7 +899,7 @@ class BooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -964,18 +964,18 @@ class OctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -990,7 +990,7 @@ class OctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1055,18 +1055,18 @@ class CharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1081,7 +1081,7 @@ class CharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1146,18 +1146,18 @@ class WCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1172,7 +1172,7 @@ class WCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1237,18 +1237,18 @@ class Int8StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1263,7 +1263,7 @@ class Int8StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1328,18 +1328,18 @@ class Uint8StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1354,7 +1354,7 @@ class Uint8StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1419,18 +1419,18 @@ class Int16StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1445,7 +1445,7 @@ class Int16StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1510,18 +1510,18 @@ class Uint16StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1536,7 +1536,7 @@ class Uint16StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1601,18 +1601,18 @@ class Int32StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1627,7 +1627,7 @@ class Int32StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1692,18 +1692,18 @@ class Uint32StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1718,7 +1718,7 @@ class Uint32StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1783,18 +1783,18 @@ class Int64StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1809,7 +1809,7 @@ class Int64StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1874,18 +1874,18 @@ class Uint64StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1900,7 +1900,7 @@ class Uint64StructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/dds-types-test/relative_path_includePubSubTypes.cxx b/test/dds-types-test/relative_path_includePubSubTypes.cxx index a2a35d9b8b1..6e3b54c39c8 100644 --- a/test/dds-types-test/relative_path_includePubSubTypes.cxx +++ b/test/dds-types-test/relative_path_includePubSubTypes.cxx @@ -27,8 +27,8 @@ #include "relative_path_includeCdrAux.hpp" #include "relative_path_includeTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; RelativePathIncludeStructPubSubType::RelativePathIncludeStructPubSubType() diff --git a/test/dds-types-test/relative_path_includePubSubTypes.h b/test/dds-types-test/relative_path_includePubSubTypes.h index 9940b3e5bc4..d2a84363e83 100644 --- a/test/dds-types-test/relative_path_includePubSubTypes.h +++ b/test/dds-types-test/relative_path_includePubSubTypes.h @@ -55,18 +55,18 @@ class RelativePathIncludeStructPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -81,7 +81,7 @@ class RelativePathIncludeStructPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/dds-types-test/sequencesPubSubTypes.cxx b/test/dds-types-test/sequencesPubSubTypes.cxx index a2123645d63..b1d33af42d7 100644 --- a/test/dds-types-test/sequencesPubSubTypes.cxx +++ b/test/dds-types-test/sequencesPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "sequencesCdrAux.hpp" #include "sequencesTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; SequenceShortPubSubType::SequenceShortPubSubType() diff --git a/test/dds-types-test/sequencesPubSubTypes.h b/test/dds-types-test/sequencesPubSubTypes.h index 237a5306a69..c6ad68da852 100644 --- a/test/dds-types-test/sequencesPubSubTypes.h +++ b/test/dds-types-test/sequencesPubSubTypes.h @@ -55,18 +55,18 @@ class SequenceShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -81,7 +81,7 @@ class SequenceShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -146,18 +146,18 @@ class SequenceUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -172,7 +172,7 @@ class SequenceUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -237,18 +237,18 @@ class SequenceLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -263,7 +263,7 @@ class SequenceLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -328,18 +328,18 @@ class SequenceULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -354,7 +354,7 @@ class SequenceULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -419,18 +419,18 @@ class SequenceLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -445,7 +445,7 @@ class SequenceLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -510,18 +510,18 @@ class SequenceULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -536,7 +536,7 @@ class SequenceULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -601,18 +601,18 @@ class SequenceFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -627,7 +627,7 @@ class SequenceFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -692,18 +692,18 @@ class SequenceDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -718,7 +718,7 @@ class SequenceDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -783,18 +783,18 @@ class SequenceLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -809,7 +809,7 @@ class SequenceLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -874,18 +874,18 @@ class SequenceBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -900,7 +900,7 @@ class SequenceBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -965,18 +965,18 @@ class SequenceOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -991,7 +991,7 @@ class SequenceOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1056,18 +1056,18 @@ class SequenceCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1082,7 +1082,7 @@ class SequenceCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1147,18 +1147,18 @@ class SequenceWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1173,7 +1173,7 @@ class SequenceWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1238,18 +1238,18 @@ class SequenceStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1264,7 +1264,7 @@ class SequenceStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1329,18 +1329,18 @@ class SequenceWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1355,7 +1355,7 @@ class SequenceWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1420,18 +1420,18 @@ class SequenceStringBoundedPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1446,7 +1446,7 @@ class SequenceStringBoundedPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1511,18 +1511,18 @@ class SequenceWStringBoundedPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1537,7 +1537,7 @@ class SequenceWStringBoundedPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1602,18 +1602,18 @@ class SequenceEnumPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1628,7 +1628,7 @@ class SequenceEnumPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1693,18 +1693,18 @@ class SequenceBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1719,7 +1719,7 @@ class SequenceBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1784,18 +1784,18 @@ class SequenceAliasPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1810,7 +1810,7 @@ class SequenceAliasPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1875,18 +1875,18 @@ class SequenceShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1901,7 +1901,7 @@ class SequenceShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1966,18 +1966,18 @@ class SequenceSequencePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1992,7 +1992,7 @@ class SequenceSequencePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2057,18 +2057,18 @@ class SequenceMapPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2083,7 +2083,7 @@ class SequenceMapPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2148,18 +2148,18 @@ class SequenceUnionPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2174,7 +2174,7 @@ class SequenceUnionPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2239,18 +2239,18 @@ class SequenceStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2265,7 +2265,7 @@ class SequenceStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2330,18 +2330,18 @@ class SequenceBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2356,7 +2356,7 @@ class SequenceBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2421,18 +2421,18 @@ class BoundedSmallSequencesPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2447,7 +2447,7 @@ class BoundedSmallSequencesPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2512,18 +2512,18 @@ class BoundedBigSequencesPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2538,7 +2538,7 @@ class BoundedBigSequencesPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/dds-types-test/stringsPubSubTypes.cxx b/test/dds-types-test/stringsPubSubTypes.cxx index 627f5914967..3f5c2923329 100644 --- a/test/dds-types-test/stringsPubSubTypes.cxx +++ b/test/dds-types-test/stringsPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "stringsCdrAux.hpp" #include "stringsTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; StringStructPubSubType::StringStructPubSubType() diff --git a/test/dds-types-test/stringsPubSubTypes.h b/test/dds-types-test/stringsPubSubTypes.h index cc1df4c4dbe..570f22a4f69 100644 --- a/test/dds-types-test/stringsPubSubTypes.h +++ b/test/dds-types-test/stringsPubSubTypes.h @@ -54,18 +54,18 @@ class StringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -80,7 +80,7 @@ class StringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -145,18 +145,18 @@ class WStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -171,7 +171,7 @@ class WStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -236,18 +236,18 @@ class SmallStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -262,7 +262,7 @@ class SmallStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -327,18 +327,18 @@ class SmallWStringStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -353,7 +353,7 @@ class SmallWStringStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -418,18 +418,18 @@ class LargeStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -444,7 +444,7 @@ class LargeStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -509,18 +509,18 @@ class LargeWStringStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -535,7 +535,7 @@ class LargeWStringStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/dds-types-test/structuresPubSubTypes.cxx b/test/dds-types-test/structuresPubSubTypes.cxx index 23e5dcf1f01..1ff9e56bf55 100644 --- a/test/dds-types-test/structuresPubSubTypes.cxx +++ b/test/dds-types-test/structuresPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "structuresCdrAux.hpp" #include "structuresTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; StructShortPubSubType::StructShortPubSubType() diff --git a/test/dds-types-test/structuresPubSubTypes.h b/test/dds-types-test/structuresPubSubTypes.h index 9567e99cf91..41c743d817b 100644 --- a/test/dds-types-test/structuresPubSubTypes.h +++ b/test/dds-types-test/structuresPubSubTypes.h @@ -55,18 +55,18 @@ class StructShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -81,7 +81,7 @@ class StructShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -146,18 +146,18 @@ class StructUnsignedShortPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -172,7 +172,7 @@ class StructUnsignedShortPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -237,18 +237,18 @@ class StructLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -263,7 +263,7 @@ class StructLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -328,18 +328,18 @@ class StructUnsignedLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -354,7 +354,7 @@ class StructUnsignedLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -419,18 +419,18 @@ class StructLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -445,7 +445,7 @@ class StructLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -510,18 +510,18 @@ class StructUnsignedLongLongPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -536,7 +536,7 @@ class StructUnsignedLongLongPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -601,18 +601,18 @@ class StructFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -627,7 +627,7 @@ class StructFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -692,18 +692,18 @@ class StructDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -718,7 +718,7 @@ class StructDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -783,18 +783,18 @@ class StructLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -809,7 +809,7 @@ class StructLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -874,18 +874,18 @@ class StructBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -900,7 +900,7 @@ class StructBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -965,18 +965,18 @@ class StructOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -991,7 +991,7 @@ class StructOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1056,18 +1056,18 @@ class StructChar8PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1082,7 +1082,7 @@ class StructChar8PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1147,18 +1147,18 @@ class StructChar16PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1173,7 +1173,7 @@ class StructChar16PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1238,18 +1238,18 @@ class StructStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1264,7 +1264,7 @@ class StructStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1329,18 +1329,18 @@ class StructWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1355,7 +1355,7 @@ class StructWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1420,18 +1420,18 @@ class StructBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1446,7 +1446,7 @@ class StructBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1511,18 +1511,18 @@ class StructBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1537,7 +1537,7 @@ class StructBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1602,18 +1602,18 @@ class StructEnumPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1628,7 +1628,7 @@ class StructEnumPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1693,18 +1693,18 @@ class StructBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1719,7 +1719,7 @@ class StructBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1784,18 +1784,18 @@ class StructAliasPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1810,7 +1810,7 @@ class StructAliasPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1875,18 +1875,18 @@ class StructShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1901,7 +1901,7 @@ class StructShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1966,18 +1966,18 @@ class StructSequencePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1992,7 +1992,7 @@ class StructSequencePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2057,18 +2057,18 @@ class StructMapPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2083,7 +2083,7 @@ class StructMapPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2148,18 +2148,18 @@ class StructUnionPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2174,7 +2174,7 @@ class StructUnionPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2239,18 +2239,18 @@ class StructStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2265,7 +2265,7 @@ class StructStructurePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2330,18 +2330,18 @@ class StructBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2356,7 +2356,7 @@ class StructBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2421,18 +2421,18 @@ class StructEmptyPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2447,7 +2447,7 @@ class StructEmptyPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2512,18 +2512,18 @@ class StructuresPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2538,7 +2538,7 @@ class StructuresPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2605,18 +2605,18 @@ namespace testing_1 eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2631,7 +2631,7 @@ namespace testing_1 eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2699,18 +2699,18 @@ namespace testing_2 eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2725,7 +2725,7 @@ namespace testing_2 eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2791,18 +2791,18 @@ class barPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2817,7 +2817,7 @@ class barPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2882,18 +2882,18 @@ class root1PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2908,7 +2908,7 @@ class root1PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2973,18 +2973,18 @@ class root2PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2999,7 +2999,7 @@ class root2PubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3064,18 +3064,18 @@ class rootPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3090,7 +3090,7 @@ class rootPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/dds-types-test/unionsPubSubTypes.cxx b/test/dds-types-test/unionsPubSubTypes.cxx index 5fe777061f4..092f8ee4f2f 100644 --- a/test/dds-types-test/unionsPubSubTypes.cxx +++ b/test/dds-types-test/unionsPubSubTypes.cxx @@ -27,8 +27,8 @@ #include "unionsCdrAux.hpp" #include "unionsTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; UnionShortPubSubType::UnionShortPubSubType() diff --git a/test/dds-types-test/unionsPubSubTypes.h b/test/dds-types-test/unionsPubSubTypes.h index c23d50529b4..c7f622cb439 100644 --- a/test/dds-types-test/unionsPubSubTypes.h +++ b/test/dds-types-test/unionsPubSubTypes.h @@ -55,18 +55,18 @@ class UnionShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -81,7 +81,7 @@ class UnionShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -146,18 +146,18 @@ class UnionUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -172,7 +172,7 @@ class UnionUShortPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -237,18 +237,18 @@ class UnionLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -263,7 +263,7 @@ class UnionLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -328,18 +328,18 @@ class UnionULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -354,7 +354,7 @@ class UnionULongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -419,18 +419,18 @@ class UnionLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -445,7 +445,7 @@ class UnionLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -510,18 +510,18 @@ class UnionULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -536,7 +536,7 @@ class UnionULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -601,18 +601,18 @@ class UnionFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -627,7 +627,7 @@ class UnionFloatPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -692,18 +692,18 @@ class UnionDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -718,7 +718,7 @@ class UnionDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -783,18 +783,18 @@ class UnionLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -809,7 +809,7 @@ class UnionLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -874,18 +874,18 @@ class UnionBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -900,7 +900,7 @@ class UnionBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -965,18 +965,18 @@ class UnionOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -991,7 +991,7 @@ class UnionOctetPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1056,18 +1056,18 @@ class UnionCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1082,7 +1082,7 @@ class UnionCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1147,18 +1147,18 @@ class UnionWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1173,7 +1173,7 @@ class UnionWCharPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1238,18 +1238,18 @@ class UnionStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1264,7 +1264,7 @@ class UnionStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1329,18 +1329,18 @@ class UnionWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1355,7 +1355,7 @@ class UnionWStringPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1420,18 +1420,18 @@ class UnionBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1446,7 +1446,7 @@ class UnionBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1511,18 +1511,18 @@ class UnionBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1537,7 +1537,7 @@ class UnionBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1602,18 +1602,18 @@ class UnionInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1628,7 +1628,7 @@ class UnionInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDataT eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1693,18 +1693,18 @@ class UnionInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1719,7 +1719,7 @@ class UnionInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1784,18 +1784,18 @@ class UnionInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1810,7 +1810,7 @@ class UnionInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1875,18 +1875,18 @@ class UnionArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1901,7 +1901,7 @@ class UnionArrayPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -1966,18 +1966,18 @@ class UnionSequencePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -1992,7 +1992,7 @@ class UnionSequencePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2057,18 +2057,18 @@ class UnionMapPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2083,7 +2083,7 @@ class UnionMapPubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2148,18 +2148,18 @@ class UnionInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2174,7 +2174,7 @@ class UnionInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2239,18 +2239,18 @@ class UnionInnerStructureHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2265,7 +2265,7 @@ class UnionInnerStructureHelperPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2330,18 +2330,18 @@ class UnionInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2356,7 +2356,7 @@ class UnionInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2421,18 +2421,18 @@ class UnionDiscriminatorShortPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2447,7 +2447,7 @@ class UnionDiscriminatorShortPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2512,18 +2512,18 @@ class UnionDiscriminatorUShortPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2538,7 +2538,7 @@ class UnionDiscriminatorUShortPubSubType : public eprosima::fastdds::dds::TopicD eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2603,18 +2603,18 @@ class UnionDiscriminatorLongPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2629,7 +2629,7 @@ class UnionDiscriminatorLongPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2694,18 +2694,18 @@ class UnionDiscriminatorULongPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2720,7 +2720,7 @@ class UnionDiscriminatorULongPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2785,18 +2785,18 @@ class UnionDiscriminatorLongLongPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2811,7 +2811,7 @@ class UnionDiscriminatorLongLongPubSubType : public eprosima::fastdds::dds::Topi eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2876,18 +2876,18 @@ class UnionDiscriminatorULongLongPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2902,7 +2902,7 @@ class UnionDiscriminatorULongLongPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -2967,18 +2967,18 @@ class UnionDiscriminatorBooleanPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -2993,7 +2993,7 @@ class UnionDiscriminatorBooleanPubSubType : public eprosima::fastdds::dds::Topic eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3058,18 +3058,18 @@ class UnionDiscriminatorOctetPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3084,7 +3084,7 @@ class UnionDiscriminatorOctetPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3149,18 +3149,18 @@ class UnionDiscriminatorCharPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3175,7 +3175,7 @@ class UnionDiscriminatorCharPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3240,18 +3240,18 @@ class UnionDiscriminatorWCharPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3266,7 +3266,7 @@ class UnionDiscriminatorWCharPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3331,18 +3331,18 @@ class UnionDiscriminatorEnumPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3357,7 +3357,7 @@ class UnionDiscriminatorEnumPubSubType : public eprosima::fastdds::dds::TopicDat eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3422,18 +3422,18 @@ class UnionDiscriminatorEnumLabelPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3448,7 +3448,7 @@ class UnionDiscriminatorEnumLabelPubSubType : public eprosima::fastdds::dds::Top eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3513,18 +3513,18 @@ class UnionDiscriminatorAliasPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3539,7 +3539,7 @@ class UnionDiscriminatorAliasPubSubType : public eprosima::fastdds::dds::TopicDa eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3604,18 +3604,18 @@ class UnionSeveralFieldsPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3630,7 +3630,7 @@ class UnionSeveralFieldsPubSubType : public eprosima::fastdds::dds::TopicDataTyp eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -3695,18 +3695,18 @@ class UnionSeveralFieldsWithDefaultPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -3721,7 +3721,7 @@ class UnionSeveralFieldsWithDefaultPubSubType : public eprosima::fastdds::dds::T eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/dds/communication/PublisherDynamic.cpp b/test/dds/communication/PublisherDynamic.cpp index b2a2e0e878e..06542c017e1 100644 --- a/test/dds/communication/PublisherDynamic.cpp +++ b/test/dds/communication/PublisherDynamic.cpp @@ -37,8 +37,8 @@ #include using namespace eprosima::fastdds::dds; -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; static bool run = true; diff --git a/test/dds/communication/PublisherModule.cpp b/test/dds/communication/PublisherModule.cpp index 0187e4848a6..3332a360bf7 100644 --- a/test/dds/communication/PublisherModule.cpp +++ b/test/dds/communication/PublisherModule.cpp @@ -32,7 +32,7 @@ #include using namespace eprosima::fastdds::dds; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; PublisherModule::~PublisherModule() { diff --git a/test/dds/communication/PublisherModule.hpp b/test/dds/communication/PublisherModule.hpp index 85b7c1ad155..54a8b8e415c 100644 --- a/test/dds/communication/PublisherModule.hpp +++ b/test/dds/communication/PublisherModule.hpp @@ -63,13 +63,13 @@ class PublisherModule */ void on_participant_discovery( DomainParticipant* /*participant*/, - fastrtps::rtps::ParticipantDiscoveryInfo&& info, + fastdds::rtps::ParticipantDiscoveryInfo&& info, bool& should_be_ignored) override; #if HAVE_SECURITY void onParticipantAuthentication( DomainParticipant* participant, - fastrtps::rtps::ParticipantAuthenticationInfo&& info) override; + fastdds::rtps::ParticipantAuthenticationInfo&& info) override; #endif // if HAVE_SECURITY bool init( diff --git a/test/dds/communication/SubscriberDynamic.cpp b/test/dds/communication/SubscriberDynamic.cpp index 9b0030ebd5a..095d3ea380c 100644 --- a/test/dds/communication/SubscriberDynamic.cpp +++ b/test/dds/communication/SubscriberDynamic.cpp @@ -43,7 +43,7 @@ using namespace eprosima::fastdds::dds; using namespace eprosima::fastdds::dds::xtypes; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; class ParListener : public DomainParticipantListener { diff --git a/test/dds/communication/SubscriberModule.cpp b/test/dds/communication/SubscriberModule.cpp index a4f83d510fd..9cb89508e7f 100644 --- a/test/dds/communication/SubscriberModule.cpp +++ b/test/dds/communication/SubscriberModule.cpp @@ -33,7 +33,7 @@ #include using namespace eprosima::fastdds::dds; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; SubscriberModule::~SubscriberModule() { diff --git a/test/dds/communication/SubscriberModule.hpp b/test/dds/communication/SubscriberModule.hpp index 62071c141c6..3528b20e684 100644 --- a/test/dds/communication/SubscriberModule.hpp +++ b/test/dds/communication/SubscriberModule.hpp @@ -61,13 +61,13 @@ class SubscriberModule void on_participant_discovery( DomainParticipant* /*participant*/, - fastrtps::rtps::ParticipantDiscoveryInfo&& info, + fastdds::rtps::ParticipantDiscoveryInfo&& info, bool& should_be_ignored) override; #if HAVE_SECURITY void onParticipantAuthentication( DomainParticipant* /*participant*/, - fastrtps::rtps::ParticipantAuthenticationInfo&& info) override; + fastdds::rtps::ParticipantAuthenticationInfo&& info) override; #endif // if HAVE_SECURITY void on_subscription_matched( @@ -101,7 +101,7 @@ class SubscriberModule std::condition_variable cv_; const uint32_t publishers_ = 0; const uint32_t max_number_samples_ = 0; - std::map number_samples_; + std::map number_samples_; bool fixed_type_ = false; bool zero_copy_ = false; bool run_ = true; diff --git a/test/dds/communication/security/PublisherModule.cpp b/test/dds/communication/security/PublisherModule.cpp index 1afe2f5b94e..76cd0434647 100644 --- a/test/dds/communication/security/PublisherModule.cpp +++ b/test/dds/communication/security/PublisherModule.cpp @@ -32,7 +32,7 @@ #include using namespace eprosima::fastdds::dds; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; PublisherModule::~PublisherModule() { diff --git a/test/dds/communication/security/PublisherModule.hpp b/test/dds/communication/security/PublisherModule.hpp index c007af7fb9e..046dc0be9cf 100644 --- a/test/dds/communication/security/PublisherModule.hpp +++ b/test/dds/communication/security/PublisherModule.hpp @@ -64,13 +64,13 @@ class PublisherModule */ void on_participant_discovery( DomainParticipant* participant, - fastrtps::rtps::ParticipantDiscoveryInfo&& info, + fastdds::rtps::ParticipantDiscoveryInfo&& info, bool& should_be_ignored) override; #if HAVE_SECURITY void onParticipantAuthentication( DomainParticipant* participant, - fastrtps::rtps::ParticipantAuthenticationInfo&& info) override; + fastdds::rtps::ParticipantAuthenticationInfo&& info) override; #endif // if HAVE_SECURITY bool init( diff --git a/test/dds/communication/security/SubscriberModule.cpp b/test/dds/communication/security/SubscriberModule.cpp index bbf54e1e837..f0167cc52c2 100644 --- a/test/dds/communication/security/SubscriberModule.cpp +++ b/test/dds/communication/security/SubscriberModule.cpp @@ -33,7 +33,7 @@ #include using namespace eprosima::fastdds::dds; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; SubscriberModule::~SubscriberModule() { diff --git a/test/dds/communication/security/SubscriberModule.hpp b/test/dds/communication/security/SubscriberModule.hpp index 39d8dc6472c..2fd6e06b0dd 100644 --- a/test/dds/communication/security/SubscriberModule.hpp +++ b/test/dds/communication/security/SubscriberModule.hpp @@ -59,13 +59,13 @@ class SubscriberModule void on_participant_discovery( DomainParticipant* /*participant*/, - fastrtps::rtps::ParticipantDiscoveryInfo&& info, + fastdds::rtps::ParticipantDiscoveryInfo&& info, bool& should_be_ignored) override; #if HAVE_SECURITY void onParticipantAuthentication( DomainParticipant* /*participant*/, - fastrtps::rtps::ParticipantAuthenticationInfo&& info) override; + fastdds::rtps::ParticipantAuthenticationInfo&& info) override; #endif // if HAVE_SECURITY void on_subscription_matched( @@ -98,7 +98,7 @@ class SubscriberModule std::condition_variable cv_; const uint32_t publishers_ = 0; const uint32_t max_number_samples_ = 0; - std::map number_samples_; + std::map number_samples_; bool fixed_type_ = false; bool zero_copy_ = false; bool run_ = true; diff --git a/test/dds/discovery/ParticipantModule.cpp b/test/dds/discovery/ParticipantModule.cpp index f6224a85af3..092f294a0df 100644 --- a/test/dds/discovery/ParticipantModule.cpp +++ b/test/dds/discovery/ParticipantModule.cpp @@ -32,7 +32,6 @@ using namespace eprosima::fastdds::dds; using namespace eprosima::fastdds::rtps; -using namespace eprosima::fastrtps::rtps; ParticipantModule::ParticipantModule( const std::string& discovery_protocol, @@ -41,18 +40,18 @@ ParticipantModule::ParticipantModule( { if (discovery_protocol.compare(ParticipantType::SERVER) == 0) { - discovery_protocol_ = DiscoveryProtocol_t::SERVER; + discovery_protocol_ = DiscoveryProtocol::SERVER; std::istringstream server_guid_prefix_str(guid_prefix); server_guid_prefix_str >> server_guid_prefix_; unicast_metatraffic_port_ = atoi(unicast_metatraffic_port.c_str()); } else if (discovery_protocol.compare(ParticipantType::CLIENT) == 0) { - discovery_protocol_ = DiscoveryProtocol_t::CLIENT; + discovery_protocol_ = DiscoveryProtocol::CLIENT; } else { - discovery_protocol_ = DiscoveryProtocol_t::SIMPLE; + discovery_protocol_ = DiscoveryProtocol::SIMPLE; } } @@ -68,7 +67,7 @@ bool ParticipantModule::init() { DomainParticipantQos participant_qos; participant_qos.wire_protocol().builtin.discovery_config.discoveryProtocol = discovery_protocol_; - if (DiscoveryProtocol_t::SERVER == discovery_protocol_) + if (DiscoveryProtocol::SERVER == discovery_protocol_) { participant_qos.wire_protocol().prefix = server_guid_prefix_; Locator_t locator_server; diff --git a/test/dds/discovery/ParticipantModule.hpp b/test/dds/discovery/ParticipantModule.hpp index 4e80b4232ad..c4011d50267 100644 --- a/test/dds/discovery/ParticipantModule.hpp +++ b/test/dds/discovery/ParticipantModule.hpp @@ -31,7 +31,7 @@ namespace eprosima { namespace fastdds { namespace dds { -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; class ParticipantModule : public DomainParticipantListener { @@ -57,7 +57,7 @@ class ParticipantModule : public DomainParticipantListener unsigned int matched_ = 0; DomainParticipant* participant_ = nullptr; - DiscoveryProtocol_t discovery_protocol_; + DiscoveryProtocol discovery_protocol_; GuidPrefix_t server_guid_prefix_; uint32_t unicast_metatraffic_port_; }; diff --git a/test/feature/dynamic_types/DynamicTypesDDSTypesTest.hpp b/test/feature/dynamic_types/DynamicTypesDDSTypesTest.hpp index 86aff68fcc8..0ec09d548eb 100644 --- a/test/feature/dynamic_types/DynamicTypesDDSTypesTest.hpp +++ b/test/feature/dynamic_types/DynamicTypesDDSTypesTest.hpp @@ -115,7 +115,7 @@ class DynamicTypesDDSTypesTest : public ::testing::Test data_representation)()); // Dynamic Serialization <-> Dynamic Deserialization - eprosima::fastrtps::rtps::SerializedPayload_t dyn_payload(dyn_payloadSize); + eprosima::fastdds::rtps::SerializedPayload_t dyn_payload(dyn_payloadSize); ASSERT_TRUE(dyn_pubsubType.serialize(&data, &dyn_payload, data_representation)); DynamicData::_ref_type data1 {DynamicDataFactory::get_instance()->create_data(type)}; ASSERT_TRUE(dyn_pubsubType.deserialize(&dyn_payload, &data1)); @@ -128,7 +128,7 @@ class DynamicTypesDDSTypesTest : public ::testing::Test uint32_t static_payloadSize = static_cast(static_pubsubType.get_serialized_size_provider(&data_static, data_representation)()); EXPECT_EQ(static_payloadSize, dyn_payloadSize); - eprosima::fastrtps::rtps::SerializedPayload_t static_payload(static_payloadSize); + eprosima::fastdds::rtps::SerializedPayload_t static_payload(static_payloadSize); ASSERT_TRUE(static_pubsubType.serialize(&data_static, &static_payload, data_representation)); EXPECT_EQ(static_payload.length, static_payloadSize); DynamicData::_ref_type data2 {DynamicDataFactory::get_instance()->create_data(type)}; diff --git a/test/feature/dynamic_types/DynamicTypesTests.cpp b/test/feature/dynamic_types/DynamicTypesTests.cpp index 219352573dc..8df640442c2 100644 --- a/test/feature/dynamic_types/DynamicTypesTests.cpp +++ b/test/feature/dynamic_types/DynamicTypesTests.cpp @@ -31,7 +31,7 @@ #include #include -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; using namespace eprosima::fastdds::dds; std::array encodings {{XCDR_DATA_REPRESENTATION, XCDR2_DATA_REPRESENTATION}}; @@ -12715,7 +12715,7 @@ TEST_F(DynamicTypesTests, DynamicType_KeyHash_standard_example_1) EXPECT_EQ(RETCODE_OK, data->set_int32_value(1, 20)); TypeSupport pubsubType {new DynamicPubSubType(struct_type)}; - eprosima::fastrtps::rtps::InstanceHandle_t instance_handle; + eprosima::fastdds::rtps::InstanceHandle_t instance_handle; ASSERT_TRUE(pubsubType.get_key(&data, &instance_handle)); const uint8_t expected_key_hash[] { @@ -12785,7 +12785,7 @@ TEST_F(DynamicTypesTests, DynamicType_KeyHash_standard_example_2) EXPECT_EQ(RETCODE_OK, data->set_int32_value(3, 20)); TypeSupport pubsubType {new DynamicPubSubType(struct_type)}; - eprosima::fastrtps::rtps::InstanceHandle_t instance_handle; + eprosima::fastdds::rtps::InstanceHandle_t instance_handle; ASSERT_TRUE(pubsubType.get_key(&data, &instance_handle)); const uint8_t expected_key_hash[] { @@ -12892,7 +12892,7 @@ TEST_F(DynamicTypesTests, DynamicType_KeyHash_standard_example_3) EXPECT_EQ(RETCODE_OK, data->set_int32_value(10, 200)); TypeSupport pubsubType {new DynamicPubSubType(struct_type)}; - eprosima::fastrtps::rtps::InstanceHandle_t instance_handle; + eprosima::fastdds::rtps::InstanceHandle_t instance_handle; ASSERT_TRUE(pubsubType.get_key(&data, &instance_handle)); const uint8_t expected_key_hash[] { diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesAliasesDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesAliasesDDSTypesTests.cpp index 53a7b0e2d26..ecae01d5931 100644 --- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesAliasesDDSTypesTests.cpp +++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesAliasesDDSTypesTests.cpp @@ -551,8 +551,8 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_AliasOctet) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - eprosima::fastrtps::rtps::octet value = 255; - eprosima::fastrtps::rtps::octet test_value = 0; + eprosima::fastdds::rtps::octet value = 255; + eprosima::fastdds::rtps::octet test_value = 0; EXPECT_EQ(data->set_byte_value(data->get_member_id_by_name(struct_member_name), value), RETCODE_OK); EXPECT_EQ(data->get_byte_value(test_value, data->get_member_id_by_name(struct_member_name)), RETCODE_OK); EXPECT_EQ(value, test_value); @@ -1234,8 +1234,8 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_AliasBitset) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - eprosima::fastrtps::rtps::octet octet_value = 5; - eprosima::fastrtps::rtps::octet test_octet_value = 0; + eprosima::fastdds::rtps::octet octet_value = 5; + eprosima::fastdds::rtps::octet test_octet_value = 0; bool bool_value = true; bool test_bool_value = false; uint16_t ushort_value = 1000; diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesAppendableDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesAppendableDDSTypesTests.cpp index d31d8d80748..467b4faa25c 100644 --- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesAppendableDDSTypesTests.cpp +++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesAppendableDDSTypesTests.cpp @@ -475,8 +475,8 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_AppendableOctetStruct) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - eprosima::fastrtps::rtps::octet value = 255; - eprosima::fastrtps::rtps::octet test_value = 0; + eprosima::fastdds::rtps::octet value = 255; + eprosima::fastdds::rtps::octet test_value = 0; EXPECT_EQ(data->set_byte_value(data->get_member_id_by_name(var_byte_name), value), RETCODE_OK); EXPECT_EQ(data->get_byte_value(test_value, data->get_member_id_by_name(var_byte_name)), RETCODE_OK); EXPECT_EQ(value, test_value); diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesArraysDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesArraysDDSTypesTests.cpp index 3f0e5e758fc..1276267d276 100644 --- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesArraysDDSTypesTests.cpp +++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesArraysDDSTypesTests.cpp @@ -1403,9 +1403,9 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_ArrayBitset) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - eprosima::fastrtps::rtps::octet first_octet_value = 5; - eprosima::fastrtps::rtps::octet second_octet_value = 7; - eprosima::fastrtps::rtps::octet test_octet_value = 0; + eprosima::fastdds::rtps::octet first_octet_value = 5; + eprosima::fastdds::rtps::octet second_octet_value = 7; + eprosima::fastdds::rtps::octet test_octet_value = 0; bool first_bool_value = true; bool second_bool_value = false; bool test_bool_value = false; @@ -3200,10 +3200,10 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_ArrayMultiDimensionBitset) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - eprosima::fastrtps::rtps::octet first_octet_value = 5; - eprosima::fastrtps::rtps::octet second_octet_value = 7; - eprosima::fastrtps::rtps::octet third_octet_value = 1; - eprosima::fastrtps::rtps::octet test_octet_value = 0; + eprosima::fastdds::rtps::octet first_octet_value = 5; + eprosima::fastdds::rtps::octet second_octet_value = 7; + eprosima::fastdds::rtps::octet third_octet_value = 1; + eprosima::fastdds::rtps::octet test_octet_value = 0; bool first_bool_value = true; bool second_bool_value = false; bool third_bool_value = true; diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesBitsetsDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesBitsetsDDSTypesTests.cpp index 603a1d15768..8ef3615a290 100644 --- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesBitsetsDDSTypesTests.cpp +++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesBitsetsDDSTypesTests.cpp @@ -190,7 +190,7 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_BitsetStruct) ASSERT_TRUE(data); bool bool_value = true; - eprosima::fastrtps::rtps::octet octet_value = 7; + eprosima::fastdds::rtps::octet octet_value = 7; int8_t int8_value = 7; uint8_t uint8_value = 7; int16_t short_value = 2; @@ -201,7 +201,7 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_BitsetStruct) uint64_t ulong_long_value = 1001; bool test_bool_value = false; - eprosima::fastrtps::rtps::octet test_octet_value = 0; + eprosima::fastdds::rtps::octet test_octet_value = 0; int8_t test_int8_value = 0; uint8_t test_uint8_value = 0; int16_t test_short_value = 0; diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesFinalDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesFinalDDSTypesTests.cpp index 8362e79e2c1..9cb2f845d87 100644 --- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesFinalDDSTypesTests.cpp +++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesFinalDDSTypesTests.cpp @@ -475,8 +475,8 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_FinalOctetStruct) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - eprosima::fastrtps::rtps::octet value = 255; - eprosima::fastrtps::rtps::octet test_value = 0; + eprosima::fastdds::rtps::octet value = 255; + eprosima::fastdds::rtps::octet test_value = 0; EXPECT_EQ(data->set_byte_value(data->get_member_id_by_name(var_byte_name), value), RETCODE_OK); EXPECT_EQ(data->get_byte_value(test_value, data->get_member_id_by_name(var_byte_name)), RETCODE_OK); EXPECT_EQ(value, test_value); diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesInheritanceDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesInheritanceDDSTypesTests.cpp index a5334488ae9..e4814230e86 100644 --- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesInheritanceDDSTypesTests.cpp +++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesInheritanceDDSTypesTests.cpp @@ -861,12 +861,12 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_BitsetsChildInheritanceStruct) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - eprosima::fastrtps::rtps::octet octet_value {5}; + eprosima::fastdds::rtps::octet octet_value {5}; bool bool_value {true}; uint16_t ushort_value {1000}; int16_t short_value {2000}; uint32_t long_value {111}; - eprosima::fastrtps::rtps::octet test_octet_value; + eprosima::fastdds::rtps::octet test_octet_value; bool test_bool_value; uint16_t test_ushort_value; int16_t test_short_value; diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesMapsDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesMapsDDSTypesTests.cpp index 08abfa185bc..ea7aa5f8b46 100644 --- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesMapsDDSTypesTests.cpp +++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesMapsDDSTypesTests.cpp @@ -1250,13 +1250,13 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapShortOctet) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - const std::unordered_map value { - {std::int16_t(100), fastrtps::rtps::octet(1)}, - {std::int16_t(-100), fastrtps::rtps::octet(2)}, - {std::int16_t(50), fastrtps::rtps::octet(100)}, - {std::int16_t(-50), fastrtps::rtps::octet(200)} + const std::unordered_map value { + {std::int16_t(100), fastdds::rtps::octet(1)}, + {std::int16_t(-100), fastdds::rtps::octet(2)}, + {std::int16_t(50), fastdds::rtps::octet(100)}, + {std::int16_t(-50), fastdds::rtps::octet(200)} }; - fastrtps::rtps::octet test_value; + fastdds::rtps::octet test_value; auto map_data = data->loan_value(data->get_member_id_by_name(var_short_octet_map)); ASSERT_TRUE(map_data); // Set values @@ -2349,12 +2349,12 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapShortInnerBitsetHelper) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - const std::unordered_map> value { - {std::int16_t(-100), {eprosima::fastrtps::rtps::octet(5), true, std::uint16_t(1000), std::int16_t(2000)}}, - {std::int16_t(50), {eprosima::fastrtps::rtps::octet(7), false, std::uint16_t(555), std::int16_t(20)}}, - {std::int16_t(600), {eprosima::fastrtps::rtps::octet(0), true, std::uint16_t(0), std::int16_t(0)}} + const std::unordered_map> value { + {std::int16_t(-100), {eprosima::fastdds::rtps::octet(5), true, std::uint16_t(1000), std::int16_t(2000)}}, + {std::int16_t(50), {eprosima::fastdds::rtps::octet(7), false, std::uint16_t(555), std::int16_t(20)}}, + {std::int16_t(600), {eprosima::fastdds::rtps::octet(0), true, std::uint16_t(0), std::int16_t(0)}} }; - eprosima::fastrtps::rtps::octet test_value1; + eprosima::fastdds::rtps::octet test_value1; bool test_value2; uint16_t test_value3; int16_t test_value4; @@ -3144,13 +3144,13 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapUShortOctet) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - const std::unordered_map value { - {std::uint16_t(100), fastrtps::rtps::octet(1)}, - {std::uint16_t(200), fastrtps::rtps::octet(2)}, - {std::uint16_t(50), fastrtps::rtps::octet(100)}, - {std::uint16_t(70), fastrtps::rtps::octet(200)} + const std::unordered_map value { + {std::uint16_t(100), fastdds::rtps::octet(1)}, + {std::uint16_t(200), fastdds::rtps::octet(2)}, + {std::uint16_t(50), fastdds::rtps::octet(100)}, + {std::uint16_t(70), fastdds::rtps::octet(200)} }; - fastrtps::rtps::octet test_value; + fastdds::rtps::octet test_value; auto map_data = data->loan_value(data->get_member_id_by_name(var_ushort_octet_map)); ASSERT_TRUE(map_data); // Set values @@ -4244,12 +4244,12 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapUShortInnerBitsetHelper) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - const std::unordered_map> value { - {std::uint16_t(100), {eprosima::fastrtps::rtps::octet(5), true, std::uint16_t(1000), std::int16_t(2000)}}, - {std::uint16_t(50), {eprosima::fastrtps::rtps::octet(7), false, std::uint16_t(555), std::int16_t(20)}}, - {std::uint16_t(600), {eprosima::fastrtps::rtps::octet(0), true, std::uint16_t(0), std::int16_t(0)}} + const std::unordered_map> value { + {std::uint16_t(100), {eprosima::fastdds::rtps::octet(5), true, std::uint16_t(1000), std::int16_t(2000)}}, + {std::uint16_t(50), {eprosima::fastdds::rtps::octet(7), false, std::uint16_t(555), std::int16_t(20)}}, + {std::uint16_t(600), {eprosima::fastdds::rtps::octet(0), true, std::uint16_t(0), std::int16_t(0)}} }; - eprosima::fastrtps::rtps::octet test_value1; + eprosima::fastdds::rtps::octet test_value1; bool test_value2; uint16_t test_value3; int16_t test_value4; @@ -5039,13 +5039,13 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapLongOctet) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - const std::unordered_map value { - {-100, fastrtps::rtps::octet(1)}, - {200, fastrtps::rtps::octet(2)}, - {-50, fastrtps::rtps::octet(100)}, - {70, fastrtps::rtps::octet(200)} + const std::unordered_map value { + {-100, fastdds::rtps::octet(1)}, + {200, fastdds::rtps::octet(2)}, + {-50, fastdds::rtps::octet(100)}, + {70, fastdds::rtps::octet(200)} }; - fastrtps::rtps::octet test_value; + fastdds::rtps::octet test_value; auto map_data = data->loan_value(data->get_member_id_by_name(var_long_octet_map)); ASSERT_TRUE(map_data); // Set values @@ -6138,12 +6138,12 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapLongInnerBitsetHelper) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - const std::unordered_map> value { - {-100, {eprosima::fastrtps::rtps::octet(5), true, std::uint16_t(1000), std::int16_t(2000)}}, - {50, {eprosima::fastrtps::rtps::octet(7), false, std::uint16_t(555), std::int16_t(20)}}, - {600, {eprosima::fastrtps::rtps::octet(0), true, std::uint16_t(0), std::int16_t(0)}} + const std::unordered_map> value { + {-100, {eprosima::fastdds::rtps::octet(5), true, std::uint16_t(1000), std::int16_t(2000)}}, + {50, {eprosima::fastdds::rtps::octet(7), false, std::uint16_t(555), std::int16_t(20)}}, + {600, {eprosima::fastdds::rtps::octet(0), true, std::uint16_t(0), std::int16_t(0)}} }; - eprosima::fastrtps::rtps::octet test_value1; + eprosima::fastdds::rtps::octet test_value1; bool test_value2; uint16_t test_value3; int16_t test_value4; @@ -6933,13 +6933,13 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapULongOctet) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - const std::unordered_map value { - {100u, fastrtps::rtps::octet(1)}, - {200u, fastrtps::rtps::octet(2)}, - {50u, fastrtps::rtps::octet(100)}, - {70u, fastrtps::rtps::octet(200)} + const std::unordered_map value { + {100u, fastdds::rtps::octet(1)}, + {200u, fastdds::rtps::octet(2)}, + {50u, fastdds::rtps::octet(100)}, + {70u, fastdds::rtps::octet(200)} }; - fastrtps::rtps::octet test_value; + fastdds::rtps::octet test_value; auto map_data = data->loan_value(data->get_member_id_by_name(var_ulong_octet_map)); ASSERT_TRUE(map_data); // Set values @@ -8032,12 +8032,12 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapULongInnerBitsetHelper) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - const std::unordered_map> value { - {100u, {eprosima::fastrtps::rtps::octet(5), true, std::uint16_t(1000), std::int16_t(2000)}}, - {50u, {eprosima::fastrtps::rtps::octet(7), false, std::uint16_t(555), std::int16_t(20)}}, - {600u, {eprosima::fastrtps::rtps::octet(0), true, std::uint16_t(0), std::int16_t(0)}} + const std::unordered_map> value { + {100u, {eprosima::fastdds::rtps::octet(5), true, std::uint16_t(1000), std::int16_t(2000)}}, + {50u, {eprosima::fastdds::rtps::octet(7), false, std::uint16_t(555), std::int16_t(20)}}, + {600u, {eprosima::fastdds::rtps::octet(0), true, std::uint16_t(0), std::int16_t(0)}} }; - eprosima::fastrtps::rtps::octet test_value1; + eprosima::fastdds::rtps::octet test_value1; bool test_value2; uint16_t test_value3; int16_t test_value4; @@ -8827,13 +8827,13 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapLongLongOctet) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - const std::unordered_map value { - {-100, fastrtps::rtps::octet(1)}, - {200, fastrtps::rtps::octet(2)}, - {-50, fastrtps::rtps::octet(100)}, - {70, fastrtps::rtps::octet(200)} + const std::unordered_map value { + {-100, fastdds::rtps::octet(1)}, + {200, fastdds::rtps::octet(2)}, + {-50, fastdds::rtps::octet(100)}, + {70, fastdds::rtps::octet(200)} }; - fastrtps::rtps::octet test_value; + fastdds::rtps::octet test_value; auto map_data = data->loan_value(data->get_member_id_by_name(var_longlong_octet_map)); ASSERT_TRUE(map_data); // Set values @@ -9926,12 +9926,12 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapLongLongInnerBitsetHelper) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - const std::unordered_map> value { - {-100, {eprosima::fastrtps::rtps::octet(5), true, std::uint16_t(1000), std::int16_t(2000)}}, - {50, {eprosima::fastrtps::rtps::octet(7), false, std::uint16_t(555), std::int16_t(20)}}, - {600, {eprosima::fastrtps::rtps::octet(0), true, std::uint16_t(0), std::int16_t(0)}} + const std::unordered_map> value { + {-100, {eprosima::fastdds::rtps::octet(5), true, std::uint16_t(1000), std::int16_t(2000)}}, + {50, {eprosima::fastdds::rtps::octet(7), false, std::uint16_t(555), std::int16_t(20)}}, + {600, {eprosima::fastdds::rtps::octet(0), true, std::uint16_t(0), std::int16_t(0)}} }; - eprosima::fastrtps::rtps::octet test_value1; + eprosima::fastdds::rtps::octet test_value1; bool test_value2; uint16_t test_value3; int16_t test_value4; @@ -10721,13 +10721,13 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapULongLongOctet) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - const std::unordered_map value { - {100u, fastrtps::rtps::octet(1)}, - {200u, fastrtps::rtps::octet(2)}, - {50u, fastrtps::rtps::octet(100)}, - {70u, fastrtps::rtps::octet(200)} + const std::unordered_map value { + {100u, fastdds::rtps::octet(1)}, + {200u, fastdds::rtps::octet(2)}, + {50u, fastdds::rtps::octet(100)}, + {70u, fastdds::rtps::octet(200)} }; - fastrtps::rtps::octet test_value; + fastdds::rtps::octet test_value; auto map_data = data->loan_value(data->get_member_id_by_name(var_ulonglong_octet_map)); ASSERT_TRUE(map_data); // Set values @@ -11820,12 +11820,12 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapULongLongInnerBitsetHelper) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - const std::unordered_map> value { - {100u, {eprosima::fastrtps::rtps::octet(5), true, std::uint16_t(1000), std::int16_t(2000)}}, - {50u, {eprosima::fastrtps::rtps::octet(7), false, std::uint16_t(555), std::int16_t(20)}}, - {600u, {eprosima::fastrtps::rtps::octet(0), true, std::uint16_t(0), std::int16_t(0)}} + const std::unordered_map> value { + {100u, {eprosima::fastdds::rtps::octet(5), true, std::uint16_t(1000), std::int16_t(2000)}}, + {50u, {eprosima::fastdds::rtps::octet(7), false, std::uint16_t(555), std::int16_t(20)}}, + {600u, {eprosima::fastdds::rtps::octet(0), true, std::uint16_t(0), std::int16_t(0)}} }; - eprosima::fastrtps::rtps::octet test_value1; + eprosima::fastdds::rtps::octet test_value1; bool test_value2; uint16_t test_value3; int16_t test_value4; @@ -12616,13 +12616,13 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapStringOctet) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - const std::unordered_map value { - {"we", fastrtps::rtps::octet(1)}, - {"are", fastrtps::rtps::octet(2)}, - {"testing", fastrtps::rtps::octet(100)}, - {"things", fastrtps::rtps::octet(200)} + const std::unordered_map value { + {"we", fastdds::rtps::octet(1)}, + {"are", fastdds::rtps::octet(2)}, + {"testing", fastdds::rtps::octet(100)}, + {"things", fastdds::rtps::octet(200)} }; - fastrtps::rtps::octet test_value; + fastdds::rtps::octet test_value; auto map_data = data->loan_value(data->get_member_id_by_name(var_string_octet_map)); ASSERT_TRUE(map_data); // Set values @@ -13718,12 +13718,12 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapStringInnerBitsetHelper) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - const std::unordered_map> value { - {"we", {eprosima::fastrtps::rtps::octet(5), true, std::uint16_t(1000), std::int16_t(2000)}}, - {"are", {eprosima::fastrtps::rtps::octet(7), false, std::uint16_t(555), std::int16_t(20)}}, - {"testing", {eprosima::fastrtps::rtps::octet(0), true, std::uint16_t(0), std::int16_t(0)}} + const std::unordered_map> value { + {"we", {eprosima::fastdds::rtps::octet(5), true, std::uint16_t(1000), std::int16_t(2000)}}, + {"are", {eprosima::fastdds::rtps::octet(7), false, std::uint16_t(555), std::int16_t(20)}}, + {"testing", {eprosima::fastdds::rtps::octet(0), true, std::uint16_t(0), std::int16_t(0)}} }; - eprosima::fastrtps::rtps::octet test_value1; + eprosima::fastdds::rtps::octet test_value1; bool test_value2; uint16_t test_value3; int16_t test_value4; @@ -14505,13 +14505,13 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapInnerAliasBoundedStringHelperOc DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - const std::unordered_map value { - {"we", fastrtps::rtps::octet(1)}, - {"are", fastrtps::rtps::octet(2)}, - {"testing", fastrtps::rtps::octet(100)}, - {"things", fastrtps::rtps::octet(200)} + const std::unordered_map value { + {"we", fastdds::rtps::octet(1)}, + {"are", fastdds::rtps::octet(2)}, + {"testing", fastdds::rtps::octet(100)}, + {"things", fastdds::rtps::octet(200)} }; - fastrtps::rtps::octet test_value; + fastdds::rtps::octet test_value; auto map_data = data->loan_value(data->get_member_id_by_name(var_inneraliasboundedstringhelper_octet_map)); ASSERT_TRUE(map_data); // Set values @@ -15614,12 +15614,12 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MapInnerAliasBoundedStringHelperIn DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - const std::unordered_map> value { - {"we", {eprosima::fastrtps::rtps::octet(5), true, std::uint16_t(1000), std::int16_t(2000)}}, - {"are", {eprosima::fastrtps::rtps::octet(7), false, std::uint16_t(555), std::int16_t(20)}}, - {"testing", {eprosima::fastrtps::rtps::octet(0), true, std::uint16_t(0), std::int16_t(0)}} + const std::unordered_map> value { + {"we", {eprosima::fastdds::rtps::octet(5), true, std::uint16_t(1000), std::int16_t(2000)}}, + {"are", {eprosima::fastdds::rtps::octet(7), false, std::uint16_t(555), std::int16_t(20)}}, + {"testing", {eprosima::fastdds::rtps::octet(0), true, std::uint16_t(0), std::int16_t(0)}} }; - eprosima::fastrtps::rtps::octet test_value1; + eprosima::fastdds::rtps::octet test_value1; bool test_value2; uint16_t test_value3; int16_t test_value4; diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesMutableDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesMutableDDSTypesTests.cpp index ea4bf1efab6..b1628ff1295 100644 --- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesMutableDDSTypesTests.cpp +++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesMutableDDSTypesTests.cpp @@ -475,8 +475,8 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_MutableOctetStruct) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - eprosima::fastrtps::rtps::octet value = 255; - eprosima::fastrtps::rtps::octet test_value = 0; + eprosima::fastdds::rtps::octet value = 255; + eprosima::fastdds::rtps::octet test_value = 0; EXPECT_EQ(data->set_byte_value(data->get_member_id_by_name(var_byte_name), value), RETCODE_OK); EXPECT_EQ(data->get_byte_value(test_value, data->get_member_id_by_name(var_byte_name)), RETCODE_OK); EXPECT_EQ(value, test_value); diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesPrimitivesDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesPrimitivesDDSTypesTests.cpp index 38505affed8..7d13d57532d 100644 --- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesPrimitivesDDSTypesTests.cpp +++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesPrimitivesDDSTypesTests.cpp @@ -490,8 +490,8 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_OctetStruct) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - eprosima::fastrtps::rtps::octet value = 255; - eprosima::fastrtps::rtps::octet test_value = 0; + eprosima::fastdds::rtps::octet value = 255; + eprosima::fastdds::rtps::octet test_value = 0; EXPECT_EQ(data->set_byte_value(data->get_member_id_by_name(var_byte_name), value), RETCODE_OK); EXPECT_EQ(data->get_byte_value(test_value, data->get_member_id_by_name(var_byte_name)), RETCODE_OK); EXPECT_EQ(value, test_value); diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesSequencesDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesSequencesDDSTypesTests.cpp index a267f056a81..0387902a9e7 100644 --- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesSequencesDDSTypesTests.cpp +++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesSequencesDDSTypesTests.cpp @@ -1237,9 +1237,9 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_SequenceBitset) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - eprosima::fastrtps::rtps::octet first_octet_value = 5; - eprosima::fastrtps::rtps::octet second_octet_value = 7; - eprosima::fastrtps::rtps::octet test_octet_value = 0; + eprosima::fastdds::rtps::octet first_octet_value = 5; + eprosima::fastdds::rtps::octet second_octet_value = 7; + eprosima::fastdds::rtps::octet test_octet_value = 0; bool first_bool_value = true; bool second_bool_value = false; bool test_bool_value = false; diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesStructuresDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesStructuresDDSTypesTests.cpp index e2393bf4c66..f627e65ad65 100644 --- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesStructuresDDSTypesTests.cpp +++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesStructuresDDSTypesTests.cpp @@ -817,8 +817,8 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_StructOctet) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - eprosima::fastrtps::rtps::octet value = 255; - eprosima::fastrtps::rtps::octet test_value = 0; + eprosima::fastdds::rtps::octet value = 255; + eprosima::fastdds::rtps::octet test_value = 0; EXPECT_EQ(data->set_byte_value(data->get_member_id_by_name(var_byte_name), value), RETCODE_OK); EXPECT_EQ(data->get_byte_value(test_value, data->get_member_id_by_name(var_byte_name)), RETCODE_OK); EXPECT_EQ(value, test_value); @@ -1286,8 +1286,8 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_StructBitset) DynamicData::_ref_type data {DynamicDataFactory::get_instance()->create_data(struct_type)}; ASSERT_TRUE(data); - eprosima::fastrtps::rtps::octet octet_value = 5; - eprosima::fastrtps::rtps::octet test_octet_value = 0; + eprosima::fastdds::rtps::octet octet_value = 5; + eprosima::fastdds::rtps::octet test_octet_value = 0; bool bool_value = true; bool test_bool_value = false; uint16_t ushort_value = 1000; @@ -1358,7 +1358,7 @@ struct testing_values_struct double test_double_value; long double test_long_double_value; bool test_bool_value; - eprosima::fastrtps::rtps::octet test_byte_value; + eprosima::fastdds::rtps::octet test_byte_value; char test_char_value; wchar_t test_wchar_value; std::string test_string_value; @@ -1370,7 +1370,7 @@ struct testing_values_struct Int16Seq test_array_value; Int32Seq test_seq_value; int32_t test_map_value; - eprosima::fastrtps::rtps::octet test_octet_value; + eprosima::fastdds::rtps::octet test_octet_value; }; void check_structure_static_data( @@ -1554,7 +1554,7 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_StructStructures) double double_value = 502.12; long double long_double_value = 13.2; bool bool_value = true; - eprosima::fastrtps::rtps::octet byte_value = 234; + eprosima::fastdds::rtps::octet byte_value = 234; char char_value = 'a'; wchar_t wchar_value = L'0'; std::string string_value = "TESTING_STRING"; @@ -1567,7 +1567,7 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_StructStructures) Int16Seq array_value = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}; Int32Seq seq_value = {10, 20}; int32_t map_value = 253; - eprosima::fastrtps::rtps::octet octet_value = 7; + eprosima::fastdds::rtps::octet octet_value = 7; testing_values_struct testing_values; DynamicData::_ref_type short_struct_data = data->loan_value(data->get_member_id_by_name(var_short_struct_name)); diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesUnionsDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesUnionsDDSTypesTests.cpp index 9ca0144984e..7e9af1c1ca2 100644 --- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesUnionsDDSTypesTests.cpp +++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesUnionsDDSTypesTests.cpp @@ -756,8 +756,8 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_UnionOctet) DynamicData::_ref_type union_data = data->loan_value(data->get_member_id_by_name(var_union_byte_name)); ASSERT_TRUE(union_data); - eprosima::fastrtps::rtps::octet value = 15; - eprosima::fastrtps::rtps::octet test_value = 134; + eprosima::fastdds::rtps::octet value = 15; + eprosima::fastdds::rtps::octet test_value = 134; EXPECT_EQ(union_data->set_byte_value(union_data->get_member_id_by_name(var_union_member_k), value), RETCODE_OK); EXPECT_EQ(union_data->get_byte_value(test_value, union_data->get_member_id_by_name(var_union_member_k)), RETCODE_OK); @@ -1630,8 +1630,8 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_UnionInnerBitsetHelper) DynamicData::_ref_type union_data = data->loan_value(data->get_member_id_by_name(var_union_bitset_name)); ASSERT_TRUE(union_data); - eprosima::fastrtps::rtps::octet octet_value = 5; - eprosima::fastrtps::rtps::octet test_octet_value = 0; + eprosima::fastdds::rtps::octet octet_value = 5; + eprosima::fastdds::rtps::octet test_octet_value = 0; bool bool_value = true; bool test_bool_value = false; uint16_t ushort_value = 1000; @@ -2401,8 +2401,8 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_UnionDiscriminatorEnum) int32_t long_value = 14241; int32_t test_long_value = 0; - eprosima::fastrtps::rtps::octet byte_value = 234; - eprosima::fastrtps::rtps::octet test_byte_value = 12; + eprosima::fastdds::rtps::octet byte_value = 234; + eprosima::fastdds::rtps::octet test_byte_value = 12; int64_t long_long_value = 3221624; int64_t test_long_long_value = 0; EXPECT_EQ(union_data->set_int32_value(union_data->get_member_id_by_name( diff --git a/test/mock/dds/DataWriterHistory/fastdds/publisher/DataWriterHistory.hpp b/test/mock/dds/DataWriterHistory/fastdds/publisher/DataWriterHistory.hpp index 7b85e347e54..b8e42c28160 100644 --- a/test/mock/dds/DataWriterHistory/fastdds/publisher/DataWriterHistory.hpp +++ b/test/mock/dds/DataWriterHistory/fastdds/publisher/DataWriterHistory.hpp @@ -38,8 +38,7 @@ namespace eprosima { namespace fastdds { namespace dds { -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; static HistoryAttributes to_history_attributes( const TopicAttributes& topic_att, @@ -72,7 +71,7 @@ class DataWriterHistory : public WriterHistory const TopicAttributes& topic_att, uint32_t payloadMaxSize, MemoryManagementPolicy_t mempolicy, - std::function unack_sample_remove_functor) + std::function unack_sample_remove_functor) : WriterHistory(to_history_attributes(topic_att, payloadMaxSize, mempolicy)) , history_qos_(topic_att.historyQos) , resource_limited_qos_(topic_att.resourceLimitsQos) @@ -155,8 +154,8 @@ class DataWriterHistory : public WriterHistory ); } - fastrtps::rtps::SerializedPayload_t* get_key_value( - const fastrtps::rtps::InstanceHandle_t& handle) + fastdds::rtps::SerializedPayload_t* get_key_value( + const fastdds::rtps::InstanceHandle_t& handle) { t_m_Inst_Caches::iterator vit = keyed_changes_.find(handle); if (vit != keyed_changes_.end() && vit->second.is_registered()) @@ -207,10 +206,10 @@ class DataWriterHistory : public WriterHistory template bool add_pub_change_with_commit_hook( - fastrtps::rtps::CacheChange_t* change, - fastrtps::rtps::WriteParams& wparams, + fastdds::rtps::CacheChange_t* change, + fastdds::rtps::WriteParams& wparams, PreCommitHook /*pre_commit*/, - std::unique_lock& lock, + std::unique_lock& lock, const std::chrono::time_point& max_blocking_time) { return add_pub_change(change, wparams, lock, max_blocking_time); @@ -305,7 +304,7 @@ class DataWriterHistory : public WriterHistory TopicAttributes topic_att_; //! Unacknowledged sample removed functor - std::function unacknowledged_sample_removed_functor_; + std::function unacknowledged_sample_removed_functor_; bool find_or_add_key( const InstanceHandle_t& instance_handle, diff --git a/test/mock/dds/DomainParticipantFactory/fastdds/dds/domain/DomainParticipantFactory.hpp b/test/mock/dds/DomainParticipantFactory/fastdds/dds/domain/DomainParticipantFactory.hpp index 5f7ea28879c..54ad1a05204 100644 --- a/test/mock/dds/DomainParticipantFactory/fastdds/dds/domain/DomainParticipantFactory.hpp +++ b/test/mock/dds/DomainParticipantFactory/fastdds/dds/domain/DomainParticipantFactory.hpp @@ -46,7 +46,7 @@ class DomainParticipantFactory } DomainParticipantFactory() - : rtps_domain_(fastrtps::rtps::RTPSDomainImpl::get_instance()) + : rtps_domain_(fastdds::rtps::RTPSDomainImpl::get_instance()) { } @@ -58,7 +58,7 @@ class DomainParticipantFactory private: - std::shared_ptr rtps_domain_; + std::shared_ptr rtps_domain_; }; diff --git a/test/mock/dds/DomainParticipantImpl/fastdds/domain/DomainParticipantImpl.hpp b/test/mock/dds/DomainParticipantImpl/fastdds/domain/DomainParticipantImpl.hpp index 888748df13a..e09206c9934 100644 --- a/test/mock/dds/DomainParticipantImpl/fastdds/domain/DomainParticipantImpl.hpp +++ b/test/mock/dds/DomainParticipantImpl/fastdds/domain/DomainParticipantImpl.hpp @@ -87,8 +87,8 @@ class DomainParticipantImpl participant_->impl_ = this; guid_.guidPrefix.value[11] = 1; - eprosima::fastrtps::TopicAttributes top_attr; - eprosima::fastrtps::xmlparser::XMLProfileManager::getDefaultTopicAttributes(top_attr); + eprosima::fastdds::TopicAttributes top_attr; + eprosima::fastdds::xmlparser::XMLProfileManager::getDefaultTopicAttributes(top_attr); default_topic_qos_.history() = top_attr.historyQos; default_topic_qos_.resource_limits() = top_attr.resourceLimitsQos; } @@ -97,7 +97,7 @@ class DomainParticipantImpl { if (rtps_participant_ != nullptr) { - eprosima::fastrtps::rtps::RTPSDomain::removeRTPSParticipant(rtps_participant_); + eprosima::fastdds::rtps::RTPSDomain::removeRTPSParticipant(rtps_participant_); } if (participant_) @@ -114,9 +114,9 @@ class DomainParticipantImpl virtual ReturnCode_t enable() { - fastrtps::rtps::RTPSParticipantAttributes rtps_attr; + fastdds::rtps::RTPSParticipantAttributes rtps_attr; - rtps_participant_ = eprosima::fastrtps::rtps::RTPSDomain::createParticipant( + rtps_participant_ = eprosima::fastdds::rtps::RTPSDomain::createParticipant( domain_id_, false, rtps_attr, &rtps_listener_); return RETCODE_OK; @@ -304,7 +304,7 @@ class DomainParticipantImpl Topic* find_topic( const std::string& /*topic_name*/, - const fastrtps::Duration_t& /*timeout*/) + const fastdds::Duration_t& /*timeout*/) { return nullptr; } @@ -379,7 +379,7 @@ class DomainParticipantImpl const char* filter_class_name)); MOCK_METHOD1(ignore_participant, bool ( - const fastrtps::rtps::InstanceHandle_t& handle)); + const fastdds::rtps::InstanceHandle_t& handle)); TopicDescription* lookup_topicdescription( @@ -538,7 +538,7 @@ class DomainParticipantImpl } ReturnCode_t get_current_time( - fastrtps::Time_t& /*current_time*/) const + fastdds::Time_t& /*current_time*/) const { return RETCODE_OK; } @@ -548,7 +548,7 @@ class DomainParticipantImpl return participant_; } - fastrtps::rtps::RTPSParticipant* get_rtps_participant() + fastdds::rtps::RTPSParticipant* get_rtps_participant() { return rtps_participant_; } @@ -570,7 +570,7 @@ class DomainParticipantImpl return static_cast(guid_); } - const fastrtps::rtps::GUID_t& guid() const + const fastdds::rtps::GUID_t& guid() const { return guid_; } @@ -581,14 +581,14 @@ class DomainParticipantImpl } bool new_remote_endpoint_discovered( - const fastrtps::rtps::GUID_t& /*partguid*/, + const fastdds::rtps::GUID_t& /*partguid*/, uint16_t /*endpointId*/, - fastrtps::rtps::EndpointKind_t /*kind*/) + fastdds::rtps::EndpointKind_t /*kind*/) { return false; } - fastrtps::rtps::ResourceEvent& get_resource_event() const + fastdds::rtps::ResourceEvent& get_resource_event() const { return rtps_participant_->get_resource_event(); } @@ -716,9 +716,9 @@ class DomainParticipantImpl protected: DomainId_t domain_id_; - fastrtps::rtps::GUID_t guid_; + fastdds::rtps::GUID_t guid_; DomainParticipantQos qos_; - fastrtps::rtps::RTPSParticipant* rtps_participant_; + fastdds::rtps::RTPSParticipant* rtps_participant_; DomainParticipant* participant_; DomainParticipantListener* listener_; std::map publishers_; @@ -735,7 +735,7 @@ class DomainParticipantImpl TopicQos default_topic_qos_; std::atomic id_counter_; - class MyRTPSParticipantListener : public fastrtps::rtps::RTPSParticipantListener + class MyRTPSParticipantListener : public fastdds::rtps::RTPSParticipantListener { public: diff --git a/test/mock/dds/QosPolicies/fastdds/dds/core/policy/QosPolicies.hpp b/test/mock/dds/QosPolicies/fastdds/dds/core/policy/QosPolicies.hpp index f12a7b1d7e2..4253c24bd3e 100644 --- a/test/mock/dds/QosPolicies/fastdds/dds/core/policy/QosPolicies.hpp +++ b/test/mock/dds/QosPolicies/fastdds/dds/core/policy/QosPolicies.hpp @@ -30,13 +30,11 @@ namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class EDP; } // namespace rtps -} // namespace fastrtps -namespace fastdds { namespace dds { /** @@ -133,7 +131,7 @@ class QosPolicy virtual inline void clear() = 0; static uint32_t get_cdr_serialized_size( - const std::vector& data) + const std::vector& data) { // Size of data uint32_t data_size = static_cast(data.size()); @@ -151,7 +149,7 @@ class QosPolicy /** * Enum DurabilityQosPolicyKind_t, different kinds of durability for DurabilityQosPolicy. */ -typedef enum DurabilityQosPolicyKind : fastrtps::rtps::octet +typedef enum DurabilityQosPolicyKind : fastdds::rtps::octet { VOLATILE_DURABILITY_QOS, //!< Volatile Durability (default for Subscribers). TRANSIENT_LOCAL_DURABILITY_QOS, //!< Transient Local Durability (default for Publishers). @@ -187,15 +185,15 @@ class DurabilityQosPolicy : public Parameter_t, public QosPolicy /** * Translates kind to rtps layer equivalent */ - inline fastrtps::rtps::DurabilityKind_t durabilityKind() const + inline fastdds::rtps::DurabilityKind_t durabilityKind() const { switch (kind) { default: - case VOLATILE_DURABILITY_QOS: return fastrtps::rtps::VOLATILE; - case TRANSIENT_LOCAL_DURABILITY_QOS: return fastrtps::rtps::TRANSIENT_LOCAL; - case TRANSIENT_DURABILITY_QOS: return fastrtps::rtps::TRANSIENT; - case PERSISTENT_DURABILITY_QOS: return fastrtps::rtps::PERSISTENT; + case VOLATILE_DURABILITY_QOS: return fastdds::rtps::VOLATILE; + case TRANSIENT_LOCAL_DURABILITY_QOS: return fastdds::rtps::TRANSIENT_LOCAL; + case TRANSIENT_DURABILITY_QOS: return fastdds::rtps::TRANSIENT; + case PERSISTENT_DURABILITY_QOS: return fastdds::rtps::PERSISTENT; } } @@ -203,15 +201,15 @@ class DurabilityQosPolicy : public Parameter_t, public QosPolicy * Set kind from rtps layer equivalent */ inline void durabilityKind( - const fastrtps::rtps::DurabilityKind_t new_kind) + const fastdds::rtps::DurabilityKind_t new_kind) { switch (new_kind) { default: - case fastrtps::rtps::VOLATILE: kind = VOLATILE_DURABILITY_QOS; break; - case fastrtps::rtps::TRANSIENT_LOCAL: kind = TRANSIENT_LOCAL_DURABILITY_QOS; break; - case fastrtps::rtps::TRANSIENT: kind = TRANSIENT_DURABILITY_QOS; break; - case fastrtps::rtps::PERSISTENT: kind = PERSISTENT_DURABILITY_QOS; break; + case fastdds::rtps::VOLATILE: kind = VOLATILE_DURABILITY_QOS; break; + case fastdds::rtps::TRANSIENT_LOCAL: kind = TRANSIENT_LOCAL_DURABILITY_QOS; break; + case fastdds::rtps::TRANSIENT: kind = TRANSIENT_DURABILITY_QOS; break; + case fastdds::rtps::PERSISTENT: kind = PERSISTENT_DURABILITY_QOS; break; } } @@ -252,7 +250,7 @@ class DeadlineQosPolicy : public Parameter_t, public QosPolicy std::swap(*this, reset); } - fastrtps::Duration_t period; + fastdds::Duration_t period; }; /** @@ -283,13 +281,13 @@ class LatencyBudgetQosPolicy : public Parameter_t, public QosPolicy std::swap(*this, reset); } - fastrtps::Duration_t duration; + fastdds::Duration_t duration; }; /** * Enum LivelinessQosPolicyKind, different kinds of liveliness for LivelinessQosPolicy */ -typedef enum LivelinessQosPolicyKind : fastrtps::rtps::octet +typedef enum LivelinessQosPolicyKind : fastdds::rtps::octet { AUTOMATIC_LIVELINESS_QOS, //!< Automatic Liveliness, default value. MANUAL_BY_PARTICIPANT_LIVELINESS_QOS, //!< MANUAL_BY_PARTICIPANT_LIVELINESS_QOS @@ -317,8 +315,8 @@ class LivelinessQosPolicy : public Parameter_t, public QosPolicy , QosPolicy(true) , kind(AUTOMATIC_LIVELINESS_QOS) { - lease_duration = fastrtps::c_TimeInfinite; - announcement_period = fastrtps::c_TimeInfinite; + lease_duration = fastdds::c_TimeInfinite; + announcement_period = fastdds::c_TimeInfinite; } virtual FASTDDS_EXPORTED_API ~LivelinessQosPolicy() @@ -332,14 +330,14 @@ class LivelinessQosPolicy : public Parameter_t, public QosPolicy } LivelinessQosPolicyKind kind; - fastrtps::Duration_t lease_duration; - fastrtps::Duration_t announcement_period; + fastdds::Duration_t lease_duration; + fastdds::Duration_t announcement_period; }; /** * Enum ReliabilityQosPolicyKind, different kinds of reliability for ReliabilityQosPolicy. */ -typedef enum ReliabilityQosPolicyKind : fastrtps::rtps::octet +typedef enum ReliabilityQosPolicyKind : fastdds::rtps::octet { BEST_EFFORT_RELIABILITY_QOS = 0x01, //!< Best Effort reliability (default for Subscribers). RELIABLE_RELIABILITY_QOS = 0x02 //!< Reliable reliability (default for Publishers). @@ -377,7 +375,7 @@ class ReliabilityQosPolicy : public Parameter_t, public QosPolicy } ReliabilityQosPolicyKind kind; - fastrtps::Duration_t max_blocking_time; + fastdds::Duration_t max_blocking_time; }; @@ -385,7 +383,7 @@ class ReliabilityQosPolicy : public Parameter_t, public QosPolicy /** * Enum OwnershipQosPolicyKind, different kinds of ownership for OwnershipQosPolicy. */ -enum OwnershipQosPolicyKind : fastrtps::rtps::octet +enum OwnershipQosPolicyKind : fastdds::rtps::octet { SHARED_OWNERSHIP_QOS, //!< Shared Ownership, default value. EXCLUSIVE_OWNERSHIP_QOS //!< Exclusive ownership @@ -424,7 +422,7 @@ class OwnershipQosPolicy : public Parameter_t, public QosPolicy /** * Enum OwnershipQosPolicyKind, different kinds of destination order for DestinationOrderQosPolicy. */ -enum DestinationOrderQosPolicyKind : fastrtps::rtps::octet +enum DestinationOrderQosPolicyKind : fastdds::rtps::octet { BY_RECEPTION_TIMESTAMP_DESTINATIONORDER_QOS, //!< By Reception Timestamp, default value. BY_SOURCE_TIMESTAMP_DESTINATIONORDER_QOS //!< By Source Timestamp. @@ -467,9 +465,9 @@ class DestinationOrderQosPolicy : public Parameter_t, public QosPolicy * Class GenericDataQosPolicy, base class to transmit user data during the discovery phase. */ class GenericDataQosPolicy : public Parameter_t, public QosPolicy, - public fastrtps::ResourceLimitedVector + public fastdds::ResourceLimitedVector { - using ResourceLimitedOctetVector = fastrtps::ResourceLimitedVector; + using ResourceLimitedOctetVector = fastdds::ResourceLimitedVector; public: @@ -598,12 +596,12 @@ class GenericDataQosPolicy : public Parameter_t, public QosPolicy, { if (size > 0) { - configuration_ = fastrtps::ResourceLimitedContainerConfig::fixed_size_configuration(size); + configuration_ = fastdds::ResourceLimitedContainerConfig::fixed_size_configuration(size); collection_.reserve(configuration_.maximum); } else { - configuration_ = fastrtps::ResourceLimitedContainerConfig::dynamic_allocation_configuration(); + configuration_ = fastdds::ResourceLimitedContainerConfig::dynamic_allocation_configuration(); } } @@ -753,13 +751,13 @@ class TimeBasedFilterQosPolicy : public Parameter_t, public QosPolicy std::swap(*this, reset); } - fastrtps::Duration_t minimum_separation; + fastdds::Duration_t minimum_separation; }; /** * Enum PresentationQosPolicyAccessScopeKind, different kinds of Presentation Policy order for PresentationQosPolicy. */ -enum PresentationQosPolicyAccessScopeKind : fastrtps::rtps::octet +enum PresentationQosPolicyAccessScopeKind : fastdds::rtps::octet { INSTANCE_PRESENTATION_QOS, //!< Instance Presentation, default value. TOPIC_PRESENTATION_QOS, //!< Topic Presentation. @@ -812,7 +810,7 @@ class PresentationQosPolicy : public Parameter_t, public QosPolicy class PartitionQosPolicy : public Parameter_t, public QosPolicy { friend class ParameterList; - friend class fastrtps::rtps::EDP; + friend class fastdds::rtps::EDP; public: @@ -910,7 +908,7 @@ class PartitionQosPolicy : public Parameter_t, public QosPolicy /** * Enum HistoryQosPolicyKind, different kinds of History Qos for HistoryQosPolicy. */ -enum HistoryQosPolicyKind : fastrtps::rtps::octet +enum HistoryQosPolicyKind : fastdds::rtps::octet { KEEP_LAST_HISTORY_QOS, //!< Keep only a number of samples, default value. KEEP_ALL_HISTORY_QOS //!< Keep all samples until the ResourceLimitsQosPolicy are exhausted. @@ -1006,7 +1004,7 @@ class DurabilityServiceQosPolicy : public Parameter_t, public QosPolicy public: - fastrtps::Duration_t service_cleanup_delay; + fastdds::Duration_t service_cleanup_delay; HistoryQosPolicyKind history_kind; int32_t history_depth; int32_t max_samples; @@ -1049,7 +1047,7 @@ class LifespanQosPolicy : public Parameter_t, public QosPolicy FASTDDS_EXPORTED_API LifespanQosPolicy() : Parameter_t(PID_LIFESPAN, PARAMETER_TIME_LENGTH) , QosPolicy(true) - , duration(fastrtps::c_TimeInfinite) + , duration(fastdds::c_TimeInfinite) { } @@ -1063,7 +1061,7 @@ class LifespanQosPolicy : public Parameter_t, public QosPolicy std::swap(*this, reset); } - fastrtps::Duration_t duration; + fastdds::Duration_t duration; }; /** @@ -1132,7 +1130,7 @@ class TransportPriorityQosPolicy : public Parameter_t, public QosPolicy /** * Enum PublishModeQosPolicyKind, different kinds of publication synchronism */ -typedef enum PublishModeQosPolicyKind : fastrtps::rtps::octet +typedef enum PublishModeQosPolicyKind : fastdds::rtps::octet { SYNCHRONOUS_PUBLISH_MODE, //!< Synchronous publication mode (default for writers). ASYNCHRONOUS_PUBLISH_MODE //!< Asynchronous publication mode. diff --git a/test/mock/rtps/BuiltinProtocols/rtps/builtin/BuiltinProtocols.h b/test/mock/rtps/BuiltinProtocols/rtps/builtin/BuiltinProtocols.h index d02b3ad8b72..b911c59d17c 100644 --- a/test/mock/rtps/BuiltinProtocols/rtps/builtin/BuiltinProtocols.h +++ b/test/mock/rtps/BuiltinProtocols/rtps/builtin/BuiltinProtocols.h @@ -25,7 +25,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSParticipantImpl; @@ -67,7 +67,7 @@ class BuiltinProtocols }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _FASTDDS_RTPS_ENDPOINT_H_ diff --git a/test/mock/rtps/DataSharingPayloadPool/rtps/DataSharing/DataSharingPayloadPool.hpp b/test/mock/rtps/DataSharingPayloadPool/rtps/DataSharing/DataSharingPayloadPool.hpp index f24f0e62e0f..ecb20077dd7 100644 --- a/test/mock/rtps/DataSharingPayloadPool/rtps/DataSharing/DataSharingPayloadPool.hpp +++ b/test/mock/rtps/DataSharingPayloadPool/rtps/DataSharing/DataSharingPayloadPool.hpp @@ -24,7 +24,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class DataSharingPayloadPool : public IPayloadPool @@ -162,7 +162,7 @@ class DataSharingPayloadPool : public IPayloadPool } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // RTPS_HISTORY_DATASHARINGPAYLOADPOOL_HPP diff --git a/test/mock/rtps/DataSharingPayloadPool/rtps/DataSharing/ReaderPool.hpp b/test/mock/rtps/DataSharingPayloadPool/rtps/DataSharing/ReaderPool.hpp index 4577e99a36e..9798fc21ed8 100644 --- a/test/mock/rtps/DataSharingPayloadPool/rtps/DataSharing/ReaderPool.hpp +++ b/test/mock/rtps/DataSharingPayloadPool/rtps/DataSharing/ReaderPool.hpp @@ -24,7 +24,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class ReaderPool : public DataSharingPayloadPool @@ -34,7 +34,7 @@ class ReaderPool : public DataSharingPayloadPool }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // RTPS_DATASHARING_DATASHARINGPAYLOADPOOLIMPL_READERPOOL_HPP diff --git a/test/mock/rtps/EDP/rtps/builtin/discovery/endpoint/EDP.h b/test/mock/rtps/EDP/rtps/builtin/discovery/endpoint/EDP.h index 18ef14f614c..0e6f265fe27 100644 --- a/test/mock/rtps/EDP/rtps/builtin/discovery/endpoint/EDP.h +++ b/test/mock/rtps/EDP/rtps/builtin/discovery/endpoint/EDP.h @@ -28,7 +28,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class EDP @@ -41,52 +41,52 @@ class EDP } virtual bool initEDP( - eprosima::fastrtps::rtps::BuiltinAttributes&) + eprosima::fastdds::rtps::BuiltinAttributes&) { return true; } virtual void removeRemoteEndpoints( - eprosima::fastrtps::rtps::ParticipantProxyData*) + eprosima::fastdds::rtps::ParticipantProxyData*) { } virtual bool areRemoteEndpointsMatched( - const eprosima::fastrtps::rtps::ParticipantProxyData*) + const eprosima::fastdds::rtps::ParticipantProxyData*) { return true; } virtual bool removeLocalReader( - eprosima::fastrtps::rtps::RTPSReader*) + eprosima::fastdds::rtps::RTPSReader*) { return true; } virtual bool removeLocalWriter( - eprosima::fastrtps::rtps::RTPSWriter*) + eprosima::fastdds::rtps::RTPSWriter*) { return true; } virtual void assignRemoteEndpoints( - const eprosima::fastrtps::rtps::ParticipantProxyData&, + const eprosima::fastdds::rtps::ParticipantProxyData&, bool) { } virtual bool processLocalReaderProxyData( - eprosima::fastrtps::rtps::RTPSReader*, - eprosima::fastrtps::rtps::ReaderProxyData*) + eprosima::fastdds::rtps::RTPSReader*, + eprosima::fastdds::rtps::ReaderProxyData*) { return true; } virtual bool processLocalWriterProxyData( - eprosima::fastrtps::rtps::RTPSWriter*, - eprosima::fastrtps::rtps::WriterProxyData*) + eprosima::fastdds::rtps::RTPSWriter*, + eprosima::fastdds::rtps::WriterProxyData*) { return true; } @@ -114,15 +114,15 @@ class EDP const WriterProxyData& remote_writer_data)); virtual bool pairing_remote_writer_with_local_builtin_reader_after_security( - const eprosima::fastrtps::rtps::GUID_t&, - const eprosima::fastrtps::rtps::WriterProxyData&) + const eprosima::fastdds::rtps::GUID_t&, + const eprosima::fastdds::rtps::WriterProxyData&) { return true; } virtual bool pairing_remote_reader_with_local_builtin_writer_after_security( - const eprosima::fastrtps::rtps::GUID_t&, - const eprosima::fastrtps::rtps::ReaderProxyData&) + const eprosima::fastdds::rtps::GUID_t&, + const eprosima::fastdds::rtps::ReaderProxyData&) { return true; } @@ -131,7 +131,7 @@ class EDP }; } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _FASTDDS_RTPS_EDP_H_ diff --git a/test/mock/rtps/Endpoint/fastdds/rtps/Endpoint.h b/test/mock/rtps/Endpoint/fastdds/rtps/Endpoint.h index 676218f4db0..502dc75ee66 100644 --- a/test/mock/rtps/Endpoint/fastdds/rtps/Endpoint.h +++ b/test/mock/rtps/Endpoint/fastdds/rtps/Endpoint.h @@ -23,7 +23,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSParticipantImpl; @@ -61,7 +61,7 @@ class Endpoint }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _FASTDDS_RTPS_ENDPOINT_H_ diff --git a/test/mock/rtps/MessageReceiver/rtps/messages/MessageReceiver.h b/test/mock/rtps/MessageReceiver/rtps/messages/MessageReceiver.h index 466e564df7b..bbbe37b162e 100644 --- a/test/mock/rtps/MessageReceiver/rtps/messages/MessageReceiver.h +++ b/test/mock/rtps/MessageReceiver/rtps/messages/MessageReceiver.h @@ -29,7 +29,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSWriter; diff --git a/test/mock/rtps/NetworkFactory/rtps/network/NetworkFactory.h b/test/mock/rtps/NetworkFactory/rtps/network/NetworkFactory.h index 2ad6a7feb17..fb303d7f7b3 100644 --- a/test/mock/rtps/NetworkFactory/rtps/network/NetworkFactory.h +++ b/test/mock/rtps/NetworkFactory/rtps/network/NetworkFactory.h @@ -26,7 +26,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSParticipantAttributes; @@ -109,7 +109,7 @@ class NetworkFactory }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // ifndef _RTPS_NETWORK_NETWORKFACTORY_H_ diff --git a/test/mock/rtps/PDP/rtps/builtin/discovery/participant/PDP.h b/test/mock/rtps/PDP/rtps/builtin/discovery/participant/PDP.h index 292e098b35a..1342306a27d 100644 --- a/test/mock/rtps/PDP/rtps/builtin/discovery/participant/PDP.h +++ b/test/mock/rtps/PDP/rtps/builtin/discovery/participant/PDP.h @@ -38,7 +38,7 @@ struct IProxyObserver; } // namespace statistics } // namespace fastdds -namespace fastrtps { +namespace fastdds { namespace rtps { class PDP @@ -123,7 +123,7 @@ class PDP }; } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT_PDP_H_ diff --git a/test/mock/rtps/PDPSimple/rtps/builtin/discovery/participant/PDPSimple.h b/test/mock/rtps/PDPSimple/rtps/builtin/discovery/participant/PDPSimple.h index ddc15450aeb..4f02c5547c5 100644 --- a/test/mock/rtps/PDPSimple/rtps/builtin/discovery/participant/PDPSimple.h +++ b/test/mock/rtps/PDPSimple/rtps/builtin/discovery/participant/PDPSimple.h @@ -28,7 +28,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class PDPSimple @@ -50,7 +50,7 @@ class PDPSimple }; } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT_PDPSIMPLE_H_ diff --git a/test/mock/rtps/ParticipantProxyData/fastdds/rtps/builtin/data/ParticipantProxyData.hpp b/test/mock/rtps/ParticipantProxyData/fastdds/rtps/builtin/data/ParticipantProxyData.hpp index ed1c15b0f5d..55456217519 100644 --- a/test/mock/rtps/ParticipantProxyData/fastdds/rtps/builtin/data/ParticipantProxyData.hpp +++ b/test/mock/rtps/ParticipantProxyData/fastdds/rtps/builtin/data/ParticipantProxyData.hpp @@ -30,7 +30,7 @@ #endif // if HAVE_SECURITY namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class ParticipantProxyData @@ -78,7 +78,7 @@ class ParticipantProxyData }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _FASTDDS_RTPS_BUILTIN_DATA_PARTICIPANTPROXYDATA_HPP_ diff --git a/test/mock/rtps/RTPSDomain/fastdds/rtps/RTPSDomain.h b/test/mock/rtps/RTPSDomain/fastdds/rtps/RTPSDomain.h index 9f79402289c..32cee263adf 100644 --- a/test/mock/rtps/RTPSDomain/fastdds/rtps/RTPSDomain.h +++ b/test/mock/rtps/RTPSDomain/fastdds/rtps/RTPSDomain.h @@ -26,7 +26,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSParticipant; @@ -189,7 +189,7 @@ class RTPSDomain }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif /* _FASTDDS_RTPS_DOMAIN_H_*/ diff --git a/test/mock/rtps/RTPSDomainImpl/rtps/RTPSDomainImpl.hpp b/test/mock/rtps/RTPSDomainImpl/rtps/RTPSDomainImpl.hpp index 0d3cc01d841..d7becee4a44 100644 --- a/test/mock/rtps/RTPSDomainImpl/rtps/RTPSDomainImpl.hpp +++ b/test/mock/rtps/RTPSDomainImpl/rtps/RTPSDomainImpl.hpp @@ -22,7 +22,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class IChangePool; @@ -141,7 +141,7 @@ class RTPSDomainImpl }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _RTPS_RTPSDOMAINIMPL_HPP_ diff --git a/test/mock/rtps/RTPSGapBuilder/rtps/messages/RTPSGapBuilder.hpp b/test/mock/rtps/RTPSGapBuilder/rtps/messages/RTPSGapBuilder.hpp index 99897503459..cce1333aa3a 100644 --- a/test/mock/rtps/RTPSGapBuilder/rtps/messages/RTPSGapBuilder.hpp +++ b/test/mock/rtps/RTPSGapBuilder/rtps/messages/RTPSGapBuilder.hpp @@ -26,7 +26,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** @@ -90,7 +90,7 @@ class RTPSGapBuilder }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif /* RTPSGAPBUILDER_HPP */ diff --git a/test/mock/rtps/RTPSMessageGroup/rtps/messages/RTPSMessageGroup.hpp b/test/mock/rtps/RTPSMessageGroup/rtps/messages/RTPSMessageGroup.hpp index 6b45a53c377..503a9add256 100644 --- a/test/mock/rtps/RTPSMessageGroup/rtps/messages/RTPSMessageGroup.hpp +++ b/test/mock/rtps/RTPSMessageGroup/rtps/messages/RTPSMessageGroup.hpp @@ -25,7 +25,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSParticipantImpl; @@ -82,7 +82,7 @@ class RTPSMessageGroup }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _FASTDDS_RTPS_RTPSMESSAGEGROUP_H_ diff --git a/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.h b/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.h index e97476a4824..05db3168be4 100644 --- a/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.h +++ b/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.h @@ -53,9 +53,6 @@ class TypeLookupManager; } // namespace builtin } // namespace dds -} // namespace fastdds - -namespace fastrtps { class TopicAttributes; @@ -125,21 +122,21 @@ class FASTDDS_EXPORTED_API RTPSParticipant } bool fill_discovery_data_from_cdr_message( - fastrtps::rtps::ParticipantProxyData& /*data*/, + fastdds::rtps::ParticipantProxyData& /*data*/, fastdds::statistics::MonitorServiceStatusData& /*msg*/) { return true; } bool fill_discovery_data_from_cdr_message( - fastrtps::rtps::WriterProxyData& /*data*/, + fastdds::rtps::WriterProxyData& /*data*/, fastdds::statistics::MonitorServiceStatusData& /*msg*/) { return true; } bool fill_discovery_data_from_cdr_message( - fastrtps::rtps::ReaderProxyData& /*data*/, + fastdds::rtps::ReaderProxyData& /*data*/, fastdds::statistics::MonitorServiceStatusData& /*msg*/) { return true; @@ -256,7 +253,7 @@ class FASTDDS_EXPORTED_API RTPSParticipant }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif /* _FASTDDS_RTPS_RTPSParticipant_H_ */ diff --git a/test/mock/rtps/RTPSParticipantAttributes/fastdds/rtps/attributes/RTPSParticipantAttributes.h b/test/mock/rtps/RTPSParticipantAttributes/fastdds/rtps/attributes/RTPSParticipantAttributes.h index a5b6df2b4cb..db4947966c5 100644 --- a/test/mock/rtps/RTPSParticipantAttributes/fastdds/rtps/attributes/RTPSParticipantAttributes.h +++ b/test/mock/rtps/RTPSParticipantAttributes/fastdds/rtps/attributes/RTPSParticipantAttributes.h @@ -62,13 +62,11 @@ struct ParticipantType }; } // namespace rtps -} // namespace fastdds -namespace fastrtps { namespace rtps { //! PDP subclass choice -typedef enum DiscoveryProtocol +enum class DiscoveryProtocol { NONE, /*!< @@ -95,7 +93,7 @@ typedef enum DiscoveryProtocol SUPER_CLIENT /*!< The participant will behave as a client concerning all internal behaviour. Remote servers will treat it as a server and will share every discovery information. */ -} DiscoveryProtocol_t; +}; inline std::ostream& operator <<( std::ostream& output, @@ -131,13 +129,13 @@ inline std::ostream& operator <<( } //! Filtering flags when discovering participants -typedef enum ParticipantFilteringFlags : uint32_t +enum ParticipantFilteringFlags : uint32_t { NO_FILTER = 0, FILTER_DIFFERENT_HOST = 0x1, FILTER_DIFFERENT_PROCESS = 0x2, FILTER_SAME_PROCESS = 0x4 -} ParticipantFilteringFlags_t; +}; #define BUILTIN_DATA_MAX_SIZE 512 @@ -145,7 +143,7 @@ typedef enum ParticipantFilteringFlags : uint32_t class PDP; class BuiltinProtocols; -typedef struct _PDPFactory +typedef struct PDPFactory { // Pointer to the PDP creator PDP* (*CreatePDPInstance)(BuiltinProtocols*); @@ -154,7 +152,7 @@ typedef struct _PDPFactory PDP*); bool operator ==( - const struct _PDPFactory& e) const + const struct PDPFactory& e) const { return (CreatePDPInstance == e.CreatePDPInstance) && (ReleasePDPInstance == e.ReleasePDPInstance); @@ -237,7 +235,7 @@ class DiscoverySettings public: //! Chosen discovery protocol - DiscoveryProtocol_t discoveryProtocol = DiscoveryProtocol_t::SIMPLE; + DiscoveryProtocol discoveryProtocol = DiscoveryProtocol::SIMPLE; /** * If set to true, SimpleEDP would be used. @@ -281,7 +279,7 @@ class DiscoverySettings eprosima::fastdds::rtps::RemoteServerList_t m_DiscoveryServers; //! Filtering participants out depending on location - ParticipantFilteringFlags_t ignoreParticipantFlags = ParticipantFilteringFlags::NO_FILTER; + ParticipantFilteringFlags ignoreParticipantFlags = ParticipantFilteringFlags::NO_FILTER; DiscoverySettings() = default; @@ -633,7 +631,7 @@ class RTPSParticipantAttributes }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _FASTDDS_RTPSPARTICIPANTPARAMETERS_H_ diff --git a/test/mock/rtps/RTPSParticipantImpl/rtps/participant/RTPSParticipantImpl.h b/test/mock/rtps/RTPSParticipantImpl/rtps/participant/RTPSParticipantImpl.h index 1810ecc0f52..918e441a15b 100644 --- a/test/mock/rtps/RTPSParticipantImpl/rtps/participant/RTPSParticipantImpl.h +++ b/test/mock/rtps/RTPSParticipantImpl/rtps/participant/RTPSParticipantImpl.h @@ -42,7 +42,7 @@ namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class Endpoint; @@ -150,7 +150,7 @@ class RTPSParticipantImpl MOCK_METHOD1(check_type, bool(std::string)); MOCK_METHOD2(on_entity_discovery, - void(const fastrtps::rtps::GUID_t&, const fastdds::dds::ParameterPropertyList_t&)); + void(const fastdds::rtps::GUID_t&, const fastdds::dds::ParameterPropertyList_t&)); // *INDENT-OFF* Uncrustify makes a mess with MOCK_METHOD macros MOCK_METHOD6(createWriter_mock, @@ -440,7 +440,7 @@ class RTPSParticipantImpl }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _RTPS_PARTICIPANT_RTPSPARTICIPANTIMPL_H_ diff --git a/test/mock/rtps/RTPSReader/fastdds/rtps/reader/RTPSReader.h b/test/mock/rtps/RTPSReader/fastdds/rtps/reader/RTPSReader.h index 01b7ba8cb67..292bd11f162 100644 --- a/test/mock/rtps/RTPSReader/fastdds/rtps/reader/RTPSReader.h +++ b/test/mock/rtps/RTPSReader/fastdds/rtps/reader/RTPSReader.h @@ -30,7 +30,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class ResourceEvent; @@ -137,7 +137,7 @@ class RTPSReader : public Endpoint MOCK_METHOD1(set_content_filter, void (eprosima::fastdds::rtps::IReaderDataFilter* filter)); - MOCK_METHOD1(wait_for_unread_cache, bool (const eprosima::fastrtps::Duration_t& timeout)); + MOCK_METHOD1(wait_for_unread_cache, bool (const eprosima::fastdds::Duration_t& timeout)); MOCK_CONST_METHOD0(get_unread_count, uint64_t()); @@ -158,7 +158,7 @@ class RTPSReader : public Endpoint }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _FASTDDS_RTPS_READER_RTPSREADER_H_ diff --git a/test/mock/rtps/RTPSReader/rtps/reader/BaseReader.hpp b/test/mock/rtps/RTPSReader/rtps/reader/BaseReader.hpp index 276f45fe890..1655c5ba6b4 100644 --- a/test/mock/rtps/RTPSReader/rtps/reader/BaseReader.hpp +++ b/test/mock/rtps/RTPSReader/rtps/reader/BaseReader.hpp @@ -32,7 +32,7 @@ namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { struct CacheChange_t; @@ -44,61 +44,61 @@ class WriterProxy; class WriterProxyData; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds namespace fastdds { namespace rtps { -class BaseReader : public fastrtps::rtps::RTPSReader +class BaseReader : public fastdds::rtps::RTPSReader { public: BaseReader() - : fastrtps::rtps::RTPSReader() + : fastdds::rtps::RTPSReader() { } BaseReader( - fastrtps::rtps::ReaderHistory* history, - fastrtps::RecursiveTimedMutex* mutex) - : fastrtps::rtps::RTPSReader(history, mutex) + fastdds::rtps::ReaderHistory* history, + fastdds::RecursiveTimedMutex* mutex) + : fastdds::rtps::RTPSReader(history, mutex) { } virtual ~BaseReader() = default; static BaseReader* downcast( - fastrtps::rtps::RTPSReader* reader) + fastdds::rtps::RTPSReader* reader) { return static_cast(reader); } static BaseReader* downcast( - fastrtps::rtps::Endpoint* endpoint) + fastdds::rtps::Endpoint* endpoint) { return static_cast(endpoint); } - fastrtps::rtps::ReaderListener* get_listener() const override + fastdds::rtps::ReaderListener* get_listener() const override { return listener_; } virtual bool set_listener( - fastrtps::rtps::ReaderListener* listener) override + fastdds::rtps::ReaderListener* listener) override { listener_ = listener; return true; } virtual bool process_data_msg( - fastrtps::rtps::CacheChange_t*) + fastdds::rtps::CacheChange_t*) { return true; } virtual bool process_data_frag_msg( - fastrtps::rtps::CacheChange_t*, + fastdds::rtps::CacheChange_t*, uint32_t, uint32_t, uint16_t) @@ -107,10 +107,10 @@ class BaseReader : public fastrtps::rtps::RTPSReader } virtual bool process_heartbeat_msg( - const fastrtps::rtps::GUID_t&, + const fastdds::rtps::GUID_t&, uint32_t, - const fastrtps::rtps::SequenceNumber_t&, - const fastrtps::rtps::SequenceNumber_t&, + const fastdds::rtps::SequenceNumber_t&, + const fastdds::rtps::SequenceNumber_t&, bool, bool) { @@ -118,44 +118,44 @@ class BaseReader : public fastrtps::rtps::RTPSReader } virtual bool process_gap_msg( - const fastrtps::rtps::GUID_t&, - const fastrtps::rtps::SequenceNumber_t&, - const fastrtps::rtps::SequenceNumberSet_t&) + const fastdds::rtps::GUID_t&, + const fastdds::rtps::SequenceNumber_t&, + const fastdds::rtps::SequenceNumberSet_t&) { return true; } virtual bool change_removed_by_history( - fastrtps::rtps::CacheChange_t*, - fastrtps::rtps::WriterProxy*) + fastdds::rtps::CacheChange_t*, + fastdds::rtps::WriterProxy*) { return true; } virtual bool begin_sample_access_nts( - fastrtps::rtps::CacheChange_t* /*change*/, - fastrtps::rtps::WriterProxy*& /*wp*/, + fastdds::rtps::CacheChange_t* /*change*/, + fastdds::rtps::WriterProxy*& /*wp*/, bool& /*is_future_change*/) { return true; } virtual void end_sample_access_nts( - fastrtps::rtps::CacheChange_t* /*change*/, - fastrtps::rtps::WriterProxy*& /*wp*/, + fastdds::rtps::CacheChange_t* /*change*/, + fastdds::rtps::WriterProxy*& /*wp*/, bool /*mark_as_read*/) { } // *INDENT-OFF* Uncrustify makes a mess with MOCK_METHOD macros - MOCK_METHOD1(change_removed_by_history, bool(fastrtps::rtps::CacheChange_t* change)); + MOCK_METHOD1(change_removed_by_history, bool(fastdds::rtps::CacheChange_t* change)); - MOCK_METHOD2(reserve_cache, bool(uint32_t, fastrtps::rtps::CacheChange_t*&)); + MOCK_METHOD2(reserve_cache, bool(uint32_t, fastdds::rtps::CacheChange_t*&)); - MOCK_METHOD1(release_cache, void(fastrtps::rtps::CacheChange_t* a_change)); + MOCK_METHOD1(release_cache, void(fastdds::rtps::CacheChange_t* a_change)); // *INDENT-ON* - fastrtps::rtps::ReaderListener* listener_; + fastdds::rtps::ReaderListener* listener_; }; diff --git a/test/mock/rtps/RTPSWriter/fastdds/rtps/writer/RTPSWriter.h b/test/mock/rtps/RTPSWriter/fastdds/rtps/writer/RTPSWriter.h index e8418c45a44..b827df7d005 100644 --- a/test/mock/rtps/RTPSWriter/fastdds/rtps/writer/RTPSWriter.h +++ b/test/mock/rtps/RTPSWriter/fastdds/rtps/writer/RTPSWriter.h @@ -36,7 +36,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class WriterHistory; @@ -291,7 +291,7 @@ class RTPSWriter : public Endpoint }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _FASTDDS_RTPS_RTPSWRITER_H_ diff --git a/test/mock/rtps/ReaderHistory/fastdds/rtps/history/ReaderHistory.h b/test/mock/rtps/ReaderHistory/fastdds/rtps/history/ReaderHistory.h index 005c7447f61..80d65aa224a 100644 --- a/test/mock/rtps/ReaderHistory/fastdds/rtps/history/ReaderHistory.h +++ b/test/mock/rtps/ReaderHistory/fastdds/rtps/history/ReaderHistory.h @@ -29,7 +29,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSReader; @@ -218,7 +218,7 @@ class ReaderHistory }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _FASTDDS_RTPS_READERHISTORY_H_ diff --git a/test/mock/rtps/ReaderLocator/rtps/writer/ReaderLocator.hpp b/test/mock/rtps/ReaderLocator/rtps/writer/ReaderLocator.hpp index 7347b39a32d..20c3bd13a1a 100644 --- a/test/mock/rtps/ReaderLocator/rtps/writer/ReaderLocator.hpp +++ b/test/mock/rtps/ReaderLocator/rtps/writer/ReaderLocator.hpp @@ -28,7 +28,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSParticipantImpl; @@ -253,7 +253,7 @@ class ReaderLocator : public RTPSMessageSenderInterface }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif // RTPS_WRITER__READERLOCATOR_HPP diff --git a/test/mock/rtps/ReaderProxyData/fastdds/rtps/builtin/data/ReaderProxyData.h b/test/mock/rtps/ReaderProxyData/fastdds/rtps/builtin/data/ReaderProxyData.h index df407d1fd51..f76bf9ce8a9 100644 --- a/test/mock/rtps/ReaderProxyData/fastdds/rtps/builtin/data/ReaderProxyData.h +++ b/test/mock/rtps/ReaderProxyData/fastdds/rtps/builtin/data/ReaderProxyData.h @@ -34,7 +34,7 @@ #endif // if HAVE_SECURITY namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class NetworkFactory; @@ -353,7 +353,7 @@ class ReaderProxyData }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _FASTDDS_RTPS_BUILTIN_DATA_READERPROXYDATA_H_ diff --git a/test/mock/rtps/ReceiverResource/rtps/network/ReceiverResource.h b/test/mock/rtps/ReceiverResource/rtps/network/ReceiverResource.h index 7a38c48af2c..68ae5b40d9b 100644 --- a/test/mock/rtps/ReceiverResource/rtps/network/ReceiverResource.h +++ b/test/mock/rtps/ReceiverResource/rtps/network/ReceiverResource.h @@ -23,7 +23,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSWriter; @@ -139,7 +139,7 @@ class ReceiverResource : public fastdds::rtps::TransportReceiverInterface }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // ifndef _FASTDDS_RTPS_RECEIVER_RESOURCE_H diff --git a/test/mock/rtps/ResourceEvent/rtps/resources/ResourceEvent.h b/test/mock/rtps/ResourceEvent/rtps/resources/ResourceEvent.h index 045fa90d3e3..114d890e853 100644 --- a/test/mock/rtps/ResourceEvent/rtps/resources/ResourceEvent.h +++ b/test/mock/rtps/ResourceEvent/rtps/resources/ResourceEvent.h @@ -23,7 +23,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class TimedEventImpl; @@ -50,7 +50,7 @@ class ResourceEvent }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif //_FASTDDS_RTPS_RESOURCES_RESOURCEEVENT_H_ diff --git a/test/mock/rtps/SecurityManager/rtps/security/SecurityManager.h b/test/mock/rtps/SecurityManager/rtps/security/SecurityManager.h index ef996c4b1ad..92f5c0de9c7 100644 --- a/test/mock/rtps/SecurityManager/rtps/security/SecurityManager.h +++ b/test/mock/rtps/SecurityManager/rtps/security/SecurityManager.h @@ -24,7 +24,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -73,14 +73,14 @@ class SecurityManager MOCK_METHOD1(remove_participant, void(const ParticipantProxyData& participant_data)); - MOCK_CONST_METHOD0(builtin_endpoints, fastrtps::rtps::BuiltinEndpointSet_t()); + MOCK_CONST_METHOD0(builtin_endpoints, fastdds::rtps::BuiltinEndpointSet_t()); // *INDENT-ON* }; } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _RTPS_SECURITY_SECURITYMANAGER_H_ diff --git a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAccessControlPlugin.h b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAccessControlPlugin.h index bdf746a5d64..0b8358b26ba 100644 --- a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAccessControlPlugin.h +++ b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAccessControlPlugin.h @@ -27,7 +27,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -148,7 +148,7 @@ class MockAccessControlPlugin : public AccessControl } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _SECURITY_MOCKACCESSCONTROLPLUGIN_H_ diff --git a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAuthenticationPlugin.h b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAuthenticationPlugin.h index f41d7c8bcd8..042ffbcf938 100644 --- a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAuthenticationPlugin.h +++ b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAuthenticationPlugin.h @@ -31,7 +31,7 @@ #pragma warning(disable : 4373) namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -181,7 +181,7 @@ class MockAuthenticationPlugin : public Authentication } // namespace security } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #pragma warning(pop) diff --git a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptoKeyExchange.h b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptoKeyExchange.h index 516c4dd0a15..68a7f11a424 100644 --- a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptoKeyExchange.h +++ b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptoKeyExchange.h @@ -24,7 +24,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -80,7 +80,7 @@ class MockCryptoKeyExchange : public CryptoKeyExchange } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif //_RTPS_SECURITY_MOCKCRYPTOKEYEXCHANGE_H_ diff --git a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptoKeyFactory.h b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptoKeyFactory.h index 89c36275d86..28bf05034c4 100644 --- a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptoKeyFactory.h +++ b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptoKeyFactory.h @@ -29,7 +29,7 @@ #pragma warning(disable : 4373) namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -118,7 +118,7 @@ class MockCryptoKeyFactory : public CryptoKeyFactory } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #pragma warning(pop) diff --git a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptoTransform.h b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptoTransform.h index 25c81eefe6a..895727b3149 100644 --- a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptoTransform.h +++ b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptoTransform.h @@ -24,7 +24,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -124,7 +124,7 @@ class MockCryptoTransform : public CryptoTransform } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif //_RTPS_SECURITY_MOCKCRYPTOTRANSFORM_H_ diff --git a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptographyPlugin.h b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptographyPlugin.h index 880fb5d8827..f1f453d3bfe 100644 --- a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptographyPlugin.h +++ b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptographyPlugin.h @@ -26,7 +26,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -56,7 +56,7 @@ class MockCryptographyPlugin : public Cryptography } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _RTPS_SECURITY_MOCKCRYPTOGRAPHYPLUGIN_H_ diff --git a/test/mock/rtps/SecurityPluginFactory/rtps/security/SecurityPluginFactory.cpp b/test/mock/rtps/SecurityPluginFactory/rtps/security/SecurityPluginFactory.cpp index 3c517796dfb..9ab1ff3fae6 100644 --- a/test/mock/rtps/SecurityPluginFactory/rtps/security/SecurityPluginFactory.cpp +++ b/test/mock/rtps/SecurityPluginFactory/rtps/security/SecurityPluginFactory.cpp @@ -18,8 +18,8 @@ #include "SecurityPluginFactory.h" -using namespace eprosima::fastrtps::rtps; -using namespace eprosima::fastrtps::rtps::security; +using namespace eprosima::fastdds::rtps; +using namespace eprosima::fastdds::rtps::security; Authentication* SecurityPluginFactory::auth_plugin_ = nullptr; @@ -29,84 +29,92 @@ Cryptography* SecurityPluginFactory::crypto_plugin_ = nullptr; Logging* SecurityPluginFactory::logging_plugin_ = nullptr; -Authentication* SecurityPluginFactory::create_authentication_plugin(const PropertyPolicy& /*property_policy*/) +Authentication* SecurityPluginFactory::create_authentication_plugin( + const PropertyPolicy& /*property_policy*/) { Authentication* ret = auth_plugin_; auth_plugin_ = nullptr; return ret; } -void SecurityPluginFactory::set_auth_plugin(Authentication* plugin) +void SecurityPluginFactory::set_auth_plugin( + Authentication* plugin) { auth_plugin_ = plugin; } void SecurityPluginFactory::release_auth_plugin() { - if(auth_plugin_ != nullptr) + if (auth_plugin_ != nullptr) { delete auth_plugin_; auth_plugin_ = nullptr; } } -AccessControl* SecurityPluginFactory::create_access_control_plugin(const PropertyPolicy& /*property_policy*/) +AccessControl* SecurityPluginFactory::create_access_control_plugin( + const PropertyPolicy& /*property_policy*/) { AccessControl* ret = access_plugin_; access_plugin_ = nullptr; return ret; } -void SecurityPluginFactory::set_access_control_plugin(AccessControl* plugin) +void SecurityPluginFactory::set_access_control_plugin( + AccessControl* plugin) { access_plugin_ = plugin; } void SecurityPluginFactory::release_access_control_plugin() { - if(access_plugin_ != nullptr) + if (access_plugin_ != nullptr) { delete access_plugin_; access_plugin_ = nullptr; } } -Cryptography* SecurityPluginFactory::create_cryptography_plugin(const PropertyPolicy& /*property_policy*/) +Cryptography* SecurityPluginFactory::create_cryptography_plugin( + const PropertyPolicy& /*property_policy*/) { Cryptography* ret = crypto_plugin_; crypto_plugin_ = nullptr; return ret; } -void SecurityPluginFactory::set_crypto_plugin(Cryptography* plugin) +void SecurityPluginFactory::set_crypto_plugin( + Cryptography* plugin) { crypto_plugin_ = plugin; } void SecurityPluginFactory::release_crypto_plugin() { - if(crypto_plugin_ != nullptr) + if (crypto_plugin_ != nullptr) { delete crypto_plugin_; crypto_plugin_ = nullptr; } } -Logging* SecurityPluginFactory::create_logging_plugin(const PropertyPolicy& /*property_policy*/) +Logging* SecurityPluginFactory::create_logging_plugin( + const PropertyPolicy& /*property_policy*/) { Logging* ret = logging_plugin_; logging_plugin_ = nullptr; return ret; } -void SecurityPluginFactory::set_logging_plugin(Logging* plugin) +void SecurityPluginFactory::set_logging_plugin( + Logging* plugin) { logging_plugin_ = plugin; } void SecurityPluginFactory::release_logging_plugin() { - if(logging_plugin_ != nullptr) + if (logging_plugin_ != nullptr) { delete logging_plugin_; logging_plugin_ = nullptr; diff --git a/test/mock/rtps/SecurityPluginFactory/rtps/security/SecurityPluginFactory.h b/test/mock/rtps/SecurityPluginFactory/rtps/security/SecurityPluginFactory.h index 7d792be983a..00e5e08b80e 100644 --- a/test/mock/rtps/SecurityPluginFactory/rtps/security/SecurityPluginFactory.h +++ b/test/mock/rtps/SecurityPluginFactory/rtps/security/SecurityPluginFactory.h @@ -26,7 +26,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace security { @@ -79,7 +79,7 @@ class SecurityPluginFactory : public ISecurityPluginFactory } //namespace security } //namespace rtps -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // _RTPS_SECURITY_SECURITYPLUGINFACTORY_H_ diff --git a/test/mock/rtps/ServerAttributes/fastdds/rtps/attributes/ServerAttributes.h b/test/mock/rtps/ServerAttributes/fastdds/rtps/attributes/ServerAttributes.h index 0fdcf8598f7..c2b2b1800a4 100644 --- a/test/mock/rtps/ServerAttributes/fastdds/rtps/attributes/ServerAttributes.h +++ b/test/mock/rtps/ServerAttributes/fastdds/rtps/attributes/ServerAttributes.h @@ -77,15 +77,6 @@ std::basic_ostream& operator <<( } // namespace rtps } // namespace fastdds - -namespace fastrtps { -namespace rtps { - -using fastdds::rtps::RemoteServerList_t; -using fastdds::rtps::ros_super_client_env; - -} // namespace rtps -} // namespace fastrtps } // namespace eprosima #endif /* _FASTDDS_SERVERATTRIBUTES_H_ */ diff --git a/test/mock/rtps/StatefulReader/rtps/reader/StatefulReader.hpp b/test/mock/rtps/StatefulReader/rtps/reader/StatefulReader.hpp index b0fa9b97e00..7f0eea69813 100644 --- a/test/mock/rtps/StatefulReader/rtps/reader/StatefulReader.hpp +++ b/test/mock/rtps/StatefulReader/rtps/reader/StatefulReader.hpp @@ -28,7 +28,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSMessageGroup_t; @@ -123,7 +123,7 @@ class StatefulReader : public fastdds::rtps::BaseReader }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // RTPS_READER__STATEFULREADER_HPP diff --git a/test/mock/rtps/StatefulWriter/rtps/writer/StatefulWriter.hpp b/test/mock/rtps/StatefulWriter/rtps/writer/StatefulWriter.hpp index e34b8eaca7a..53adefdf6ba 100644 --- a/test/mock/rtps/StatefulWriter/rtps/writer/StatefulWriter.hpp +++ b/test/mock/rtps/StatefulWriter/rtps/writer/StatefulWriter.hpp @@ -24,7 +24,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSParticipantImpl; @@ -126,7 +126,7 @@ class StatefulWriter : public RTPSWriter }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // RTPS_WRITER__STATEFULWRITER_HPP diff --git a/test/mock/rtps/StatelessReader/rtps/reader/StatelessReader.hpp b/test/mock/rtps/StatelessReader/rtps/reader/StatelessReader.hpp index e42e6e85157..a6de57a6065 100644 --- a/test/mock/rtps/StatelessReader/rtps/reader/StatelessReader.hpp +++ b/test/mock/rtps/StatelessReader/rtps/reader/StatelessReader.hpp @@ -22,7 +22,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class StatelessReader : public fastdds::rtps::BaseReader @@ -52,7 +52,7 @@ class StatelessReader : public fastdds::rtps::BaseReader }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // RTPS_READER__STATELESSREADER_HPP diff --git a/test/mock/rtps/StatelessWriter/rtps/writer/StatelessWriter.hpp b/test/mock/rtps/StatelessWriter/rtps/writer/StatelessWriter.hpp index 68ffa54361e..a243a2cd9a3 100644 --- a/test/mock/rtps/StatelessWriter/rtps/writer/StatelessWriter.hpp +++ b/test/mock/rtps/StatelessWriter/rtps/writer/StatelessWriter.hpp @@ -22,7 +22,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSParticipantImpl; @@ -58,7 +58,7 @@ class StatelessWriter : public RTPSWriter }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _FASTDDS_RTPS_STATELESSWRITER_H_ diff --git a/test/mock/rtps/TCPv4TransportDescriptor/fastdds/rtps/transport/TCPv4TransportDescriptor.h b/test/mock/rtps/TCPv4TransportDescriptor/fastdds/rtps/transport/TCPv4TransportDescriptor.h index ae96df7f789..6b4efa4bf71 100644 --- a/test/mock/rtps/TCPv4TransportDescriptor/fastdds/rtps/transport/TCPv4TransportDescriptor.h +++ b/test/mock/rtps/TCPv4TransportDescriptor/fastdds/rtps/transport/TCPv4TransportDescriptor.h @@ -38,13 +38,13 @@ typedef struct TCPv4TransportDescriptor : public TCPTransportDescriptor return nullptr; } - eprosima::fastrtps::rtps::octet wan_addr[4]; + eprosima::fastdds::rtps::octet wan_addr[4]; void set_WAN_address( - eprosima::fastrtps::rtps::octet o1, - eprosima::fastrtps::rtps::octet o2, - eprosima::fastrtps::rtps::octet o3, - eprosima::fastrtps::rtps::octet o4) + eprosima::fastdds::rtps::octet o1, + eprosima::fastdds::rtps::octet o2, + eprosima::fastdds::rtps::octet o3, + eprosima::fastdds::rtps::octet o4) { wan_addr[0] = o1; wan_addr[1] = o2; @@ -59,10 +59,10 @@ typedef struct TCPv4TransportDescriptor : public TCPTransportDescriptor int a, b, c, d; //to store the 4 ints char ch; //to temporarily store the '.' ss >> a >> ch >> b >> ch >> c >> ch >> d; - wan_addr[0] = (eprosima::fastrtps::rtps::octet)a; - wan_addr[1] = (eprosima::fastrtps::rtps::octet)b; - wan_addr[2] = (eprosima::fastrtps::rtps::octet)c; - wan_addr[3] = (eprosima::fastrtps::rtps::octet)d; + wan_addr[0] = (eprosima::fastdds::rtps::octet)a; + wan_addr[1] = (eprosima::fastdds::rtps::octet)b; + wan_addr[2] = (eprosima::fastdds::rtps::octet)c; + wan_addr[3] = (eprosima::fastdds::rtps::octet)d; } FASTDDS_EXPORTED_API TCPv4TransportDescriptor() diff --git a/test/mock/rtps/TimedEvent/rtps/resources/TimedEvent.h b/test/mock/rtps/TimedEvent/rtps/resources/TimedEvent.h index f13d449b03d..1f0521938a6 100644 --- a/test/mock/rtps/TimedEvent/rtps/resources/TimedEvent.h +++ b/test/mock/rtps/TimedEvent/rtps/resources/TimedEvent.h @@ -22,7 +22,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class ResourceEvent; @@ -49,7 +49,7 @@ class TimedEvent }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _FASTDDS_RTPS_RESOURCES_TIMEDEVENT_H_ diff --git a/test/mock/rtps/TopicPayloadPoolProxy/rtps/history/TopicPayloadPoolRegistry_impl/TopicPayloadPoolProxy.hpp b/test/mock/rtps/TopicPayloadPoolProxy/rtps/history/TopicPayloadPoolRegistry_impl/TopicPayloadPoolProxy.hpp index c57b4a0f0e7..c8fa7b5efe0 100644 --- a/test/mock/rtps/TopicPayloadPoolProxy/rtps/history/TopicPayloadPoolRegistry_impl/TopicPayloadPoolProxy.hpp +++ b/test/mock/rtps/TopicPayloadPoolProxy/rtps/history/TopicPayloadPoolRegistry_impl/TopicPayloadPoolProxy.hpp @@ -25,7 +25,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { namespace detail { @@ -139,7 +139,7 @@ class TopicPayloadPoolProxy : public ITopicPayloadPool } // namespace detail } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // RTPS_HISTORY_TOPICPAYLOADPOOLREGISTRY_IMPL_TOPICPAYLOADPOOLPROXY_HPP diff --git a/test/mock/rtps/TypeLookupManager/fastdds/builtin/type_lookup_service/TypeLookupManager.hpp b/test/mock/rtps/TypeLookupManager/fastdds/builtin/type_lookup_service/TypeLookupManager.hpp index a6c6da79944..6091979fbb5 100644 --- a/test/mock/rtps/TypeLookupManager/fastdds/builtin/type_lookup_service/TypeLookupManager.hpp +++ b/test/mock/rtps/TypeLookupManager/fastdds/builtin/type_lookup_service/TypeLookupManager.hpp @@ -26,7 +26,7 @@ namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class BuiltinProtocols; @@ -38,13 +38,11 @@ class ParticipantProxyData; class WriterHistory; } // namespace rtps -} // namespace fastrtps -namespace fastdds { namespace dds { namespace builtin { -extern const fastrtps::rtps::SampleIdentity INVALID_SAMPLE_IDENTITY; +extern const fastdds::rtps::SampleIdentity INVALID_SAMPLE_IDENTITY; /** * Class TypeLookupManager that implements the TypeLookup Service described in the DDS-XTYPES 1.2 specification. @@ -66,14 +64,14 @@ class TypeLookupManager { } - MOCK_CONST_METHOD1(get_type_dependencies, fastrtps::rtps::SampleIdentity( + MOCK_CONST_METHOD1(get_type_dependencies, fastdds::rtps::SampleIdentity( const fastdds::dds::xtypes::TypeIdentifierSeq&)); - MOCK_CONST_METHOD1(get_types, fastrtps::rtps::SampleIdentity( + MOCK_CONST_METHOD1(get_types, fastdds::rtps::SampleIdentity( const fastdds::dds::xtypes::TypeIdentifierSeq&)); void remove_remote_endpoints( - fastrtps::rtps::ParticipantProxyData* pdata) + fastdds::rtps::ParticipantProxyData* pdata) { static_cast(pdata); } diff --git a/test/mock/rtps/WLP/rtps/builtin/liveliness/WLP.hpp b/test/mock/rtps/WLP/rtps/builtin/liveliness/WLP.hpp index 3ac0d688dce..5cf84152af8 100644 --- a/test/mock/rtps/WLP/rtps/builtin/liveliness/WLP.hpp +++ b/test/mock/rtps/WLP/rtps/builtin/liveliness/WLP.hpp @@ -29,7 +29,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class BuiltinProtocols; @@ -67,7 +67,7 @@ class WLP }; } /* namespace rtps */ -} /* namespace fastrtps */ +} /* namespace fastdds */ } /* namespace eprosima */ #endif /* _FASTDDS_RTPS_WLP_HPP_ */ diff --git a/test/mock/rtps/WriterHistory/fastdds/rtps/history/WriterHistory.h b/test/mock/rtps/WriterHistory/fastdds/rtps/history/WriterHistory.h index a592db24949..c78e55e3ff3 100644 --- a/test/mock/rtps/WriterHistory/fastdds/rtps/history/WriterHistory.h +++ b/test/mock/rtps/WriterHistory/fastdds/rtps/history/WriterHistory.h @@ -29,7 +29,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class ReaderProxy; @@ -145,13 +145,13 @@ class WriterHistory } virtual bool remove_change_g( - fastrtps::rtps::CacheChange_t* a_change) + fastdds::rtps::CacheChange_t* a_change) { return remove_change(a_change); } virtual bool remove_change_g( - fastrtps::rtps::CacheChange_t* a_change, + fastdds::rtps::CacheChange_t* a_change, const std::chrono::time_point& max_blocking_time) { return remove_change(a_change, max_blocking_time); @@ -215,7 +215,7 @@ class WriterHistory }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _FASTDDS_RTPS_WRITERHISTORY_H_ diff --git a/test/mock/rtps/WriterProxyData/fastdds/rtps/builtin/data/WriterProxyData.h b/test/mock/rtps/WriterProxyData/fastdds/rtps/builtin/data/WriterProxyData.h index 99fcd6b5cb4..878c68f9161 100644 --- a/test/mock/rtps/WriterProxyData/fastdds/rtps/builtin/data/WriterProxyData.h +++ b/test/mock/rtps/WriterProxyData/fastdds/rtps/builtin/data/WriterProxyData.h @@ -33,7 +33,7 @@ #endif // if HAVE_SECURITY namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class NetworkFactory; @@ -324,7 +324,7 @@ class WriterProxyData }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // _FASTDDS_RTPS_BUILTIN_DATA_WRITERPROXYDATA_H_ diff --git a/test/mock/rtps/XMLEndPointParser/xmlparser/XMLEndpointParser.h b/test/mock/rtps/XMLEndPointParser/xmlparser/XMLEndpointParser.h index f3e698e932b..038d54336aa 100644 --- a/test/mock/rtps/XMLEndPointParser/xmlparser/XMLEndpointParser.h +++ b/test/mock/rtps/XMLEndPointParser/xmlparser/XMLEndpointParser.h @@ -24,7 +24,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace xmlparser { /** diff --git a/test/mock/rtps/XMLProfileManager/xmlparser/XMLProfileManager.h b/test/mock/rtps/XMLProfileManager/xmlparser/XMLProfileManager.h index d74348f2dfc..9f22c7c4565 100644 --- a/test/mock/rtps/XMLProfileManager/xmlparser/XMLProfileManager.h +++ b/test/mock/rtps/XMLProfileManager/xmlparser/XMLProfileManager.h @@ -18,7 +18,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace xmlparser { class XMLProfileManager @@ -34,7 +34,7 @@ class XMLProfileManager }; } // namespace xmlparser -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif // XML_PROFILE_MANAGER_H_ diff --git a/test/mock/rtps/external_locators/rtps/network/utils/external_locators.hpp b/test/mock/rtps/external_locators/rtps/network/utils/external_locators.hpp index d238c92a18a..50808ba197d 100644 --- a/test/mock/rtps/external_locators/rtps/network/utils/external_locators.hpp +++ b/test/mock/rtps/external_locators/rtps/network/utils/external_locators.hpp @@ -32,11 +32,6 @@ namespace rtps { namespace network { namespace external_locators { -using eprosima::fastrtps::rtps::LocatorSelectorEntry; -using eprosima::fastrtps::rtps::ParticipantProxyData; -using eprosima::fastrtps::rtps::ReaderProxyData; -using eprosima::fastrtps::rtps::WriterProxyData; - /** * Sets the external locators entry for externality index 0 to a list of listening locators. * diff --git a/test/performance/latency/LatencyTestPublisher.cpp b/test/performance/latency/LatencyTestPublisher.cpp index ae89e8433a1..b203fddea57 100644 --- a/test/performance/latency/LatencyTestPublisher.cpp +++ b/test/performance/latency/LatencyTestPublisher.cpp @@ -44,7 +44,7 @@ #define TIME_LIMIT_US 10000 using namespace eprosima::fastdds::dds; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; LatencyTestPublisher::LatencyTestPublisher() : latency_command_type_(new TestCommandDataType()) diff --git a/test/performance/latency/LatencyTestPublisher.hpp b/test/performance/latency/LatencyTestPublisher.hpp index f9aa04a26b3..0c2866cdf0c 100644 --- a/test/performance/latency/LatencyTestPublisher.hpp +++ b/test/performance/latency/LatencyTestPublisher.hpp @@ -88,8 +88,8 @@ class LatencyTestPublisher bool export_csv, const std::string& export_prefix, std::string raw_data_file, - const eprosima::fastrtps::rtps::PropertyPolicy& part_property_policy, - const eprosima::fastrtps::rtps::PropertyPolicy& property_policy, + const eprosima::fastdds::rtps::PropertyPolicy& part_property_policy, + const eprosima::fastdds::rtps::PropertyPolicy& property_policy, const std::string& xml_config_file, bool dynamic_data, Arg::EnablerValue data_sharing, diff --git a/test/performance/latency/LatencyTestSubscriber.cpp b/test/performance/latency/LatencyTestSubscriber.cpp index dae6900b0a3..00e6029af26 100644 --- a/test/performance/latency/LatencyTestSubscriber.cpp +++ b/test/performance/latency/LatencyTestSubscriber.cpp @@ -38,7 +38,7 @@ #include using namespace eprosima::fastdds::dds; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; LatencyTestSubscriber::LatencyTestSubscriber() : latency_command_type_(new TestCommandDataType()) @@ -756,7 +756,7 @@ bool LatencyTestSubscriber::test( } // prevent the LatencyTestSubscriber from been destroyed while LatencyTestPublisher is waitin for the END command. - if ( RETCODE_OK != command_writer_->wait_for_acknowledgments(eprosima::fastrtps::c_TimeInfinite)) + if ( RETCODE_OK != command_writer_->wait_for_acknowledgments(eprosima::fastdds::c_TimeInfinite)) { EPROSIMA_LOG_ERROR(LatencyTest, "Subscriber fail to acknowledge the END command"); return false; diff --git a/test/performance/latency/LatencyTestSubscriber.hpp b/test/performance/latency/LatencyTestSubscriber.hpp index 8d1f45d3583..e3545feb3fe 100644 --- a/test/performance/latency/LatencyTestSubscriber.hpp +++ b/test/performance/latency/LatencyTestSubscriber.hpp @@ -48,8 +48,8 @@ class LatencyTestSubscriber bool reliable, uint32_t pid, bool hostname, - const eprosima::fastrtps::rtps::PropertyPolicy& part_property_policy, - const eprosima::fastrtps::rtps::PropertyPolicy& property_policy, + const eprosima::fastdds::rtps::PropertyPolicy& part_property_policy, + const eprosima::fastdds::rtps::PropertyPolicy& property_policy, const std::string& xml_config_file, bool dynamic_data, Arg::EnablerValue data_sharing, diff --git a/test/performance/latency/LatencyTestTypes.cpp b/test/performance/latency/LatencyTestTypes.cpp index 350e36c149e..10ba651ef0b 100644 --- a/test/performance/latency/LatencyTestTypes.cpp +++ b/test/performance/latency/LatencyTestTypes.cpp @@ -22,8 +22,8 @@ #include #include -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; const size_t LatencyType::overhead = offsetof(LatencyType, data) + SerializedPayload_t::representation_header_size; diff --git a/test/performance/latency/LatencyTestTypes.hpp b/test/performance/latency/LatencyTestTypes.hpp index 2b4b314c862..f80726e8c28 100644 --- a/test/performance/latency/LatencyTestTypes.hpp +++ b/test/performance/latency/LatencyTestTypes.hpp @@ -96,7 +96,7 @@ class LatencyDataType : public eprosima::fastdds::dds::TopicDataType m_typeSize = sizeof(decltype(LatencyType::seqnum)) + sizeof(decltype(LatencyType::bounce)) + ((size + 3) & ~3) + - eprosima::fastrtps::rtps::SerializedPayload_t::representation_header_size; + eprosima::fastdds::rtps::SerializedPayload_t::representation_header_size; m_isGetKeyDefined = false; } @@ -106,17 +106,17 @@ class LatencyDataType : public eprosima::fastdds::dds::TopicDataType bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; std::function getSerializedSizeProvider( void* data) override @@ -132,7 +132,7 @@ class LatencyDataType : public eprosima::fastdds::dds::TopicDataType void* data) override; bool getKey( void* /*data*/, - eprosima::fastrtps::rtps::InstanceHandle_t* /*ihandle*/, + eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool force_md5 = false) override { (void)force_md5; @@ -210,17 +210,17 @@ class TestCommandDataType : public eprosima::fastdds::dds::TopicDataType bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; std::function getSerializedSizeProvider( void* data) override @@ -236,7 +236,7 @@ class TestCommandDataType : public eprosima::fastdds::dds::TopicDataType void* data) override; bool getKey( void* /*data*/, - eprosima::fastrtps::rtps::InstanceHandle_t* /*ihandle*/, + eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool force_md5 = false) override { (void)force_md5; diff --git a/test/performance/latency/main_LatencyTest.cpp b/test/performance/latency/main_LatencyTest.cpp index 93a71039bde..99744551997 100644 --- a/test/performance/latency/main_LatencyTest.cpp +++ b/test/performance/latency/main_LatencyTest.cpp @@ -33,8 +33,8 @@ #pragma warning (disable:4512) #endif // if defined(_MSC_VER) -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; #if defined(_WIN32) #define COPYSTR strcpy_s diff --git a/test/performance/throughput/ThroughputPublisher.cpp b/test/performance/throughput/ThroughputPublisher.cpp index 1395cf9747d..1df23413e6a 100644 --- a/test/performance/throughput/ThroughputPublisher.cpp +++ b/test/performance/throughput/ThroughputPublisher.cpp @@ -41,7 +41,7 @@ #include using namespace eprosima::fastdds::dds; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; // ******************************************************************************************* // ********************************* DATA WRITER LISTENER ************************************ @@ -120,8 +120,8 @@ bool ThroughputPublisher::init( uint32_t pid, bool hostname, const std::string& export_csv, - const eprosima::fastrtps::rtps::PropertyPolicy& part_property_policy, - const eprosima::fastrtps::rtps::PropertyPolicy& property_policy, + const eprosima::fastdds::rtps::PropertyPolicy& part_property_policy, + const eprosima::fastdds::rtps::PropertyPolicy& property_policy, const std::string& xml_config_file, const std::string& demands_file, const std::string& recoveries_file, diff --git a/test/performance/throughput/ThroughputPublisher.hpp b/test/performance/throughput/ThroughputPublisher.hpp index 0640aec8253..7765de70c60 100644 --- a/test/performance/throughput/ThroughputPublisher.hpp +++ b/test/performance/throughput/ThroughputPublisher.hpp @@ -52,8 +52,8 @@ class ThroughputPublisher uint32_t pid, bool hostname, const std::string& export_csv, - const eprosima::fastrtps::rtps::PropertyPolicy& part_property_policy, - const eprosima::fastrtps::rtps::PropertyPolicy& property_policy, + const eprosima::fastdds::rtps::PropertyPolicy& part_property_policy, + const eprosima::fastdds::rtps::PropertyPolicy& property_policy, const std::string& xml_config_file, const std::string& demands_file, const std::string& recoveries_file, diff --git a/test/performance/throughput/ThroughputSubscriber.cpp b/test/performance/throughput/ThroughputSubscriber.cpp index 7481da82958..6ef64f4fabe 100644 --- a/test/performance/throughput/ThroughputSubscriber.cpp +++ b/test/performance/throughput/ThroughputSubscriber.cpp @@ -39,7 +39,7 @@ #include using namespace eprosima::fastdds::dds; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; // ******************************************************************************************* // ************************************ DATA SUB LISTENER ************************************ @@ -273,8 +273,8 @@ bool ThroughputSubscriber::init( bool reliable, uint32_t pid, bool hostname, - const eprosima::fastrtps::rtps::PropertyPolicy& part_property_policy, - const eprosima::fastrtps::rtps::PropertyPolicy& property_policy, + const eprosima::fastdds::rtps::PropertyPolicy& part_property_policy, + const eprosima::fastdds::rtps::PropertyPolicy& property_policy, const std::string& xml_config_file, bool dynamic_types, Arg::EnablerValue data_sharing, diff --git a/test/performance/throughput/ThroughputSubscriber.hpp b/test/performance/throughput/ThroughputSubscriber.hpp index be2f6b595d6..48e89ca20ae 100644 --- a/test/performance/throughput/ThroughputSubscriber.hpp +++ b/test/performance/throughput/ThroughputSubscriber.hpp @@ -49,8 +49,8 @@ class ThroughputSubscriber bool reliable, uint32_t pid, bool hostname, - const eprosima::fastrtps::rtps::PropertyPolicy& part_property_policy, - const eprosima::fastrtps::rtps::PropertyPolicy& property_policy, + const eprosima::fastdds::rtps::PropertyPolicy& part_property_policy, + const eprosima::fastdds::rtps::PropertyPolicy& property_policy, const std::string& xml_config_file, bool dynamic_types, Arg::EnablerValue data_sharing, diff --git a/test/performance/throughput/ThroughputTypes.cpp b/test/performance/throughput/ThroughputTypes.cpp index a0f6466b7c9..b461397f023 100644 --- a/test/performance/throughput/ThroughputTypes.cpp +++ b/test/performance/throughput/ThroughputTypes.cpp @@ -25,8 +25,8 @@ const size_t ThroughputType::overhead = offsetof(ThroughputType, data); const std::string ThroughputDataType::type_name_ = "ThroughputType"; -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; bool ThroughputDataType::compare_data( const ThroughputType& lt1, diff --git a/test/performance/throughput/ThroughputTypes.hpp b/test/performance/throughput/ThroughputTypes.hpp index cf4b4b8c48c..eb881b1d90d 100644 --- a/test/performance/throughput/ThroughputTypes.hpp +++ b/test/performance/throughput/ThroughputTypes.hpp @@ -128,7 +128,7 @@ class ThroughputDataType : public eprosima::fastdds::dds::TopicDataType setName(type_name_.c_str()); m_typeSize = sizeof(decltype(ThroughputType::seqnum)) + ((size + 3) & ~3) + - eprosima::fastrtps::rtps::SerializedPayload_t::representation_header_size; + eprosima::fastdds::rtps::SerializedPayload_t::representation_header_size; m_isGetKeyDefined = false; } @@ -138,18 +138,18 @@ class ThroughputDataType : public eprosima::fastdds::dds::TopicDataType bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; std::function getSerializedSizeProvider( @@ -169,7 +169,7 @@ class ThroughputDataType : public eprosima::fastdds::dds::TopicDataType bool getKey( void* /*data*/, - eprosima::fastrtps::rtps::InstanceHandle_t* /*ihandle*/, + eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool force_md5 = false) override { (void)force_md5; @@ -268,18 +268,18 @@ class ThroughputCommandDataType : public eprosima::fastdds::dds::TopicDataType bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; std::function getSerializedSizeProvider( @@ -299,7 +299,7 @@ class ThroughputCommandDataType : public eprosima::fastdds::dds::TopicDataType bool getKey( void* /*data*/, - eprosima::fastrtps::rtps::InstanceHandle_t* /*ihandle*/, + eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool force_md5 = false) override { (void)force_md5; diff --git a/test/performance/throughput/main_ThroughputTest.cpp b/test/performance/throughput/main_ThroughputTest.cpp index 33b6dd01d1f..12fc9001cd3 100644 --- a/test/performance/throughput/main_ThroughputTest.cpp +++ b/test/performance/throughput/main_ThroughputTest.cpp @@ -31,8 +31,8 @@ #pragma warning (disable:4512) #endif // if defined(_MSC_VER) -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; #if defined(_WIN32) #define COPYSTR strcpy_s diff --git a/test/performance/video/VideoTestPublisher.cpp b/test/performance/video/VideoTestPublisher.cpp index 0cb7f67f516..379f70993bd 100644 --- a/test/performance/video/VideoTestPublisher.cpp +++ b/test/performance/video/VideoTestPublisher.cpp @@ -31,7 +31,7 @@ #define TIME_LIMIT_US 10000 using namespace eprosima; -using namespace eprosima::fastrtps; +using namespace eprosima::fastdds; using namespace eprosima::fastdds::dds; using std::cout; @@ -139,8 +139,8 @@ void VideoTestPublisher::init( bool reliable, uint32_t pid, bool hostname, - const eprosima::fastrtps::rtps::PropertyPolicy& part_property_policy, - const eprosima::fastrtps::rtps::PropertyPolicy& property_policy, + const eprosima::fastdds::rtps::PropertyPolicy& part_property_policy, + const eprosima::fastdds::rtps::PropertyPolicy& property_policy, bool large_data, const std::string& sXMLConfigFile, int test_time, @@ -254,7 +254,7 @@ void VideoTestPublisher::init( if (large_data) { datawriter_qos_data.endpoint().history_memory_policy = - eprosima::fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; + eprosima::fastdds::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; datawriter_qos_data.publish_mode().kind = PublishModeQosPolicyKind::ASYNCHRONOUS_PUBLISH_MODE; } datawriter_qos_data.reliable_writer_qos().times.heartbeatPeriod.seconds = 0; diff --git a/test/performance/video/VideoTestPublisher.hpp b/test/performance/video/VideoTestPublisher.hpp index 659d608e428..1ff14dcbae2 100644 --- a/test/performance/video/VideoTestPublisher.hpp +++ b/test/performance/video/VideoTestPublisher.hpp @@ -64,8 +64,8 @@ class VideoTestPublisher bool reliable, uint32_t pid, bool hostname, - const eprosima::fastrtps::rtps::PropertyPolicy& part_property_policy, - const eprosima::fastrtps::rtps::PropertyPolicy& property_policy, + const eprosima::fastdds::rtps::PropertyPolicy& part_property_policy, + const eprosima::fastdds::rtps::PropertyPolicy& property_policy, bool large_data, const std::string& sXMLConfigFile, int test_time, diff --git a/test/performance/video/VideoTestSubscriber.cpp b/test/performance/video/VideoTestSubscriber.cpp index 7f68e19589e..bb51ea23c07 100644 --- a/test/performance/video/VideoTestSubscriber.cpp +++ b/test/performance/video/VideoTestSubscriber.cpp @@ -31,7 +31,7 @@ using namespace eprosima; using namespace eprosima::fastdds::dds; -using namespace eprosima::fastrtps; +using namespace eprosima::fastdds; using std::cout; using std::endl; @@ -122,8 +122,8 @@ void VideoTestSubscriber::init( bool reliable, uint32_t pid, bool hostname, - const eprosima::fastrtps::rtps::PropertyPolicy& part_property_policy, - const eprosima::fastrtps::rtps::PropertyPolicy& property_policy, + const eprosima::fastdds::rtps::PropertyPolicy& part_property_policy, + const eprosima::fastdds::rtps::PropertyPolicy& property_policy, bool large_data, const std::string& sXMLConfigFile, bool export_csv, @@ -232,7 +232,7 @@ void VideoTestSubscriber::init( if (large_data) { datareader_qos_data.endpoint().history_memory_policy = - eprosima::fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; + eprosima::fastdds::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; } mp_data_dr = mp_datasub->create_datareader(mp_video_topic, datareader_qos_data, &this->m_datasublistener); diff --git a/test/performance/video/VideoTestSubscriber.hpp b/test/performance/video/VideoTestSubscriber.hpp index 1705253c00e..c87a969b55b 100644 --- a/test/performance/video/VideoTestSubscriber.hpp +++ b/test/performance/video/VideoTestSubscriber.hpp @@ -91,8 +91,8 @@ class VideoTestSubscriber bool reliable, uint32_t pid, bool hostname, - const eprosima::fastrtps::rtps::PropertyPolicy& part_property_policy, - const eprosima::fastrtps::rtps::PropertyPolicy& property_policy, + const eprosima::fastdds::rtps::PropertyPolicy& part_property_policy, + const eprosima::fastdds::rtps::PropertyPolicy& property_policy, bool large_data, const std::string& sXMLConfigFile, bool export_csv, diff --git a/test/performance/video/VideoTestTypes.cpp b/test/performance/video/VideoTestTypes.cpp index 7c82450174e..82e33e4d37b 100644 --- a/test/performance/video/VideoTestTypes.cpp +++ b/test/performance/video/VideoTestTypes.cpp @@ -19,12 +19,12 @@ #include "VideoTestTypes.hpp" -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; bool VideoDataType::serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) + eprosima::fastdds::rtps::SerializedPayload_t* payload) { VideoType* lt = (VideoType*)data; @@ -40,7 +40,7 @@ bool VideoDataType::serialize( } bool VideoDataType::deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) { VideoType* lt = (VideoType*)data; diff --git a/test/performance/video/VideoTestTypes.hpp b/test/performance/video/VideoTestTypes.hpp index 7db675969f8..68b212700d0 100644 --- a/test/performance/video/VideoTestTypes.hpp +++ b/test/performance/video/VideoTestTypes.hpp @@ -126,9 +126,9 @@ class VideoDataType : public eprosima::fastdds::dds::TopicDataType bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override; + eprosima::fastdds::rtps::SerializedPayload_t* payload) override; bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; std::function getSerializedSizeProvider( void* data) override; @@ -137,7 +137,7 @@ class VideoDataType : public eprosima::fastdds::dds::TopicDataType void* data) override; bool getKey( void* /*data*/, - eprosima::fastrtps::rtps::InstanceHandle_t* /*ihandle*/, + eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool force_md5 = false) override { (void)force_md5; @@ -188,9 +188,9 @@ class TestCommandDataType : public eprosima::fastdds::dds::TopicDataType bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override; + eprosima::fastdds::rtps::SerializedPayload_t* payload) override; bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; std::function getSerializedSizeProvider( void* data) override; @@ -199,7 +199,7 @@ class TestCommandDataType : public eprosima::fastdds::dds::TopicDataType void* data) override; bool getKey( void* /*data*/, - eprosima::fastrtps::rtps::InstanceHandle_t* /*ihandle*/, + eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool force_md5 = false) override { (void)force_md5; diff --git a/test/performance/video/main_VideoTest.cpp b/test/performance/video/main_VideoTest.cpp index cf58c754886..6f0b3f4f9de 100644 --- a/test/performance/video/main_VideoTest.cpp +++ b/test/performance/video/main_VideoTest.cpp @@ -33,7 +33,7 @@ #pragma warning (disable:4512) #endif // if defined(_MSC_VER) -using namespace eprosima::fastrtps; +using namespace eprosima::fastdds; using namespace eprosima::fastdds::dds; using std::cout; @@ -399,7 +399,7 @@ int main( } } - eprosima::fastrtps::rtps::PropertyPolicy pub_part_property_policy, sub_part_property_policy, + eprosima::fastdds::rtps::PropertyPolicy pub_part_property_policy, sub_part_property_policy, pub_property_policy, sub_property_policy; #if HAVE_SECURITY @@ -411,35 +411,35 @@ int main( return -1; } - sub_part_property_policy.properties().emplace_back(eprosima::fastrtps::rtps::Property("dds.sec.auth.plugin", + sub_part_property_policy.properties().emplace_back(eprosima::fastdds::rtps::Property("dds.sec.auth.plugin", "builtin.PKI-DH")); - sub_part_property_policy.properties().emplace_back(eprosima::fastrtps::rtps::Property( + sub_part_property_policy.properties().emplace_back(eprosima::fastdds::rtps::Property( "dds.sec.auth.builtin.PKI-DH.identity_ca", "file://" + certs_path + "/maincacert.pem")); - sub_part_property_policy.properties().emplace_back(eprosima::fastrtps::rtps::Property( + sub_part_property_policy.properties().emplace_back(eprosima::fastdds::rtps::Property( "dds.sec.auth.builtin.PKI-DH.identity_certificate", "file://" + certs_path + "/mainsubcert.pem")); - sub_part_property_policy.properties().emplace_back(eprosima::fastrtps::rtps::Property( + sub_part_property_policy.properties().emplace_back(eprosima::fastdds::rtps::Property( "dds.sec.auth.builtin.PKI-DH.private_key", "file://" + certs_path + "/mainsubkey.pem")); - sub_part_property_policy.properties().emplace_back(eprosima::fastrtps::rtps::Property("dds.sec.crypto.plugin", + sub_part_property_policy.properties().emplace_back(eprosima::fastdds::rtps::Property("dds.sec.crypto.plugin", "builtin.AES-GCM-GMAC")); sub_part_property_policy.properties().emplace_back("rtps.participant.rtps_protection_kind", "ENCRYPT"); sub_property_policy.properties().emplace_back("rtps.endpoint.submessage_protection_kind", "ENCRYPT"); sub_property_policy.properties().emplace_back("rtps.endpoint.payload_protection_kind", "ENCRYPT"); - pub_part_property_policy.properties().emplace_back(eprosima::fastrtps::rtps::Property("dds.sec.auth.plugin", + pub_part_property_policy.properties().emplace_back(eprosima::fastdds::rtps::Property("dds.sec.auth.plugin", "builtin.PKI-DH")); - pub_part_property_policy.properties().emplace_back(eprosima::fastrtps::rtps::Property( + pub_part_property_policy.properties().emplace_back(eprosima::fastdds::rtps::Property( "dds.sec.auth.builtin.PKI-DH.identity_ca", "file://" + certs_path + "/maincacert.pem")); - pub_part_property_policy.properties().emplace_back(eprosima::fastrtps::rtps::Property( + pub_part_property_policy.properties().emplace_back(eprosima::fastdds::rtps::Property( "dds.sec.auth.builtin.PKI-DH.identity_certificate", "file://" + certs_path + "/mainpubcert.pem")); - pub_part_property_policy.properties().emplace_back(eprosima::fastrtps::rtps::Property( + pub_part_property_policy.properties().emplace_back(eprosima::fastdds::rtps::Property( "dds.sec.auth.builtin.PKI-DH.private_key", "file://" + certs_path + "/mainpubkey.pem")); - pub_part_property_policy.properties().emplace_back(eprosima::fastrtps::rtps::Property("dds.sec.crypto.plugin", + pub_part_property_policy.properties().emplace_back(eprosima::fastdds::rtps::Property("dds.sec.crypto.plugin", "builtin.AES-GCM-GMAC")); pub_part_property_policy.properties().emplace_back("rtps.participant.rtps_protection_kind", "ENCRYPT"); pub_property_policy.properties().emplace_back("rtps.endpoint.submessage_protection_kind", "ENCRYPT"); diff --git a/test/profiling/MemoryTestPublisher.cpp b/test/profiling/MemoryTestPublisher.cpp index 7c8fa03c446..21cde3ab486 100644 --- a/test/profiling/MemoryTestPublisher.cpp +++ b/test/profiling/MemoryTestPublisher.cpp @@ -63,8 +63,8 @@ bool MemoryTestPublisher::init( bool hostname, bool export_csv, const std::string& export_prefix, - const eprosima::fastrtps::rtps::PropertyPolicy& part_property_policy, - const eprosima::fastrtps::rtps::PropertyPolicy& property_policy, + const eprosima::fastdds::rtps::PropertyPolicy& part_property_policy, + const eprosima::fastdds::rtps::PropertyPolicy& property_policy, const std::string& sXMLConfigFile, uint32_t data_size, bool dynamic_types) @@ -176,7 +176,7 @@ bool MemoryTestPublisher::init( if (m_data_size > 60000) { writer_qos.endpoint().history_memory_policy = - eprosima::fastrtps::rtps::MemoryManagementPolicy::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; + eprosima::fastdds::rtps::MemoryManagementPolicy::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; writer_qos.publish_mode().kind = ASYNCHRONOUS_PUBLISH_MODE; } diff --git a/test/profiling/MemoryTestPublisher.h b/test/profiling/MemoryTestPublisher.h index 4c33ff54bb3..f8d940c6f72 100644 --- a/test/profiling/MemoryTestPublisher.h +++ b/test/profiling/MemoryTestPublisher.h @@ -78,8 +78,8 @@ class MemoryTestPublisher bool hostname, bool export_csv, const std::string& export_prefix, - const eprosima::fastrtps::rtps::PropertyPolicy& part_property_policy, - const eprosima::fastrtps::rtps::PropertyPolicy& property_policy, + const eprosima::fastdds::rtps::PropertyPolicy& part_property_policy, + const eprosima::fastdds::rtps::PropertyPolicy& property_policy, const std::string& sXMLConfigFile, uint32_t data_size, bool dynamic_types); diff --git a/test/profiling/MemoryTestSubscriber.cpp b/test/profiling/MemoryTestSubscriber.cpp index 100d21842fd..25514507711 100644 --- a/test/profiling/MemoryTestSubscriber.cpp +++ b/test/profiling/MemoryTestSubscriber.cpp @@ -51,8 +51,8 @@ bool MemoryTestSubscriber::init( bool reliable, uint32_t pid, bool hostname, - const eprosima::fastrtps::rtps::PropertyPolicy& part_property_policy, - const eprosima::fastrtps::rtps::PropertyPolicy& property_policy, + const eprosima::fastdds::rtps::PropertyPolicy& part_property_policy, + const eprosima::fastdds::rtps::PropertyPolicy& property_policy, const std::string& sXMLConfigFile, uint32_t data_size, bool dynamic_types) diff --git a/test/profiling/MemoryTestSubscriber.h b/test/profiling/MemoryTestSubscriber.h index 98be00dd3da..91952a8bf98 100644 --- a/test/profiling/MemoryTestSubscriber.h +++ b/test/profiling/MemoryTestSubscriber.h @@ -72,8 +72,8 @@ class MemoryTestSubscriber bool reliable, uint32_t pid, bool hostname, - const eprosima::fastrtps::rtps::PropertyPolicy& part_property_policy, - const eprosima::fastrtps::rtps::PropertyPolicy& property_policy, + const eprosima::fastdds::rtps::PropertyPolicy& part_property_policy, + const eprosima::fastdds::rtps::PropertyPolicy& property_policy, const std::string& sXMLConfigFile, uint32_t data_size, bool dynamic_types); diff --git a/test/profiling/MemoryTestTypes.cpp b/test/profiling/MemoryTestTypes.cpp index 127c9172c90..1e9efd0a14a 100644 --- a/test/profiling/MemoryTestTypes.cpp +++ b/test/profiling/MemoryTestTypes.cpp @@ -19,8 +19,8 @@ #include "MemoryTestTypes.h" -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; bool MemoryDataType::serialize( void* data, diff --git a/test/profiling/MemoryTestTypes.h b/test/profiling/MemoryTestTypes.h index 6f6ec10fd2c..3856f514365 100644 --- a/test/profiling/MemoryTestTypes.h +++ b/test/profiling/MemoryTestTypes.h @@ -91,13 +91,13 @@ class MemoryDataType : public eprosima::fastdds::dds::TopicDataType bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override; + eprosima::fastdds::rtps::SerializedPayload_t* payload) override; bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; std::function getSerializedSizeProvider( void* data) override; @@ -109,7 +109,7 @@ class MemoryDataType : public eprosima::fastdds::dds::TopicDataType void* data); bool getKey( void* /*data*/, - eprosima::fastrtps::rtps::InstanceHandle_t* /*ihandle*/, + eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool force_md5 = false) override { (void)force_md5; @@ -160,13 +160,13 @@ class TestCommandDataType : public eprosima::fastdds::dds::TopicDataType bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override; + eprosima::fastdds::rtps::SerializedPayload_t* payload) override; bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; std::function getSerializedSizeProvider( void* data) override; @@ -178,7 +178,7 @@ class TestCommandDataType : public eprosima::fastdds::dds::TopicDataType void* data); bool getKey( void* /*data*/, - eprosima::fastrtps::rtps::InstanceHandle_t* /*ihandle*/, + eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool force_md5 = false) override { (void)force_md5; diff --git a/test/profiling/allocations/AllocTestTypePubSubTypes.cxx b/test/profiling/allocations/AllocTestTypePubSubTypes.cxx index 5299dd3ba49..965b19ae3c2 100644 --- a/test/profiling/allocations/AllocTestTypePubSubTypes.cxx +++ b/test/profiling/allocations/AllocTestTypePubSubTypes.cxx @@ -27,8 +27,8 @@ #include "AllocTestTypeCdrAux.hpp" #include "AllocTestTypeTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; AllocTestTypePubSubType::AllocTestTypePubSubType() diff --git a/test/profiling/allocations/AllocTestTypePubSubTypes.h b/test/profiling/allocations/AllocTestTypePubSubTypes.h index 8651a634361..8b1db4a82f0 100644 --- a/test/profiling/allocations/AllocTestTypePubSubTypes.h +++ b/test/profiling/allocations/AllocTestTypePubSubTypes.h @@ -54,18 +54,18 @@ class AllocTestTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -80,7 +80,7 @@ class AllocTestTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/profiling/allocations/AllocTest_main.cpp b/test/profiling/allocations/AllocTest_main.cpp index 933317510d2..6b16a8bc9a3 100644 --- a/test/profiling/allocations/AllocTest_main.cpp +++ b/test/profiling/allocations/AllocTest_main.cpp @@ -23,7 +23,7 @@ #include "AllocTestSubscriber.hpp" using namespace eprosima; -using namespace fastrtps; +using namespace fastdds; using namespace rtps; int main( diff --git a/test/profiling/main_MemoryTest.cpp b/test/profiling/main_MemoryTest.cpp index 352c7c4c6fc..55764a77d4f 100644 --- a/test/profiling/main_MemoryTest.cpp +++ b/test/profiling/main_MemoryTest.cpp @@ -32,8 +32,8 @@ #pragma warning (disable:4512) #endif // if defined(_MSC_VER) -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; #if FASTDDS_IS_BIG_ENDIAN_TARGET const Endianness_t DEFAULT_ENDIAN = BIGEND; diff --git a/test/realtime/TimedConditionVariableUnitTest.cpp b/test/realtime/TimedConditionVariableUnitTest.cpp index 01807363387..9a504c0840d 100644 --- a/test/realtime/TimedConditionVariableUnitTest.cpp +++ b/test/realtime/TimedConditionVariableUnitTest.cpp @@ -6,7 +6,7 @@ TEST(TimedConditionVariable, wait_for) { - eprosima::fastrtps::TimedConditionVariable cv; + eprosima::fastdds::TimedConditionVariable cv; std::timed_mutex mutex; std::unique_lock lock(mutex); @@ -22,7 +22,7 @@ TEST(TimedConditionVariable, wait_for) TEST(TimedConditionVariable, wait_until) { - eprosima::fastrtps::TimedConditionVariable cv; + eprosima::fastdds::TimedConditionVariable cv; std::timed_mutex mutex; std::unique_lock lock(mutex); diff --git a/test/realtime/UserThreadNonBlockedTest.cpp b/test/realtime/UserThreadNonBlockedTest.cpp index fc72dd3d08b..58b90b02fcd 100644 --- a/test/realtime/UserThreadNonBlockedTest.cpp +++ b/test/realtime/UserThreadNonBlockedTest.cpp @@ -52,7 +52,7 @@ class DummyType : public eprosima::fastdds::dds::TopicDataType bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) + eprosima::fastdds::rtps::SerializedPayload_t* payload) { DummyType* sample = reinterpret_cast(data); // Object that manages the raw buffer. @@ -70,7 +70,7 @@ class DummyType : public eprosima::fastdds::dds::TopicDataType } bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) { DummyType* sample = reinterpret_cast(data); @@ -101,7 +101,7 @@ class DummyType : public eprosima::fastdds::dds::TopicDataType bool getKey( void*, - eprosima::fastrtps::rtps::InstanceHandle_t*, + eprosima::fastdds::rtps::InstanceHandle_t*, bool) { return false; @@ -226,17 +226,17 @@ TEST_F(UserThreadNonBlockedTest, remove_previous_sample_on_history) datawriter_->write(reinterpret_cast(&sample)); // Record the mutexes. - eprosima::fastrtps::tmutex_start_recording(); + eprosima::fastdds::tmutex_start_recording(); datawriter_->write(reinterpret_cast(&sample)); - eprosima::fastrtps::tmutex_stop_recording(); + eprosima::fastdds::tmutex_stop_recording(); - for (size_t count = 0; count < eprosima::fastrtps::tmutex_get_num_mutexes(); ++count) + for (size_t count = 0; count < eprosima::fastdds::tmutex_get_num_mutexes(); ++count) { std::cout << "Testing mutex " << count << std::endl; // Start testing locking the mutexes. - if (eprosima::fastrtps::tmutex_lock_mutex(count)) + if (eprosima::fastdds::tmutex_lock_mutex(count)) { std::promise> promise; std::future> future = promise.get_future(); @@ -253,12 +253,12 @@ TEST_F(UserThreadNonBlockedTest, remove_previous_sample_on_history) // If main mutex cannot be taken, the write fails. // But for the rest the information is stored and it is as if the samples was sent. ASSERT_EQ(count <= 3 ? false : true, returned_value.first); - std::chrono::microseconds max_w(eprosima::fastrtps::rtps::TimeConv::Time_t2MicroSecondsInt64( + std::chrono::microseconds max_w(eprosima::fastdds::rtps::TimeConv::Time_t2MicroSecondsInt64( datawriter_qos_.reliability().max_blocking_time)); ASSERT_GE(returned_value.second, max_w); ASSERT_LE(returned_value.second - max_w, std::chrono::milliseconds(1)); - eprosima::fastrtps::tmutex_unlock_mutex(count); + eprosima::fastdds::tmutex_unlock_mutex(count); } else { @@ -266,9 +266,9 @@ TEST_F(UserThreadNonBlockedTest, remove_previous_sample_on_history) } } - ASSERT_EQ(5, eprosima::fastrtps::tmutex_get_num_mutexes()); - ASSERT_EQ(0, eprosima::fastrtps::tmutex_get_num_lock_type()); - ASSERT_EQ(5, eprosima::fastrtps::tmutex_get_num_timedlock_type()); + ASSERT_EQ(5, eprosima::fastdds::tmutex_get_num_mutexes()); + ASSERT_EQ(0, eprosima::fastdds::tmutex_get_num_lock_type()); + ASSERT_EQ(5, eprosima::fastdds::tmutex_get_num_timedlock_type()); } /*! @@ -284,17 +284,17 @@ TEST_F(UserThreadNonBlockedTest, write_sample_besteffort) DummyType sample{1}; // Record the mutexes. - eprosima::fastrtps::tmutex_start_recording(); + eprosima::fastdds::tmutex_start_recording(); datawriter_->write(reinterpret_cast(&sample)); - eprosima::fastrtps::tmutex_stop_recording(); + eprosima::fastdds::tmutex_stop_recording(); - for (size_t count = 0; count < eprosima::fastrtps::tmutex_get_num_mutexes(); ++count) + for (size_t count = 0; count < eprosima::fastdds::tmutex_get_num_mutexes(); ++count) { std::cout << "Testing mutex " << count << std::endl; // Start testing locking the mutexes. - if (eprosima::fastrtps::tmutex_lock_mutex(count)) + if (eprosima::fastdds::tmutex_lock_mutex(count)) { std::promise> promise; std::future> future = promise.get_future(); @@ -311,12 +311,12 @@ TEST_F(UserThreadNonBlockedTest, write_sample_besteffort) // If main mutex cannot be taken, the write fails. // But for the rest the information is stored and it is as if the samples was sent. ASSERT_EQ(count == 0 ? false : true, returned_value.first); - std::chrono::microseconds max_w(eprosima::fastrtps::rtps::TimeConv::Time_t2MicroSecondsInt64( + std::chrono::microseconds max_w(eprosima::fastdds::rtps::TimeConv::Time_t2MicroSecondsInt64( datawriter_qos_.reliability().max_blocking_time)); ASSERT_GE(returned_value.second, max_w); ASSERT_LE(returned_value.second - max_w, std::chrono::milliseconds(1)); - eprosima::fastrtps::tmutex_unlock_mutex(count); + eprosima::fastdds::tmutex_unlock_mutex(count); } else { @@ -324,9 +324,9 @@ TEST_F(UserThreadNonBlockedTest, write_sample_besteffort) } } - ASSERT_EQ(2, eprosima::fastrtps::tmutex_get_num_mutexes()); - ASSERT_EQ(0, eprosima::fastrtps::tmutex_get_num_lock_type()); - ASSERT_EQ(2, eprosima::fastrtps::tmutex_get_num_timedlock_type()); + ASSERT_EQ(2, eprosima::fastdds::tmutex_get_num_mutexes()); + ASSERT_EQ(0, eprosima::fastdds::tmutex_get_num_lock_type()); + ASSERT_EQ(2, eprosima::fastdds::tmutex_get_num_timedlock_type()); } /*! @@ -342,17 +342,17 @@ TEST_F(UserThreadNonBlockedTest, write_sample_reliable) DummyType sample{1}; // Record the mutexes. - eprosima::fastrtps::tmutex_start_recording(); + eprosima::fastdds::tmutex_start_recording(); datawriter_->write(reinterpret_cast(&sample)); - eprosima::fastrtps::tmutex_stop_recording(); + eprosima::fastdds::tmutex_stop_recording(); for (size_t count = 0; count < 2; ++count) { std::cout << "Testing mutex " << count << std::endl; // Start testing locking the mutexes. - if (eprosima::fastrtps::tmutex_lock_mutex(count)) + if (eprosima::fastdds::tmutex_lock_mutex(count)) { std::promise> promise; std::future> future = promise.get_future(); @@ -369,12 +369,12 @@ TEST_F(UserThreadNonBlockedTest, write_sample_reliable) // If main mutex cannot be taken, the write fails. // But for the rest the information is stored and it is as if the samples was sent. ASSERT_EQ(count == 0 ? false : true, returned_value.first); - std::chrono::microseconds max_w(eprosima::fastrtps::rtps::TimeConv::Time_t2MicroSecondsInt64( + std::chrono::microseconds max_w(eprosima::fastdds::rtps::TimeConv::Time_t2MicroSecondsInt64( datawriter_qos_.reliability().max_blocking_time)); ASSERT_GE(returned_value.second, max_w); ASSERT_LE(returned_value.second - max_w, std::chrono::milliseconds(1)); - eprosima::fastrtps::tmutex_unlock_mutex(count); + eprosima::fastdds::tmutex_unlock_mutex(count); } else { @@ -382,9 +382,9 @@ TEST_F(UserThreadNonBlockedTest, write_sample_reliable) } } - ASSERT_EQ(3, eprosima::fastrtps::tmutex_get_num_mutexes()); - ASSERT_EQ(0, eprosima::fastrtps::tmutex_get_num_lock_type()); - ASSERT_EQ(3, eprosima::fastrtps::tmutex_get_num_timedlock_type()); + ASSERT_EQ(3, eprosima::fastdds::tmutex_get_num_mutexes()); + ASSERT_EQ(0, eprosima::fastdds::tmutex_get_num_lock_type()); + ASSERT_EQ(3, eprosima::fastdds::tmutex_get_num_timedlock_type()); } /*! @@ -401,17 +401,17 @@ TEST_F(UserThreadNonBlockedTest, write_async_sample_besteffort) DummyType sample{1}; // Record the mutexes. - eprosima::fastrtps::tmutex_start_recording(); + eprosima::fastdds::tmutex_start_recording(); datawriter_->write(reinterpret_cast(&sample)); - eprosima::fastrtps::tmutex_stop_recording(); + eprosima::fastdds::tmutex_stop_recording(); - for (size_t count = 0; count < eprosima::fastrtps::tmutex_get_num_mutexes(); ++count) + for (size_t count = 0; count < eprosima::fastdds::tmutex_get_num_mutexes(); ++count) { std::cout << "Testing mutex " << count << std::endl; // Start testing locking the mutexes. - if (eprosima::fastrtps::tmutex_lock_mutex(count)) + if (eprosima::fastdds::tmutex_lock_mutex(count)) { std::promise> promise; std::future> future = promise.get_future(); @@ -428,12 +428,12 @@ TEST_F(UserThreadNonBlockedTest, write_async_sample_besteffort) // If main mutex cannot be taken, the write fails. // But for the rest the information is stored and it is as if the samples was sent. ASSERT_EQ(count == 0 ? false : true, returned_value.first); - std::chrono::microseconds max_w(eprosima::fastrtps::rtps::TimeConv::Time_t2MicroSecondsInt64( + std::chrono::microseconds max_w(eprosima::fastdds::rtps::TimeConv::Time_t2MicroSecondsInt64( datawriter_qos_.reliability().max_blocking_time)); ASSERT_GE(returned_value.second, max_w); ASSERT_LE(returned_value.second - max_w, std::chrono::milliseconds(1)); - eprosima::fastrtps::tmutex_unlock_mutex(count); + eprosima::fastdds::tmutex_unlock_mutex(count); } else { @@ -441,9 +441,9 @@ TEST_F(UserThreadNonBlockedTest, write_async_sample_besteffort) } } - ASSERT_EQ(3, eprosima::fastrtps::tmutex_get_num_mutexes()); - ASSERT_EQ(0, eprosima::fastrtps::tmutex_get_num_lock_type()); - ASSERT_EQ(3, eprosima::fastrtps::tmutex_get_num_timedlock_type()); + ASSERT_EQ(3, eprosima::fastdds::tmutex_get_num_mutexes()); + ASSERT_EQ(0, eprosima::fastdds::tmutex_get_num_lock_type()); + ASSERT_EQ(3, eprosima::fastdds::tmutex_get_num_timedlock_type()); } /*! @@ -460,17 +460,17 @@ TEST_F(UserThreadNonBlockedTest, write_async_sample_reliable) DummyType sample{1}; // Record the mutexes. - eprosima::fastrtps::tmutex_start_recording(); + eprosima::fastdds::tmutex_start_recording(); datawriter_->write(reinterpret_cast(&sample)); - eprosima::fastrtps::tmutex_stop_recording(); + eprosima::fastdds::tmutex_stop_recording(); for (size_t count = 0; count < 2; ++count) { std::cout << "Testing mutex " << count << std::endl; // Start testing locking the mutexes. - if (eprosima::fastrtps::tmutex_lock_mutex(count)) + if (eprosima::fastdds::tmutex_lock_mutex(count)) { std::promise> promise; std::future> future = promise.get_future(); @@ -487,12 +487,12 @@ TEST_F(UserThreadNonBlockedTest, write_async_sample_reliable) // If main mutex cannot be taken, the write fails. // But for the rest the information is stored and it is as if the samples was sent. ASSERT_EQ(count == 0 ? false : true, returned_value.first); - std::chrono::microseconds max_w(eprosima::fastrtps::rtps::TimeConv::Time_t2MicroSecondsInt64( + std::chrono::microseconds max_w(eprosima::fastdds::rtps::TimeConv::Time_t2MicroSecondsInt64( datawriter_qos_.reliability().max_blocking_time)); ASSERT_GE(returned_value.second, max_w); ASSERT_LE(returned_value.second - max_w, std::chrono::milliseconds(1)); - eprosima::fastrtps::tmutex_unlock_mutex(count); + eprosima::fastdds::tmutex_unlock_mutex(count); } else { @@ -500,9 +500,9 @@ TEST_F(UserThreadNonBlockedTest, write_async_sample_reliable) } } - ASSERT_EQ(3, eprosima::fastrtps::tmutex_get_num_mutexes()); - ASSERT_EQ(0, eprosima::fastrtps::tmutex_get_num_lock_type()); - ASSERT_EQ(3, eprosima::fastrtps::tmutex_get_num_timedlock_type()); + ASSERT_EQ(3, eprosima::fastdds::tmutex_get_num_mutexes()); + ASSERT_EQ(0, eprosima::fastdds::tmutex_get_num_lock_type()); + ASSERT_EQ(3, eprosima::fastdds::tmutex_get_num_timedlock_type()); } /*! @@ -522,20 +522,20 @@ TEST_F(UserThreadNonBlockedTest, read_sample_besteffort) datawriter_->wait_for_acknowledgments({0, 100000000}); // Record the mutexes. - eprosima::fastrtps::tmutex_start_recording(); + eprosima::fastdds::tmutex_start_recording(); datareader_->read_next_sample(reinterpret_cast(&read_sample), &read_info); - eprosima::fastrtps::tmutex_stop_recording(); + eprosima::fastdds::tmutex_stop_recording(); - for (size_t count = 0; count < eprosima::fastrtps::tmutex_get_num_mutexes(); ++count) + for (size_t count = 0; count < eprosima::fastdds::tmutex_get_num_mutexes(); ++count) { datawriter_->write(reinterpret_cast(&sample)); datawriter_->wait_for_acknowledgments({0, 100000000}); std::cout << "Testing mutex " << count << std::endl; // Start testing locking the mutexes. - if (eprosima::fastrtps::tmutex_lock_mutex(count)) + if (eprosima::fastdds::tmutex_lock_mutex(count)) { std::promise> promise; std::futurewait_for_acknowledgments({0, 100000000}); // Record the mutexes. - eprosima::fastrtps::tmutex_start_recording(); + eprosima::fastdds::tmutex_start_recording(); datareader_->read_next_sample(reinterpret_cast(&read_sample), &read_info); - eprosima::fastrtps::tmutex_stop_recording(); + eprosima::fastdds::tmutex_stop_recording(); - for (size_t count = 0; count < eprosima::fastrtps::tmutex_get_num_mutexes(); ++count) + for (size_t count = 0; count < eprosima::fastdds::tmutex_get_num_mutexes(); ++count) { datawriter_->write(reinterpret_cast(&sample)); datawriter_->wait_for_acknowledgments({0, 100000000}); std::cout << "Testing mutex " << count << std::endl; // Start testing locking the mutexes. - if (eprosima::fastrtps::tmutex_lock_mutex(count)) + if (eprosima::fastdds::tmutex_lock_mutex(count)) { std::promise> promise; std::futurewait_for_acknowledgments({0, 100000000}); // Record the mutexes. - eprosima::fastrtps::tmutex_start_recording(); + eprosima::fastdds::tmutex_start_recording(); datareader_->take_next_sample(reinterpret_cast(&read_sample), &read_info); - eprosima::fastrtps::tmutex_stop_recording(); + eprosima::fastdds::tmutex_stop_recording(); - for (size_t count = 0; count < eprosima::fastrtps::tmutex_get_num_mutexes(); ++count) + for (size_t count = 0; count < eprosima::fastdds::tmutex_get_num_mutexes(); ++count) { datawriter_->write(reinterpret_cast(&sample)); datawriter_->wait_for_acknowledgments({0, 100000000}); std::cout << "Testing mutex " << count << std::endl; // Start testing locking the mutexes. - if (eprosima::fastrtps::tmutex_lock_mutex(count)) + if (eprosima::fastdds::tmutex_lock_mutex(count)) { std::promise> promise; std::futurewait_for_acknowledgments({0, 100000000}); // Record the mutexes. - eprosima::fastrtps::tmutex_start_recording(); + eprosima::fastdds::tmutex_start_recording(); datareader_->take_next_sample(reinterpret_cast(&read_sample), &read_info); - eprosima::fastrtps::tmutex_stop_recording(); + eprosima::fastdds::tmutex_stop_recording(); - for (size_t count = 0; count < eprosima::fastrtps::tmutex_get_num_mutexes(); ++count) + for (size_t count = 0; count < eprosima::fastdds::tmutex_get_num_mutexes(); ++count) { datawriter_->write(reinterpret_cast(&sample)); datawriter_->wait_for_acknowledgments({0, 100000000}); std::cout << "Testing mutex " << count << std::endl; // Start testing locking the mutexes. - if (eprosima::fastrtps::tmutex_lock_mutex(count)) + if (eprosima::fastdds::tmutex_lock_mutex(count)) { std::promise> promise; std::futurewait_for_acknowledgments({0, 100000000}); // Record the mutexes. - eprosima::fastrtps::tmutex_start_recording(); + eprosima::fastdds::tmutex_start_recording(); datareader_->wait_for_unread_message({0, 100000000}); - eprosima::fastrtps::tmutex_stop_recording(); + eprosima::fastdds::tmutex_stop_recording(); - for (size_t count = 0; count < eprosima::fastrtps::tmutex_get_num_mutexes(); ++count) + for (size_t count = 0; count < eprosima::fastdds::tmutex_get_num_mutexes(); ++count) { datawriter_->write(reinterpret_cast(&sample)); datawriter_->wait_for_acknowledgments({0, 100000000}); std::cout << "Testing mutex " << count << std::endl; // Start testing locking the mutexes. - if (eprosima::fastrtps::tmutex_lock_mutex(count)) + if (eprosima::fastdds::tmutex_lock_mutex(count)) { std::promise> promise; std::future> future = promise.get_future(); @@ -831,12 +831,12 @@ TEST_F(UserThreadNonBlockedTest, wait_for_sample_besteffort) // If main mutex cannot be taken, the write fails. // But for the rest the information is stored and it is as if the samples was sent. ASSERT_EQ(count == 0 ? false : true, returned_value.first); - std::chrono::microseconds max_w(eprosima::fastrtps::rtps::TimeConv::Time_t2MicroSecondsInt64( + std::chrono::microseconds max_w(eprosima::fastdds::rtps::TimeConv::Time_t2MicroSecondsInt64( datareader_qos_.reliability().max_blocking_time)); ASSERT_GE(returned_value.second, max_w); ASSERT_LE(returned_value.second - max_w, std::chrono::milliseconds(1)); - eprosima::fastrtps::tmutex_unlock_mutex(count); + eprosima::fastdds::tmutex_unlock_mutex(count); } else { @@ -844,9 +844,9 @@ TEST_F(UserThreadNonBlockedTest, wait_for_sample_besteffort) } } - ASSERT_EQ(1, eprosima::fastrtps::tmutex_get_num_mutexes()); - ASSERT_EQ(0, eprosima::fastrtps::tmutex_get_num_lock_type()); - ASSERT_EQ(1, eprosima::fastrtps::tmutex_get_num_timedlock_type()); + ASSERT_EQ(1, eprosima::fastdds::tmutex_get_num_mutexes()); + ASSERT_EQ(0, eprosima::fastdds::tmutex_get_num_lock_type()); + ASSERT_EQ(1, eprosima::fastdds::tmutex_get_num_timedlock_type()); } /*! @@ -866,20 +866,20 @@ TEST_F(UserThreadNonBlockedTest, wait_for_sample_reliable) datawriter_->wait_for_acknowledgments({0, 100000000}); // Record the mutexes. - eprosima::fastrtps::tmutex_start_recording(); + eprosima::fastdds::tmutex_start_recording(); datareader_->wait_for_unread_message({0, 100000000}); - eprosima::fastrtps::tmutex_stop_recording(); + eprosima::fastdds::tmutex_stop_recording(); - for (size_t count = 0; count < eprosima::fastrtps::tmutex_get_num_mutexes(); ++count) + for (size_t count = 0; count < eprosima::fastdds::tmutex_get_num_mutexes(); ++count) { datawriter_->write(reinterpret_cast(&sample)); datawriter_->wait_for_acknowledgments({0, 100000000}); std::cout << "Testing mutex " << count << std::endl; // Start testing locking the mutexes. - if (eprosima::fastrtps::tmutex_lock_mutex(count)) + if (eprosima::fastdds::tmutex_lock_mutex(count)) { std::promise> promise; std::future> future = promise.get_future(); @@ -896,12 +896,12 @@ TEST_F(UserThreadNonBlockedTest, wait_for_sample_reliable) // If main mutex cannot be taken, the write fails. // But for the rest the information is stored and it is as if the samples was sent. ASSERT_EQ(count == 0 ? false : true, returned_value.first); - std::chrono::microseconds max_w(eprosima::fastrtps::rtps::TimeConv::Time_t2MicroSecondsInt64( + std::chrono::microseconds max_w(eprosima::fastdds::rtps::TimeConv::Time_t2MicroSecondsInt64( datareader_qos_.reliability().max_blocking_time)); ASSERT_GE(returned_value.second, max_w); ASSERT_LE(returned_value.second - max_w, std::chrono::milliseconds(1)); - eprosima::fastrtps::tmutex_unlock_mutex(count); + eprosima::fastdds::tmutex_unlock_mutex(count); } else { @@ -909,9 +909,9 @@ TEST_F(UserThreadNonBlockedTest, wait_for_sample_reliable) } } - ASSERT_EQ(1, eprosima::fastrtps::tmutex_get_num_mutexes()); - ASSERT_EQ(0, eprosima::fastrtps::tmutex_get_num_lock_type()); - ASSERT_EQ(1, eprosima::fastrtps::tmutex_get_num_timedlock_type()); + ASSERT_EQ(1, eprosima::fastdds::tmutex_get_num_mutexes()); + ASSERT_EQ(0, eprosima::fastdds::tmutex_get_num_lock_type()); + ASSERT_EQ(1, eprosima::fastdds::tmutex_get_num_timedlock_type()); } int main( diff --git a/test/realtime/mutex_testing_tool/Mutex.cpp b/test/realtime/mutex_testing_tool/Mutex.cpp index 4420474d456..d073d58e945 100644 --- a/test/realtime/mutex_testing_tool/Mutex.cpp +++ b/test/realtime/mutex_testing_tool/Mutex.cpp @@ -26,45 +26,45 @@ int pthread_mutex_lock( pthread_mutex_t* mutex) { - pid_t pid = eprosima::fastrtps::g_tmutex_thread_pid; + pid_t pid = eprosima::fastdds::g_tmutex_thread_pid; if (0 != pid) { if (pid == GET_TID()) { - eprosima::fastrtps::tmutex_record_mutex_(eprosima::fastrtps::LockType::LOCK, mutex); + eprosima::fastdds::tmutex_record_mutex_(eprosima::fastdds::LockType::LOCK, mutex); } } - if (eprosima::fastrtps::g_origin_lock_func == nullptr) + if (eprosima::fastdds::g_origin_lock_func == nullptr) { - eprosima::fastrtps::g_origin_lock_func = (int (*)(pthread_mutex_t*))dlsym(RTLD_NEXT, "pthread_mutex_lock"); + eprosima::fastdds::g_origin_lock_func = (int (*)(pthread_mutex_t*))dlsym(RTLD_NEXT, "pthread_mutex_lock"); } - return (*eprosima::fastrtps::g_origin_lock_func)(mutex); + return (*eprosima::fastdds::g_origin_lock_func)(mutex); } int pthread_mutex_timedlock( pthread_mutex_t* mutex, const struct timespec* abs_timeout) { - pid_t pid = eprosima::fastrtps::g_tmutex_thread_pid; + pid_t pid = eprosima::fastdds::g_tmutex_thread_pid; if (0 != pid) { if (pid == GET_TID()) { - eprosima::fastrtps::tmutex_record_mutex_(eprosima::fastrtps::LockType::TIMED_LOCK, mutex); + eprosima::fastdds::tmutex_record_mutex_(eprosima::fastdds::LockType::TIMED_LOCK, mutex); } } - if (eprosima::fastrtps::g_origin_timedlock_func == nullptr) + if (eprosima::fastdds::g_origin_timedlock_func == nullptr) { - eprosima::fastrtps::g_origin_timedlock_func = + eprosima::fastdds::g_origin_timedlock_func = (int (*)(pthread_mutex_t*, const struct timespec*))dlsym(RTLD_NEXT, "pthread_mutex_timedlock"); } - return (*eprosima::fastrtps::g_origin_timedlock_func)(mutex, abs_timeout); + return (*eprosima::fastdds::g_origin_timedlock_func)(mutex, abs_timeout); } int pthread_mutex_clocklock( @@ -72,22 +72,22 @@ int pthread_mutex_clocklock( clockid_t clock, const struct timespec* abs_timeout) { - pid_t pid = eprosima::fastrtps::g_tmutex_thread_pid; + pid_t pid = eprosima::fastdds::g_tmutex_thread_pid; if (0 != pid) { if (pid == GET_TID()) { - eprosima::fastrtps::tmutex_record_mutex_(eprosima::fastrtps::LockType::TIMED_LOCK, mutex); + eprosima::fastdds::tmutex_record_mutex_(eprosima::fastdds::LockType::TIMED_LOCK, mutex); } } - if (eprosima::fastrtps::g_origin_clocklock_func == nullptr) + if (eprosima::fastdds::g_origin_clocklock_func == nullptr) { - eprosima::fastrtps::g_origin_clocklock_func = + eprosima::fastdds::g_origin_clocklock_func = (int (*)(pthread_mutex_t*, clockid_t, const struct timespec*))dlsym(RTLD_NEXT, "pthread_mutex_clocklock"); } - return (*eprosima::fastrtps::g_origin_clocklock_func)(mutex, clock, abs_timeout); + return (*eprosima::fastdds::g_origin_clocklock_func)(mutex, clock, abs_timeout); } diff --git a/test/realtime/mutex_testing_tool/TMutex.cpp b/test/realtime/mutex_testing_tool/TMutex.cpp index 964b65117ab..3d2afaf2e05 100644 --- a/test/realtime/mutex_testing_tool/TMutex.cpp +++ b/test/realtime/mutex_testing_tool/TMutex.cpp @@ -27,10 +27,10 @@ // TODO contar que solo bloquea una vez y nunca mas despues de timeout. // TODO si se bloquea el dos, que no se bloqueen los posteriores -using namespace eprosima::fastrtps; +using namespace eprosima::fastdds; namespace eprosima { -namespace fastrtps { +namespace fastdds { std::atomic g_tmutex_thread_pid(0); // *INDENT-OFF* Uncrustify parse this as a function declaration instead of a function pointer. @@ -67,10 +67,10 @@ int32_t tmutex_find_record( return returned_position; } -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima -void eprosima::fastrtps::tmutex_start_recording() +void eprosima::fastdds::tmutex_start_recording() { assert(0 == g_tmutex_thread_pid); g_tmutex_thread_pid = GET_TID(); @@ -78,13 +78,13 @@ void eprosima::fastrtps::tmutex_start_recording() g_tmutex_records_end = -1; } -void eprosima::fastrtps::tmutex_stop_recording() +void eprosima::fastdds::tmutex_stop_recording() { assert(0 < g_tmutex_thread_pid); g_tmutex_thread_pid = 0; } -void eprosima::fastrtps::tmutex_record_mutex_( +void eprosima::fastdds::tmutex_record_mutex_( LockType type, pthread_mutex_t* mutex) { @@ -104,13 +104,13 @@ void eprosima::fastrtps::tmutex_record_mutex_( ++g_tmutex_records[position].count; } -size_t eprosima::fastrtps::tmutex_get_num_mutexes() +size_t eprosima::fastdds::tmutex_get_num_mutexes() { assert(0 == g_tmutex_thread_pid); return g_tmutex_records_end + 1; } -size_t eprosima::fastrtps::tmutex_get_num_lock_type() +size_t eprosima::fastdds::tmutex_get_num_lock_type() { size_t counter = 0; @@ -129,7 +129,7 @@ size_t eprosima::fastrtps::tmutex_get_num_lock_type() return counter; } -size_t eprosima::fastrtps::tmutex_get_num_timedlock_type() +size_t eprosima::fastdds::tmutex_get_num_timedlock_type() { size_t counter = 0; @@ -148,14 +148,14 @@ size_t eprosima::fastrtps::tmutex_get_num_timedlock_type() return counter; } -pthread_mutex_t* eprosima::fastrtps::tmutex_get_mutex( +pthread_mutex_t* eprosima::fastdds::tmutex_get_mutex( const size_t index) { assert(index <= size_t(g_tmutex_records_end)); return g_tmutex_records[index].mutex; } -bool eprosima::fastrtps::tmutex_lock_mutex( +bool eprosima::fastdds::tmutex_lock_mutex( const size_t index) { assert(index <= size_t(g_tmutex_records_end)); @@ -173,7 +173,7 @@ bool eprosima::fastrtps::tmutex_lock_mutex( return false; } -void eprosima::fastrtps::tmutex_unlock_mutex( +void eprosima::fastdds::tmutex_unlock_mutex( const size_t index) { assert(index <= size_t(g_tmutex_records_end)); diff --git a/test/realtime/mutex_testing_tool/TMutex.hpp b/test/realtime/mutex_testing_tool/TMutex.hpp index 75fa62da571..b728714da75 100644 --- a/test/realtime/mutex_testing_tool/TMutex.hpp +++ b/test/realtime/mutex_testing_tool/TMutex.hpp @@ -44,7 +44,7 @@ using pid_t = int; #include namespace eprosima { -namespace fastrtps { +namespace fastdds { enum LockType : int32_t { @@ -130,7 +130,7 @@ size_t tmutex_get_num_lock_type(); */ size_t tmutex_get_num_timedlock_type(); -} //namespace fastrtps +} //namespace fastdds } //namespace eprosima #endif // __TEST_REALTIME_TMUTEX_HPP__ diff --git a/test/realtime/mutex_testing_tool/TMutexTests.cpp b/test/realtime/mutex_testing_tool/TMutexTests.cpp index 71a72d5724f..bedbf4108a6 100644 --- a/test/realtime/mutex_testing_tool/TMutexTests.cpp +++ b/test/realtime/mutex_testing_tool/TMutexTests.cpp @@ -23,7 +23,7 @@ #include #include -using namespace eprosima::fastrtps; +using namespace eprosima::fastdds; TEST(TMutexTests, record_mutexes) { @@ -91,10 +91,22 @@ TEST(TMutexTests, lock_mutexes) std::future future_2 = promise_2.get_future(); std::future future_3 = promise_3.get_future(); std::future future_4 = promise_4.get_future(); - std::thread([&]{ mutex_1.lock(); promise_1.set_value_at_thread_exit(0); }).detach(); - std::thread([&]{ mutex_2.lock(); promise_2.set_value_at_thread_exit(0); }).detach(); - std::thread([&]{ mutex_3.lock(); promise_3.set_value_at_thread_exit(0); }).detach(); - std::thread([&]{ mutex_4.lock(); promise_4.set_value_at_thread_exit(0); }).detach(); + std::thread([&] + { + mutex_1.lock(); promise_1.set_value_at_thread_exit(0); + }).detach(); + std::thread([&] + { + mutex_2.lock(); promise_2.set_value_at_thread_exit(0); + }).detach(); + std::thread([&] + { + mutex_3.lock(); promise_3.set_value_at_thread_exit(0); + }).detach(); + std::thread([&] + { + mutex_4.lock(); promise_4.set_value_at_thread_exit(0); + }).detach(); std::cout << "Waiting..." << std::endl; ASSERT_TRUE(future_1.wait_for(std::chrono::milliseconds(200)) == std::future_status::timeout); @@ -142,10 +154,16 @@ TEST(TMutexTests, lock_timed_mutexes) std::promise promise_2; std::future future_1 = promise_1.get_future(); std::future future_2 = promise_2.get_future(); - std::thread([&]{ mutex_1.try_lock_until(std::chrono::steady_clock::now() + std::chrono::milliseconds(100)); - promise_1.set_value_at_thread_exit(0); }).detach(); - std::thread([&]{ mutex_2.try_lock_until(std::chrono::steady_clock::now() + std::chrono::milliseconds(100)); - promise_2.set_value_at_thread_exit(0); }).detach(); + std::thread([&] + { + mutex_1.try_lock_until(std::chrono::steady_clock::now() + std::chrono::milliseconds(100)); + promise_1.set_value_at_thread_exit(0); + }).detach(); + std::thread([&] + { + mutex_2.try_lock_until(std::chrono::steady_clock::now() + std::chrono::milliseconds(100)); + promise_2.set_value_at_thread_exit(0); + }).detach(); std::cout << "Waiting..." << std::endl; future_1.wait(); @@ -157,7 +175,9 @@ TEST(TMutexTests, lock_timed_mutexes) } } -int main(int argc, char **argv) +int main( + int argc, + char** argv) { testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); diff --git a/test/unittest/common/CustomPayloadPool.hpp b/test/unittest/common/CustomPayloadPool.hpp index 6f191e7adac..acd57808de8 100644 --- a/test/unittest/common/CustomPayloadPool.hpp +++ b/test/unittest/common/CustomPayloadPool.hpp @@ -24,7 +24,7 @@ #include #include -class CustomPayloadPool : public eprosima::fastrtps::rtps::IPayloadPool +class CustomPayloadPool : public eprosima::fastdds::rtps::IPayloadPool { public: @@ -32,7 +32,7 @@ class CustomPayloadPool : public eprosima::fastrtps::rtps::IPayloadPool bool get_payload( unsigned int size, - eprosima::fastrtps::rtps::SerializedPayload_t& payload) + eprosima::fastdds::rtps::SerializedPayload_t& payload) { // Reserve new memory for the payload buffer unsigned char* payload_buff = new unsigned char[size]; @@ -51,8 +51,8 @@ class CustomPayloadPool : public eprosima::fastrtps::rtps::IPayloadPool } bool get_payload( - const eprosima::fastrtps::rtps::SerializedPayload_t& data, - eprosima::fastrtps::rtps::SerializedPayload_t& payload) + const eprosima::fastdds::rtps::SerializedPayload_t& data, + eprosima::fastdds::rtps::SerializedPayload_t& payload) { // Reserve new memory for the payload buffer unsigned char* payload_buff = new unsigned char[data.length]; @@ -74,7 +74,7 @@ class CustomPayloadPool : public eprosima::fastrtps::rtps::IPayloadPool } bool release_payload( - eprosima::fastrtps::rtps::SerializedPayload_t& payload) + eprosima::fastdds::rtps::SerializedPayload_t& payload) { // Ensure precondition assert(this == payload.payload_owner); diff --git a/test/unittest/common/operators.hpp b/test/unittest/common/operators.hpp index c5eb289c186..831531e1d4d 100644 --- a/test/unittest/common/operators.hpp +++ b/test/unittest/common/operators.hpp @@ -18,7 +18,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { // Make SequenceNumberSet_t compatible with GMock macros @@ -73,5 +73,5 @@ bool operator ==( } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/test/unittest/dds/core/condition/ConditionTests.cpp b/test/unittest/dds/core/condition/ConditionTests.cpp index bd2f9f66e48..387cd9172cc 100644 --- a/test/unittest/dds/core/condition/ConditionTests.cpp +++ b/test/unittest/dds/core/condition/ConditionTests.cpp @@ -142,7 +142,7 @@ TEST_F(ConditionTests, waitset_wait) GuardCondition condition; ConditionSeq conditions; WaitSet wait_set; - const eprosima::fastrtps::Duration_t timeout{ 1, 0 }; + const eprosima::fastdds::Duration_t timeout{ 1, 0 }; // Waiting on empty wait set should timeout EXPECT_EQ(RETCODE_TIMEOUT, wait_set.wait(conditions, timeout)); @@ -217,7 +217,7 @@ TEST_F(ConditionTests, waitset_wait) wait_set.attach_condition(triggered_condition); }); - EXPECT_EQ(RETCODE_OK, wait_set.wait(conditions, eprosima::fastrtps::c_TimeInfinite)); + EXPECT_EQ(RETCODE_OK, wait_set.wait(conditions, eprosima::fastdds::c_TimeInfinite)); EXPECT_EQ(1u, conditions.size()); EXPECT_EQ(conditions.cend(), std::find(conditions.cbegin(), conditions.cend(), &condition)); EXPECT_NE(conditions.cend(), std::find(conditions.cbegin(), conditions.cend(), &triggered_condition)); @@ -262,7 +262,7 @@ TEST_F(ConditionTests, status_condition_trigger) { WaitSet wait_set; ConditionSeq conditions; - const eprosima::fastrtps::Duration_t timeout{ 1, 0 }; + const eprosima::fastdds::Duration_t timeout{ 1, 0 }; Entity entity; StatusCondition& cond = entity.get_statuscondition(); @@ -273,7 +273,7 @@ TEST_F(ConditionTests, status_condition_trigger) auto wait_for_trigger = [&]() { - EXPECT_EQ(RETCODE_OK, wait_set.wait(conditions, eprosima::fastrtps::c_TimeInfinite)); + EXPECT_EQ(RETCODE_OK, wait_set.wait(conditions, eprosima::fastdds::c_TimeInfinite)); EXPECT_EQ(1u, conditions.size()); EXPECT_EQ(&cond, conditions[0]); EXPECT_TRUE(cond.get_trigger_value()); diff --git a/test/unittest/dds/core/condition/WaitSetImplTests.cpp b/test/unittest/dds/core/condition/WaitSetImplTests.cpp index a9e23ddcf66..f168f57f127 100644 --- a/test/unittest/dds/core/condition/WaitSetImplTests.cpp +++ b/test/unittest/dds/core/condition/WaitSetImplTests.cpp @@ -97,7 +97,7 @@ TEST(WaitSetImplTests, condition_management) TEST(WaitSetImplTests, wait) { - const eprosima::fastrtps::Duration_t timeout{ 1, 0 }; + const eprosima::fastdds::Duration_t timeout{ 1, 0 }; TestCondition condition; @@ -186,7 +186,7 @@ TEST(WaitSetImplTests, wait) wait_set.attach_condition(triggered_condition); }); - EXPECT_EQ(RETCODE_OK, wait_set.wait(conditions, eprosima::fastrtps::c_TimeInfinite)); + EXPECT_EQ(RETCODE_OK, wait_set.wait(conditions, eprosima::fastdds::c_TimeInfinite)); EXPECT_EQ(1u, conditions.size()); EXPECT_EQ(conditions.cend(), std::find(conditions.cbegin(), conditions.cend(), &condition)); EXPECT_NE(conditions.cend(), std::find(conditions.cbegin(), conditions.cend(), &triggered_condition)); @@ -242,7 +242,7 @@ TEST(WaitSetImplTests, fix_wait_notification_lost) { // Not to use `WaitSetImpl::wait` with a timeout value, because the // `condition_variable::wait_for` could call _Predicate function again. - ret = wait_set.wait(conditions, eprosima::fastrtps::c_TimeInfinite); + ret = wait_set.wait(conditions, eprosima::fastdds::c_TimeInfinite); promise.set_value(); }); diff --git a/test/unittest/dds/participant/ParticipantTests.cpp b/test/unittest/dds/participant/ParticipantTests.cpp index 6d4ab0e9466..1fe54a7a112 100644 --- a/test/unittest/dds/participant/ParticipantTests.cpp +++ b/test/unittest/dds/participant/ParticipantTests.cpp @@ -83,9 +83,6 @@ namespace eprosima { namespace fastdds { namespace dds { -using fastrtps::PublisherAttributes; -using fastrtps::SubscriberAttributes; - // Mocked TopicDataType for Topic creation tests class TopicDataTypeMock : public TopicDataType { @@ -100,21 +97,21 @@ class TopicDataTypeMock : public TopicDataType bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } bool serialize( void* /*data*/, - fastrtps::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t* /*payload*/, DataRepresentationId_t /*data_representation*/) override { return true; } bool deserialize( - fastrtps::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t* /*payload*/, void* /*data*/) override { return true; @@ -148,7 +145,7 @@ class TopicDataTypeMock : public TopicDataType bool getKey( void* /*data*/, - fastrtps::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool /*force_md5*/) override { return true; @@ -174,21 +171,21 @@ class LoanableTopicDataTypeMock : public TopicDataType bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } bool serialize( void* /*data*/, - fastrtps::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t* /*payload*/, DataRepresentationId_t /*data_representation*/) override { return true; } bool deserialize( - fastrtps::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t* /*payload*/, void* /*data*/) override { return true; @@ -238,7 +235,7 @@ class LoanableTopicDataTypeMock : public TopicDataType bool getKey( void* /*data*/, - fastrtps::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool /*force_md5*/) override { return true; @@ -490,7 +487,7 @@ void check_equivalent_qos( ASSERT_EQ(qos_1.allocation(), qos_2.allocation()); for (auto property : qos_2.properties().properties()) { - ASSERT_NE(nullptr, fastrtps::rtps::PropertyPolicyHelper::find_property(qos_1.properties(), property.name())); + ASSERT_NE(nullptr, fastdds::rtps::PropertyPolicyHelper::find_property(qos_1.properties(), property.name())); } ASSERT_EQ(qos_1.properties().binary_properties(), qos_2.properties().binary_properties()); ASSERT_EQ(qos_1.wire_protocol(), qos_2.wire_protocol()); @@ -532,7 +529,7 @@ TEST(ParticipantTests, DomainParticipantQosPhysicalProperties) DomainParticipantQos qos_1; for (std::string property_name : property_names) { - std::string* property = fastrtps::rtps::PropertyPolicyHelper::find_property(qos_1.properties(), property_name); + std::string* property = fastdds::rtps::PropertyPolicyHelper::find_property(qos_1.properties(), property_name); ASSERT_EQ(nullptr, property); } #else @@ -540,7 +537,7 @@ TEST(ParticipantTests, DomainParticipantQosPhysicalProperties) DomainParticipantQos qos_2; for (std::string property_name : property_names) { - std::string* property = fastrtps::rtps::PropertyPolicyHelper::find_property(qos_2.properties(), property_name); + std::string* property = fastdds::rtps::PropertyPolicyHelper::find_property(qos_2.properties(), property_name); ASSERT_NE(nullptr, property); ASSERT_TRUE(property->empty()); } @@ -778,7 +775,7 @@ class DomainParticipantTest : public DomainParticipant void get_rtps_attributes( const DomainParticipant* participant, - fastrtps::rtps::RTPSParticipantAttributes& att) + fastdds::rtps::RTPSParticipantAttributes& att) { const DomainParticipantTest* participant_test = static_cast(participant); ASSERT_NE(nullptr, participant_test); @@ -810,15 +807,15 @@ void expected_remote_server_list_output( rtps::RemoteServerList_t& output) { rtps::RemoteServerAttributes server; - fastrtps::rtps::Locator_t locator; - fastrtps::rtps::IPLocator::setIPv4(locator, "84.22.253.128"); + fastdds::rtps::Locator_t locator; + fastdds::rtps::IPLocator::setIPv4(locator, "84.22.253.128"); locator.port = 8888; server.metatrafficUnicastLocatorList.push_back(locator); get_server_client_default_guidPrefix(0, server.guidPrefix); output.push_back(server); server.clear(); - fastrtps::rtps::IPLocator::setIPv4(locator, "127.0.0.1"); + fastdds::rtps::IPLocator::setIPv4(locator, "127.0.0.1"); locator.port = 1234; server.metatrafficUnicastLocatorList.push_back(locator); get_server_client_default_guidPrefix(2, server.guidPrefix); @@ -836,9 +833,9 @@ void set_participant_qos( rtps::RemoteServerList_t& output) { rtps::RemoteServerAttributes server; - fastrtps::rtps::Locator_t locator; + fastdds::rtps::Locator_t locator; server.ReadguidPrefix("44.53.00.5f.45.50.52.4f.53.49.4d.00"); - fastrtps::rtps::IPLocator::setIPv4(locator, "192.168.1.133"); + fastdds::rtps::IPLocator::setIPv4(locator, "192.168.1.133"); locator.port = 64863; server.metatrafficUnicastLocatorList.push_back(locator); qos.wire_protocol().builtin.discovery_config.m_DiscoveryServers.push_back(server); @@ -849,14 +846,14 @@ void set_server_qos( DomainParticipantQos& qos) { rtps::RemoteServerAttributes server; - fastrtps::rtps::Locator_t locator; + fastdds::rtps::Locator_t locator; server.ReadguidPrefix(rtps::DEFAULT_ROS2_SERVER_GUIDPREFIX); - fastrtps::rtps::IPLocator::setIPv4(locator, "172.17.0.5"); + fastdds::rtps::IPLocator::setIPv4(locator, "172.17.0.5"); locator.port = 4321; server.metatrafficUnicastLocatorList.push_back(locator); qos.wire_protocol().builtin.discovery_config.m_DiscoveryServers.push_back(server); - qos.wire_protocol().builtin.discovery_config.discoveryProtocol = fastrtps::rtps::DiscoveryProtocol::SERVER; - fastrtps::rtps::IPLocator::setIPv4(locator, "127.0.0.1"); + qos.wire_protocol().builtin.discovery_config.discoveryProtocol = fastdds::rtps::DiscoveryProtocol::SERVER; + fastdds::rtps::IPLocator::setIPv4(locator, "127.0.0.1"); locator.port = 5432; qos.wire_protocol().builtin.metatrafficUnicastLocatorList.push_back(locator); std::istringstream(rtps::DEFAULT_ROS2_SERVER_GUIDPREFIX) >> qos.wire_protocol().prefix; @@ -902,7 +899,7 @@ void set_and_check_with_environment_file( rtps::RemoteServerList_t output; rtps::RemoteServerAttributes server; - fastrtps::rtps::Locator_t locator; + fastdds::rtps::Locator_t locator; int id = 0; std::ofstream file(filename); @@ -921,11 +918,11 @@ void set_and_check_with_environment_file( std::smatch::iterator it = mr.cbegin(); auto address = (++it)->str(); - fastrtps::rtps::IPLocator::setIPv4(locator, address); + fastdds::rtps::IPLocator::setIPv4(locator, address); assert(it != mr.cend()); int port = stoi((++it)->str()); - fastrtps::rtps::IPLocator::setPhysicalPort(locator, static_cast(port)); + fastdds::rtps::IPLocator::setPhysicalPort(locator, static_cast(port)); // add the server to the list server.clear(); @@ -943,9 +940,9 @@ void set_and_check_with_environment_file( // Wait for the file watch callback std::this_thread::sleep_for(std::chrono::milliseconds(100)); - fastrtps::rtps::RTPSParticipantAttributes attributes; + fastdds::rtps::RTPSParticipantAttributes attributes; get_rtps_attributes(participant, attributes); - EXPECT_EQ(attributes.builtin.discovery_config.discoveryProtocol, fastrtps::rtps::DiscoveryProtocol::SERVER); + EXPECT_EQ(attributes.builtin.discovery_config.discoveryProtocol, fastdds::rtps::DiscoveryProtocol::SERVER); EXPECT_EQ(attributes.builtin.discovery_config.m_DiscoveryServers, output); } @@ -968,13 +965,13 @@ TEST(ParticipantTests, SimpleParticipantRemoteServerListConfiguration) (uint32_t)GET_PID() % 230, qos); ASSERT_NE(nullptr, participant); - fastrtps::rtps::RTPSParticipantAttributes attributes; + fastdds::rtps::RTPSParticipantAttributes attributes; get_rtps_attributes(participant, attributes); - EXPECT_EQ(attributes.builtin.discovery_config.discoveryProtocol, fastrtps::rtps::DiscoveryProtocol::CLIENT); + EXPECT_EQ(attributes.builtin.discovery_config.discoveryProtocol, fastdds::rtps::DiscoveryProtocol::CLIENT); EXPECT_EQ(attributes.builtin.discovery_config.m_DiscoveryServers, output); // check UDPv6 transport is there - auto udpv6_check = [](fastrtps::rtps::RTPSParticipantAttributes& attributes) -> bool + auto udpv6_check = [](fastdds::rtps::RTPSParticipantAttributes& attributes) -> bool { for (auto& transportDescriptor : attributes.userTransports) { @@ -1021,9 +1018,9 @@ TEST(ParticipantTests, TransformSimpleParticipantToSuperclientByEnvVariable) (uint32_t)GET_PID() % 230, qos); ASSERT_NE(nullptr, participant); - fastrtps::rtps::RTPSParticipantAttributes attributes; + fastdds::rtps::RTPSParticipantAttributes attributes; get_rtps_attributes(participant, attributes); - EXPECT_EQ(attributes.builtin.discovery_config.discoveryProtocol, fastrtps::rtps::DiscoveryProtocol::CLIENT); + EXPECT_EQ(attributes.builtin.discovery_config.discoveryProtocol, fastdds::rtps::DiscoveryProtocol::CLIENT); EXPECT_EQ(attributes.builtin.discovery_config.m_DiscoveryServers, output); #ifdef _WIN32 @@ -1036,13 +1033,13 @@ TEST(ParticipantTests, TransformSimpleParticipantToSuperclientByEnvVariable) (uint32_t)GET_PID() % 230, qos); ASSERT_NE(nullptr, participant_2); - fastrtps::rtps::RTPSParticipantAttributes attributes_2; + fastdds::rtps::RTPSParticipantAttributes attributes_2; get_rtps_attributes(participant_2, attributes_2); - EXPECT_EQ(attributes_2.builtin.discovery_config.discoveryProtocol, fastrtps::rtps::DiscoveryProtocol::SUPER_CLIENT); + EXPECT_EQ(attributes_2.builtin.discovery_config.discoveryProtocol, fastdds::rtps::DiscoveryProtocol::SUPER_CLIENT); EXPECT_EQ(attributes_2.builtin.discovery_config.m_DiscoveryServers, output); // check UDPv6 transport is there - auto udpv6_check = [](fastrtps::rtps::RTPSParticipantAttributes& attributes) -> bool + auto udpv6_check = [](fastdds::rtps::RTPSParticipantAttributes& attributes) -> bool { for (auto& transportDescriptor : attributes.userTransports) { @@ -1061,7 +1058,7 @@ TEST(ParticipantTests, TransformSimpleParticipantToSuperclientByEnvVariable) EXPECT_EQ(RETCODE_OK, participant->set_qos(result_qos)); // check UDPv6 transport is there - auto udpv6_check_2 = [](fastrtps::rtps::RTPSParticipantAttributes& attributes_2) -> bool + auto udpv6_check_2 = [](fastdds::rtps::RTPSParticipantAttributes& attributes_2) -> bool { for (auto& transportDescriptor : attributes_2.userTransports) { @@ -1098,9 +1095,9 @@ TEST(ParticipantTests, SimpleParticipantRemoteServerListConfigurationDNS) // fill in expected result rtps::RemoteServerAttributes server; - fastrtps::rtps::Locator_t locator4(11811), locator6(LOCATOR_KIND_UDPv6, 11811); - fastrtps::rtps::IPLocator::setIPv4(locator4, "216.58.215.164"); - fastrtps::rtps::IPLocator::setIPv6(locator6, "2a00:1450:400e:803::2004"); + fastdds::rtps::Locator_t locator4(11811), locator6(LOCATOR_KIND_UDPv6, 11811); + fastdds::rtps::IPLocator::setIPv4(locator4, "216.58.215.164"); + fastdds::rtps::IPLocator::setIPv6(locator6, "2a00:1450:400e:803::2004"); server.metatrafficUnicastLocatorList.push_back(locator4); server.metatrafficUnicastLocatorList.push_back(locator6); get_server_client_default_guidPrefix(0, server.guidPrefix); @@ -1113,13 +1110,13 @@ TEST(ParticipantTests, SimpleParticipantRemoteServerListConfigurationDNS) PARTICIPANT_QOS_DEFAULT); ASSERT_NE(nullptr, participant); - fastrtps::rtps::RTPSParticipantAttributes attributes; + fastdds::rtps::RTPSParticipantAttributes attributes; get_rtps_attributes(participant, attributes); - EXPECT_EQ(attributes.builtin.discovery_config.discoveryProtocol, fastrtps::rtps::DiscoveryProtocol::CLIENT); + EXPECT_EQ(attributes.builtin.discovery_config.discoveryProtocol, fastdds::rtps::DiscoveryProtocol::CLIENT); EXPECT_EQ(attributes.builtin.discovery_config.m_DiscoveryServers, output); // check UDPv6 transport is there - auto udpv6_check = [](fastrtps::rtps::RTPSParticipantAttributes& attributes) -> bool + auto udpv6_check = [](fastdds::rtps::RTPSParticipantAttributes& attributes) -> bool { for (auto& transportDescriptor : attributes.userTransports) { @@ -1156,7 +1153,7 @@ TEST(ParticipantTests, SimpleParticipantDynamicAdditionRemoteServers) DomainParticipant* participant = DomainParticipantFactory::get_instance()->create_participant( (uint32_t)GET_PID() % 230, qos); ASSERT_NE(nullptr, participant); - fastrtps::rtps::RTPSParticipantAttributes attributes; + fastdds::rtps::RTPSParticipantAttributes attributes; get_rtps_attributes(participant, attributes); // As the environment file does not have the ROS_DISCOVERY_SERVER variable set, this variable has been loaded from @@ -1174,8 +1171,8 @@ TEST(ParticipantTests, SimpleParticipantDynamicAdditionRemoteServers) get_rtps_attributes(participant, attributes); rtps::RemoteServerAttributes server; - fastrtps::rtps::Locator_t locator; - fastrtps::rtps::IPLocator::setIPv4(locator, "192.168.1.133"); + fastdds::rtps::Locator_t locator; + fastdds::rtps::IPLocator::setIPv4(locator, "192.168.1.133"); locator.port = 64863; server.metatrafficUnicastLocatorList.push_back(locator); get_server_client_default_guidPrefix(1, server.guidPrefix); @@ -1200,13 +1197,13 @@ TEST(ParticipantTests, ClientParticipantRemoteServerListConfiguration) rtps::RemoteServerList_t qos_output; set_participant_qos(qos, qos_output); - qos.wire_protocol().builtin.discovery_config.discoveryProtocol = fastrtps::rtps::DiscoveryProtocol::CLIENT; + qos.wire_protocol().builtin.discovery_config.discoveryProtocol = fastdds::rtps::DiscoveryProtocol::CLIENT; DomainParticipant* participant = DomainParticipantFactory::get_instance()->create_participant( (uint32_t)GET_PID() % 230, qos); ASSERT_NE(nullptr, participant); - fastrtps::rtps::RTPSParticipantAttributes attributes; + fastdds::rtps::RTPSParticipantAttributes attributes; get_rtps_attributes(participant, attributes); - EXPECT_EQ(attributes.builtin.discovery_config.discoveryProtocol, fastrtps::rtps::DiscoveryProtocol::CLIENT); + EXPECT_EQ(attributes.builtin.discovery_config.discoveryProtocol, fastdds::rtps::DiscoveryProtocol::CLIENT); EXPECT_EQ(attributes.builtin.discovery_config.m_DiscoveryServers, qos_output); DomainParticipantQos result_qos = participant->get_qos(); EXPECT_EQ(RETCODE_OK, participant->set_qos(result_qos)); @@ -1223,19 +1220,19 @@ TEST(ParticipantTests, ServerParticipantEnvironmentConfiguration) set_environment_variable(); DomainParticipantQos server_qos; - server_qos.wire_protocol().builtin.discovery_config.discoveryProtocol = fastrtps::rtps::DiscoveryProtocol::SERVER; + server_qos.wire_protocol().builtin.discovery_config.discoveryProtocol = fastdds::rtps::DiscoveryProtocol::SERVER; // Listening locator: requirement for SERVERs - fastrtps::rtps::Locator_t locator; - fastrtps::rtps::IPLocator::setIPv4(locator, "127.0.0.1"); + fastdds::rtps::Locator_t locator; + fastdds::rtps::IPLocator::setIPv4(locator, "127.0.0.1"); locator.port = 5432; server_qos.wire_protocol().builtin.metatrafficUnicastLocatorList.push_back(locator); std::istringstream(rtps::DEFAULT_ROS2_SERVER_GUIDPREFIX) >> server_qos.wire_protocol().prefix; DomainParticipant* participant = DomainParticipantFactory::get_instance()->create_participant( (uint32_t)GET_PID() % 230, server_qos); ASSERT_NE(nullptr, participant); - fastrtps::rtps::RTPSParticipantAttributes attributes; + fastdds::rtps::RTPSParticipantAttributes attributes; get_rtps_attributes(participant, attributes); - EXPECT_EQ(attributes.builtin.discovery_config.discoveryProtocol, fastrtps::rtps::DiscoveryProtocol::SERVER); + EXPECT_EQ(attributes.builtin.discovery_config.discoveryProtocol, fastdds::rtps::DiscoveryProtocol::SERVER); EXPECT_TRUE(attributes.builtin.discovery_config.m_DiscoveryServers.empty()); DomainParticipantQos result_qos = participant->get_qos(); EXPECT_EQ(RETCODE_OK, participant->set_qos(result_qos)); @@ -1252,10 +1249,10 @@ TEST(ParticipantTests, ServerParticipantRemoteServerListConfiguration) DomainParticipantQos qos; rtps::RemoteServerList_t qos_output; - fastrtps::rtps::Locator_t locator; + fastdds::rtps::Locator_t locator; set_participant_qos(qos, qos_output); - qos.wire_protocol().builtin.discovery_config.discoveryProtocol = fastrtps::rtps::DiscoveryProtocol::SERVER; - fastrtps::rtps::IPLocator::setIPv4(locator, "127.0.0.1"); + qos.wire_protocol().builtin.discovery_config.discoveryProtocol = fastdds::rtps::DiscoveryProtocol::SERVER; + fastdds::rtps::IPLocator::setIPv4(locator, "127.0.0.1"); locator.port = 5432; qos.wire_protocol().builtin.metatrafficUnicastLocatorList.push_back(locator); std::istringstream(rtps::DEFAULT_ROS2_SERVER_GUIDPREFIX) >> qos.wire_protocol().prefix; @@ -1263,9 +1260,9 @@ TEST(ParticipantTests, ServerParticipantRemoteServerListConfiguration) DomainParticipant* participant = DomainParticipantFactory::get_instance()->create_participant( (uint32_t)GET_PID() % 230, qos); ASSERT_NE(nullptr, participant); - fastrtps::rtps::RTPSParticipantAttributes attributes; + fastdds::rtps::RTPSParticipantAttributes attributes; get_rtps_attributes(participant, attributes); - EXPECT_EQ(attributes.builtin.discovery_config.discoveryProtocol, fastrtps::rtps::DiscoveryProtocol::SERVER); + EXPECT_EQ(attributes.builtin.discovery_config.discoveryProtocol, fastdds::rtps::DiscoveryProtocol::SERVER); EXPECT_EQ(attributes.builtin.discovery_config.m_DiscoveryServers, qos_output); DomainParticipantQos result_qos = participant->get_qos(); EXPECT_EQ(RETCODE_OK, participant->set_qos(result_qos)); @@ -1292,10 +1289,10 @@ TEST(ParticipantTests, ServerParticipantInconsistentRemoteServerListConfiguratio DomainParticipantQos qos; rtps::RemoteServerList_t qos_output; - fastrtps::rtps::Locator_t locator; + fastdds::rtps::Locator_t locator; set_participant_qos(qos, qos_output); - qos.wire_protocol().builtin.discovery_config.discoveryProtocol = fastrtps::rtps::DiscoveryProtocol::SERVER; - fastrtps::rtps::IPLocator::setIPv4(locator, "127.0.0.1"); + qos.wire_protocol().builtin.discovery_config.discoveryProtocol = fastdds::rtps::DiscoveryProtocol::SERVER; + fastdds::rtps::IPLocator::setIPv4(locator, "127.0.0.1"); locator.port = 5432; qos.wire_protocol().builtin.metatrafficUnicastLocatorList.push_back(locator); std::istringstream(rtps::DEFAULT_ROS2_SERVER_GUIDPREFIX) >> qos.wire_protocol().prefix; @@ -1303,9 +1300,9 @@ TEST(ParticipantTests, ServerParticipantInconsistentRemoteServerListConfiguratio DomainParticipant* participant = DomainParticipantFactory::get_instance()->create_participant( (uint32_t)GET_PID() % 230, qos); ASSERT_NE(nullptr, participant); - fastrtps::rtps::RTPSParticipantAttributes attributes; + fastdds::rtps::RTPSParticipantAttributes attributes; get_rtps_attributes(participant, attributes); - EXPECT_EQ(attributes.builtin.discovery_config.discoveryProtocol, fastrtps::rtps::DiscoveryProtocol::SERVER); + EXPECT_EQ(attributes.builtin.discovery_config.discoveryProtocol, fastdds::rtps::DiscoveryProtocol::SERVER); EXPECT_EQ(attributes.builtin.discovery_config.m_DiscoveryServers, qos_output); // Modify environment file: fails cause the initial guid prefix did not comply with the schema @@ -1342,15 +1339,15 @@ TEST(ParticipantTests, ServerParticipantInconsistentLocatorsRemoteServerListConf rtps::RemoteServerList_t output; rtps::RemoteServerAttributes server; - fastrtps::rtps::Locator_t locator; + fastdds::rtps::Locator_t locator; server.clear(); - fastrtps::rtps::IPLocator::setIPv4(locator, "172.17.0.5"); + fastdds::rtps::IPLocator::setIPv4(locator, "172.17.0.5"); locator.port = 4321; server.metatrafficUnicastLocatorList.push_back(locator); get_server_client_default_guidPrefix(0, server.guidPrefix); output.push_back(server); server.clear(); - fastrtps::rtps::IPLocator::setIPv4(locator, "192.168.1.133"); + fastdds::rtps::IPLocator::setIPv4(locator, "192.168.1.133"); locator.port = 64863; server.metatrafficUnicastLocatorList.push_back(locator); get_server_client_default_guidPrefix(1, server.guidPrefix); @@ -1366,7 +1363,7 @@ TEST(ParticipantTests, ServerParticipantInconsistentLocatorsRemoteServerListConf file << "{\"ROS_DISCOVERY_SERVER\": \"172.17.0.5:4321;192.168.1.133:64863\"}"; file.close(); std::this_thread::sleep_for(std::chrono::milliseconds(100)); - fastrtps::rtps::RTPSParticipantAttributes attributes; + fastdds::rtps::RTPSParticipantAttributes attributes; get_rtps_attributes(participant, attributes); EXPECT_EQ(attributes.builtin.discovery_config.m_DiscoveryServers, output); #endif // APPLE @@ -1419,8 +1416,8 @@ TEST(ParticipantTests, ServerParticipantCorrectRemoteServerListConfiguration) rtps::RemoteServerList_t output; rtps::RemoteServerAttributes server; - fastrtps::rtps::Locator_t locator; - fastrtps::rtps::IPLocator::setIPv4(locator, "172.17.0.5"); + fastdds::rtps::Locator_t locator; + fastdds::rtps::IPLocator::setIPv4(locator, "172.17.0.5"); locator.port = 4321; server.metatrafficUnicastLocatorList.push_back(locator); get_server_client_default_guidPrefix(0, server.guidPrefix); @@ -1429,7 +1426,7 @@ TEST(ParticipantTests, ServerParticipantCorrectRemoteServerListConfiguration) DomainParticipant* participant = DomainParticipantFactory::get_instance()->create_participant( (uint32_t)GET_PID() % 230, qos); ASSERT_NE(nullptr, participant); - fastrtps::rtps::RTPSParticipantAttributes attributes; + fastdds::rtps::RTPSParticipantAttributes attributes; get_rtps_attributes(participant, attributes); EXPECT_EQ(attributes.builtin.discovery_config.m_DiscoveryServers, output); // Add new server through environment file @@ -1443,7 +1440,7 @@ TEST(ParticipantTests, ServerParticipantCorrectRemoteServerListConfiguration) file.close(); std::this_thread::sleep_for(std::chrono::milliseconds(100)); server.clear(); - fastrtps::rtps::IPLocator::setIPv4(locator, "192.168.1.133"); + fastdds::rtps::IPLocator::setIPv4(locator, "192.168.1.133"); locator.port = 64863; server.metatrafficUnicastLocatorList.push_back(locator); get_server_client_default_guidPrefix(2, server.guidPrefix); @@ -1457,7 +1454,7 @@ TEST(ParticipantTests, ServerParticipantCorrectRemoteServerListConfiguration) file.close(); std::this_thread::sleep_for(std::chrono::milliseconds(100)); server.clear(); - fastrtps::rtps::IPLocator::setIPv4(locator, "127.0.0.1"); + fastdds::rtps::IPLocator::setIPv4(locator, "127.0.0.1"); locator.port = 1234; server.metatrafficUnicastLocatorList.push_back(locator); get_server_client_default_guidPrefix(1, server.guidPrefix); @@ -1471,13 +1468,13 @@ TEST(ParticipantTests, ServerParticipantCorrectRemoteServerListConfiguration) // RTPS layer issues a Warning because a server has been removed. However, DDS layer returns OK EXPECT_EQ(RETCODE_OK, participant->set_qos(result_qos)); server.clear(); - fastrtps::rtps::IPLocator::setIPv4(locator, "192.168.1.133"); + fastdds::rtps::IPLocator::setIPv4(locator, "192.168.1.133"); locator.port = 64863; server.metatrafficUnicastLocatorList.push_back(locator); get_server_client_default_guidPrefix(2, server.guidPrefix); result_qos.wire_protocol().builtin.discovery_config.m_DiscoveryServers.push_back(server); server.clear(); - fastrtps::rtps::IPLocator::setIPv4(locator, "84.22.253.128"); + fastdds::rtps::IPLocator::setIPv4(locator, "84.22.253.128"); locator.port = 8888; server.metatrafficUnicastLocatorList.push_back(locator); get_server_client_default_guidPrefix(3, server.guidPrefix); @@ -1512,16 +1509,16 @@ TEST(ParticipantTests, ChangeWireProtocolQos) // Check that just adding two servers is OK rtps::RemoteServerAttributes server; server.ReadguidPrefix("44.53.00.5f.45.50.52.4f.53.49.4d.41"); - fastrtps::rtps::Locator_t locator; - fastrtps::rtps::IPLocator::setIPv4(locator, 192, 168, 1, 133); + fastdds::rtps::Locator_t locator; + fastdds::rtps::IPLocator::setIPv4(locator, 192, 168, 1, 133); locator.port = 64863; server.metatrafficUnicastLocatorList.push_back(locator); qos.wire_protocol().builtin.discovery_config.m_DiscoveryServers.push_back(server); rtps::RemoteServerAttributes server_2; server_2.ReadguidPrefix("44.53.00.5f.45.50.52.4f.53.49.4d.42"); - fastrtps::rtps::Locator_t locator_2; - fastrtps::rtps::IPLocator::setIPv4(locator_2, 192, 168, 1, 134); + fastdds::rtps::Locator_t locator_2; + fastdds::rtps::IPLocator::setIPv4(locator_2, 192, 168, 1, 134); locator_2.port = 64862; server_2.metatrafficUnicastLocatorList.push_back(locator_2); qos.wire_protocol().builtin.discovery_config.m_DiscoveryServers.push_back(server_2); @@ -1560,8 +1557,8 @@ TEST(ParticipantTests, ChangeWireProtocolQos) // Check changing wire_protocol().default_unicast_locator_list is NOT OK participant->get_qos(qos); - fastrtps::rtps::Locator_t loc; - fastrtps::rtps::IPLocator::setIPv4(loc, "192.0.0.0"); + fastdds::rtps::Locator_t loc; + fastdds::rtps::IPLocator::setIPv4(loc, "192.0.0.0"); loc.port = static_cast(12); qos.wire_protocol().default_unicast_locator_list.push_back(loc); ASSERT_TRUE(participant->set_qos(qos) == RETCODE_IMMUTABLE_POLICY); @@ -1606,7 +1603,7 @@ TEST(ParticipantTests, ChangeWireProtocolQos) // Check changing wire_protocol().builtin.readerHistoryMemoryPolicy is NOT OK participant->get_qos(qos); qos.wire_protocol().builtin.readerHistoryMemoryPolicy = - fastrtps::rtps::MemoryManagementPolicy_t::DYNAMIC_RESERVE_MEMORY_MODE; + fastdds::rtps::MemoryManagementPolicy_t::DYNAMIC_RESERVE_MEMORY_MODE; ASSERT_TRUE(participant->set_qos(qos) == RETCODE_IMMUTABLE_POLICY); participant->get_qos(set_qos); ASSERT_FALSE(set_qos == qos); @@ -1621,7 +1618,7 @@ TEST(ParticipantTests, ChangeWireProtocolQos) // Check changing wire_protocol().builtin.writerHistoryMemoryPolicy is NOT OK participant->get_qos(qos); qos.wire_protocol().builtin.writerHistoryMemoryPolicy = - fastrtps::rtps::MemoryManagementPolicy_t::DYNAMIC_RESERVE_MEMORY_MODE; + fastdds::rtps::MemoryManagementPolicy_t::DYNAMIC_RESERVE_MEMORY_MODE; ASSERT_TRUE(participant->set_qos(qos) == RETCODE_IMMUTABLE_POLICY); participant->get_qos(set_qos); ASSERT_FALSE(set_qos == qos); @@ -1649,7 +1646,7 @@ TEST(ParticipantTests, ChangeWireProtocolQos) // Check changing wire_protocol().builtin.discovery_config.discoveryProtocol is NOT OK participant->get_qos(qos); - qos.wire_protocol().builtin.discovery_config.discoveryProtocol = fastrtps::rtps::DiscoveryProtocol_t::NONE; + qos.wire_protocol().builtin.discovery_config.discoveryProtocol = fastdds::rtps::DiscoveryProtocol::NONE; ASSERT_TRUE(participant->set_qos(qos) == RETCODE_IMMUTABLE_POLICY); participant->get_qos(set_qos); ASSERT_FALSE(set_qos == qos); @@ -1733,7 +1730,7 @@ TEST(ParticipantTests, ChangeWireProtocolQos) // Check changing wire_protocol().builtin.discovery_config.ignoreParticipantFlags is NOT OK participant->get_qos(qos); qos.wire_protocol().builtin.discovery_config.ignoreParticipantFlags = - fastrtps::rtps::ParticipantFilteringFlags::FILTER_DIFFERENT_HOST; + fastdds::rtps::ParticipantFilteringFlags::FILTER_DIFFERENT_HOST; ASSERT_TRUE(participant->set_qos(qos) == RETCODE_IMMUTABLE_POLICY); participant->get_qos(set_qos); ASSERT_FALSE(set_qos == qos); @@ -2508,7 +2505,7 @@ class CustomListener2 : public DomainParticipantListener void on_participant_discovery( eprosima::fastdds::dds::DomainParticipant*, - eprosima::fastrtps::rtps::ParticipantDiscoveryInfo&&, + eprosima::fastdds::rtps::ParticipantDiscoveryInfo&&, bool& should_be_ignored) override { static_cast(should_be_ignored); @@ -2582,7 +2579,7 @@ TEST(ParticipantTests, CheckDomainParticipantQos) // Change the user data qos.user_data().set_max_size(5); - std::vector my_data {0, 1, 2, 3, 4}; + std::vector my_data {0, 1, 2, 3, 4}; qos.user_data().setValue(my_data); ASSERT_TRUE(participant->set_qos(qos) == RETCODE_OK); @@ -2809,7 +2806,7 @@ TEST(ParticipantTests, GetCurrentTime) DomainParticipantFactory::get_instance()->create_participant( (uint32_t)GET_PID() % 230, PARTICIPANT_QOS_DEFAULT); - eprosima::fastrtps::Time_t now; + eprosima::fastdds::Time_t now; ASSERT_EQ(participant->get_current_time(now), RETCODE_OK); ASSERT_EQ(DomainParticipantFactory::get_instance()->delete_participant(participant), RETCODE_OK); } @@ -2931,35 +2928,35 @@ TEST(ParticipantTests, ContainsEntity) // Create the topic Topic* topic = participant->create_topic("footopic", type.get_type_name(), TOPIC_QOS_DEFAULT); ASSERT_NE(topic, nullptr); - eprosima::fastrtps::rtps::InstanceHandle_t topic_ihandle = topic->get_instance_handle(); + eprosima::fastdds::rtps::InstanceHandle_t topic_ihandle = topic->get_instance_handle(); // Check that the participant contains an already created topic in this participant ASSERT_TRUE(participant->contains_entity(topic_ihandle, false)); // Create the publisher Publisher* publisher = participant->create_publisher(PUBLISHER_QOS_DEFAULT); ASSERT_NE(publisher, nullptr); - eprosima::fastrtps::rtps::InstanceHandle_t pub_ihandle = publisher->get_instance_handle(); + eprosima::fastdds::rtps::InstanceHandle_t pub_ihandle = publisher->get_instance_handle(); // Check that the participant contains an already created publisher in this participant ASSERT_TRUE(participant->contains_entity(pub_ihandle, false)); // Create the subscriber Subscriber* subscriber = participant->create_subscriber(SUBSCRIBER_QOS_DEFAULT); ASSERT_NE(subscriber, nullptr); - eprosima::fastrtps::rtps::InstanceHandle_t sub_ihandle = subscriber->get_instance_handle(); + eprosima::fastdds::rtps::InstanceHandle_t sub_ihandle = subscriber->get_instance_handle(); // Check that the participant contains an already created subscriber in this participant ASSERT_TRUE(participant->contains_entity(sub_ihandle, false)); // Create the data_writer DataWriter* data_writer = publisher->create_datawriter(topic, DATAWRITER_QOS_DEFAULT); ASSERT_NE(data_writer, nullptr); - eprosima::fastrtps::rtps::InstanceHandle_t data_writer_ihandle = data_writer->get_instance_handle(); + eprosima::fastdds::rtps::InstanceHandle_t data_writer_ihandle = data_writer->get_instance_handle(); // Check that the participant contains an already created data_writer in this participant ASSERT_TRUE(participant->contains_entity(data_writer_ihandle, true)); // Create the data_reader DataReader* data_reader = subscriber->create_datareader(topic, DATAREADER_QOS_DEFAULT); ASSERT_NE(data_reader, nullptr); - eprosima::fastrtps::rtps::InstanceHandle_t data_reader_ihandle = data_reader->get_instance_handle(); + eprosima::fastdds::rtps::InstanceHandle_t data_reader_ihandle = data_reader->get_instance_handle(); // Check that the participant contains an already created data_reader in this participant ASSERT_TRUE(participant->contains_entity(data_reader_ihandle, true)); @@ -3058,12 +3055,12 @@ TEST(ParticipantTests, NewRemoteEndpointDiscovered) ASSERT_NE(nullptr, participant); ASSERT_FALSE(participant->is_enabled()); - eprosima::fastrtps::rtps::GUID_t remote_endpoint_guid; + eprosima::fastdds::rtps::GUID_t remote_endpoint_guid; std::istringstream("72.61.75.6c.5f.73.61.6e.63.68.65.7a") >> remote_endpoint_guid; // Check that the remote endpoint is not registered in a disabled participant ASSERT_FALSE(participant->new_remote_endpoint_discovered( - remote_endpoint_guid, 1, eprosima::fastrtps::rtps::EndpointKind_t::WRITER)); + remote_endpoint_guid, 1, eprosima::fastdds::rtps::EndpointKind_t::WRITER)); // Enable the participant ASSERT_EQ(RETCODE_OK, participant->enable()); @@ -3071,10 +3068,10 @@ TEST(ParticipantTests, NewRemoteEndpointDiscovered) // Check that a WRITER remote endpoint is not registered in an enabled participant ASSERT_FALSE(participant->new_remote_endpoint_discovered( - remote_endpoint_guid, 1, eprosima::fastrtps::rtps::EndpointKind_t::WRITER)); + remote_endpoint_guid, 1, eprosima::fastdds::rtps::EndpointKind_t::WRITER)); // Check that a READER remote endpoint is not registered in an enabled participant ASSERT_FALSE(participant->new_remote_endpoint_discovered( - remote_endpoint_guid, 1, eprosima::fastrtps::rtps::EndpointKind_t::READER)); + remote_endpoint_guid, 1, eprosima::fastdds::rtps::EndpointKind_t::READER)); // Remove the participant ASSERT_EQ(DomainParticipantFactory::get_instance()->delete_participant(participant), RETCODE_OK); @@ -3103,14 +3100,14 @@ TEST(ParticipantTests, SetDomainParticipantQos) // Check that the participant QoS are the modified qos const std::string* persistence_property_old = - eprosima::fastrtps::rtps::PropertyPolicyHelper::find_property(pqos.properties(), "dds.persistence.guid"); + eprosima::fastdds::rtps::PropertyPolicyHelper::find_property(pqos.properties(), "dds.persistence.guid"); ASSERT_NE(persistence_property_old, nullptr); - eprosima::fastrtps::rtps::GUID_t persistence_guid_old; + eprosima::fastdds::rtps::GUID_t persistence_guid_old; std::istringstream(persistence_property_old->c_str()) >> persistence_guid_old; const std::string* persistence_property_new = - eprosima::fastrtps::rtps::PropertyPolicyHelper::find_property(qos.properties(), "dds.persistence.guid"); + eprosima::fastdds::rtps::PropertyPolicyHelper::find_property(qos.properties(), "dds.persistence.guid"); ASSERT_NE(persistence_property_new, nullptr); - eprosima::fastrtps::rtps::GUID_t persistence_guid_new; + eprosima::fastdds::rtps::GUID_t persistence_guid_new; std::istringstream(persistence_property_old->c_str()) >> persistence_guid_new; ASSERT_EQ(persistence_guid_new, persistence_guid_old); @@ -3707,7 +3704,7 @@ TEST(ParticipantTests, ParticipantCreationWithBuiltinTransport) { { DomainParticipantQos qos; - fastrtps::rtps::RTPSParticipantAttributes attributes_; + fastdds::rtps::RTPSParticipantAttributes attributes_; qos.setup_transports(rtps::BuiltinTransports::DEFAULT); DomainParticipant* participant_ = DomainParticipantFactory::get_instance()->create_participant( @@ -3716,7 +3713,7 @@ TEST(ParticipantTests, ParticipantCreationWithBuiltinTransport) get_rtps_attributes(participant_, attributes_); - auto transport_check = [](fastrtps::rtps::RTPSParticipantAttributes& attributes_) -> bool + auto transport_check = [](fastdds::rtps::RTPSParticipantAttributes& attributes_) -> bool { for (auto& transportDescriptor : attributes_.userTransports) { @@ -3735,7 +3732,7 @@ TEST(ParticipantTests, ParticipantCreationWithBuiltinTransport) { DomainParticipantQos qos; - fastrtps::rtps::RTPSParticipantAttributes attributes_; + fastdds::rtps::RTPSParticipantAttributes attributes_; qos.setup_transports(rtps::BuiltinTransports::DEFAULTv6); DomainParticipant* participant_ = DomainParticipantFactory::get_instance()->create_participant( @@ -3744,7 +3741,7 @@ TEST(ParticipantTests, ParticipantCreationWithBuiltinTransport) get_rtps_attributes(participant_, attributes_); - auto transport_check = [](fastrtps::rtps::RTPSParticipantAttributes& attributes_) -> bool + auto transport_check = [](fastdds::rtps::RTPSParticipantAttributes& attributes_) -> bool { for (auto& transportDescriptor : attributes_.userTransports) { @@ -3763,7 +3760,7 @@ TEST(ParticipantTests, ParticipantCreationWithBuiltinTransport) { DomainParticipantQos qos; - fastrtps::rtps::RTPSParticipantAttributes attributes_; + fastdds::rtps::RTPSParticipantAttributes attributes_; qos.setup_transports(rtps::BuiltinTransports::SHM); DomainParticipant* participant_ = DomainParticipantFactory::get_instance()->create_participant( @@ -3772,7 +3769,7 @@ TEST(ParticipantTests, ParticipantCreationWithBuiltinTransport) get_rtps_attributes(participant_, attributes_); - auto transport_check = [](fastrtps::rtps::RTPSParticipantAttributes& attributes_) -> bool + auto transport_check = [](fastdds::rtps::RTPSParticipantAttributes& attributes_) -> bool { for (auto& transportDescriptor : attributes_.userTransports) { @@ -3791,7 +3788,7 @@ TEST(ParticipantTests, ParticipantCreationWithBuiltinTransport) { DomainParticipantQos qos; - fastrtps::rtps::RTPSParticipantAttributes attributes_; + fastdds::rtps::RTPSParticipantAttributes attributes_; qos.setup_transports(rtps::BuiltinTransports::UDPv4); DomainParticipant* participant_ = DomainParticipantFactory::get_instance()->create_participant( @@ -3800,7 +3797,7 @@ TEST(ParticipantTests, ParticipantCreationWithBuiltinTransport) get_rtps_attributes(participant_, attributes_); - auto transport_check = [](fastrtps::rtps::RTPSParticipantAttributes& attributes_) -> bool + auto transport_check = [](fastdds::rtps::RTPSParticipantAttributes& attributes_) -> bool { for (auto& transportDescriptor : attributes_.userTransports) { @@ -3819,7 +3816,7 @@ TEST(ParticipantTests, ParticipantCreationWithBuiltinTransport) { DomainParticipantQos qos; - fastrtps::rtps::RTPSParticipantAttributes attributes_; + fastdds::rtps::RTPSParticipantAttributes attributes_; qos.setup_transports(rtps::BuiltinTransports::UDPv6); DomainParticipant* participant_ = DomainParticipantFactory::get_instance()->create_participant( @@ -3828,7 +3825,7 @@ TEST(ParticipantTests, ParticipantCreationWithBuiltinTransport) get_rtps_attributes(participant_, attributes_); - auto transport_check = [](fastrtps::rtps::RTPSParticipantAttributes& attributes_) -> bool + auto transport_check = [](fastdds::rtps::RTPSParticipantAttributes& attributes_) -> bool { for (auto& transportDescriptor : attributes_.userTransports) { @@ -3847,7 +3844,7 @@ TEST(ParticipantTests, ParticipantCreationWithBuiltinTransport) { DomainParticipantQos qos; - fastrtps::rtps::RTPSParticipantAttributes attributes_; + fastdds::rtps::RTPSParticipantAttributes attributes_; qos.setup_transports(rtps::BuiltinTransports::LARGE_DATA); DomainParticipant* participant_ = DomainParticipantFactory::get_instance()->create_participant( @@ -3856,7 +3853,7 @@ TEST(ParticipantTests, ParticipantCreationWithBuiltinTransport) get_rtps_attributes(participant_, attributes_); - auto transport_check = [](fastrtps::rtps::RTPSParticipantAttributes& attributes_) -> bool + auto transport_check = [](fastdds::rtps::RTPSParticipantAttributes& attributes_) -> bool { bool hasSHM = false; bool hasUDP = false; @@ -3889,7 +3886,7 @@ TEST(ParticipantTests, ParticipantCreationWithBuiltinTransport) { DomainParticipantQos qos; - fastrtps::rtps::RTPSParticipantAttributes attributes_; + fastdds::rtps::RTPSParticipantAttributes attributes_; qos.setup_transports(rtps::BuiltinTransports::LARGE_DATAv6); DomainParticipant* participant_ = DomainParticipantFactory::get_instance()->create_participant( @@ -3898,7 +3895,7 @@ TEST(ParticipantTests, ParticipantCreationWithBuiltinTransport) get_rtps_attributes(participant_, attributes_); - auto transport_check = [](fastrtps::rtps::RTPSParticipantAttributes& attributes_) -> bool + auto transport_check = [](fastdds::rtps::RTPSParticipantAttributes& attributes_) -> bool { bool hasSHM = false; bool hasUDP = false; @@ -3945,7 +3942,7 @@ class BuiltinTransportsOptionsTest (uint32_t)GET_PID() % 230, qos); ASSERT_NE(nullptr, participant_); - fastrtps::rtps::RTPSParticipantAttributes attr; + fastdds::rtps::RTPSParticipantAttributes attr; get_rtps_attributes(participant_, attr); EXPECT_TRUE(check_options_attr(attr, options)); EXPECT_EQ(attr.userTransports.size(), 3u); @@ -3963,7 +3960,7 @@ class BuiltinTransportsOptionsTest (uint32_t)GET_PID() % 230, qos); ASSERT_NE(nullptr, participant_); - fastrtps::rtps::RTPSParticipantAttributes attr; + fastdds::rtps::RTPSParticipantAttributes attr; get_rtps_attributes(participant_, attr); bool udp_ok = false; for (auto& transportDescriptor : attr.userTransports) @@ -3996,7 +3993,7 @@ class BuiltinTransportsOptionsTest (uint32_t)GET_PID() % 230, qos); ASSERT_NE(nullptr, participant_); - fastrtps::rtps::RTPSParticipantAttributes attr; + fastdds::rtps::RTPSParticipantAttributes attr; get_rtps_attributes(participant_, attr); EXPECT_TRUE(check_default_participant(attr)); EXPECT_EQ(RETCODE_OK, DomainParticipantFactory::get_instance()->delete_participant(participant_)); @@ -4010,7 +4007,7 @@ class BuiltinTransportsOptionsTest } static bool check_options_attr( - const fastrtps::rtps::RTPSParticipantAttributes& attr, + const fastdds::rtps::RTPSParticipantAttributes& attr, const rtps::BuiltinTransportsOptions& options) { bool udp_ok = false; @@ -4083,7 +4080,7 @@ class BuiltinTransportsOptionsTest } static bool check_default_participant( - const fastrtps::rtps::RTPSParticipantAttributes& attr) + const fastdds::rtps::RTPSParticipantAttributes& attr) { bool udp_ok = false; bool shm_ok = false; @@ -4148,7 +4145,7 @@ TEST(ParticipantTests, ParticipantCreationWithLargeDataOptionsThroughAPI) (uint32_t)GET_PID() % 230, qos); ASSERT_NE(nullptr, participant_); - fastrtps::rtps::RTPSParticipantAttributes attr; + fastdds::rtps::RTPSParticipantAttributes attr; get_rtps_attributes(participant_, attr); EXPECT_TRUE(BuiltinTransportsOptionsTest::check_options_attr(attr, options)); diff --git a/test/unittest/dds/publisher/DataWriterTests.cpp b/test/unittest/dds/publisher/DataWriterTests.cpp index 78ccbbbecba..69327c17e83 100644 --- a/test/unittest/dds/publisher/DataWriterTests.cpp +++ b/test/unittest/dds/publisher/DataWriterTests.cpp @@ -45,7 +45,6 @@ namespace eprosima { namespace fastdds { namespace dds { -using namespace eprosima::fastrtps::rtps; using ::testing::_; class FooType @@ -96,21 +95,21 @@ class TopicDataTypeMock : public TopicDataType bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } bool serialize( void* /*data*/, - fastrtps::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t* /*payload*/, DataRepresentationId_t /*data_representation*/) override { return true; } bool deserialize( - fastrtps::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t* /*payload*/, void* /*data*/) override { return true; @@ -144,7 +143,7 @@ class TopicDataTypeMock : public TopicDataType bool getKey( void* /*data*/, - fastrtps::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool /*force_md5*/) override { return true; @@ -201,21 +200,21 @@ class InstanceTopicDataTypeMock : public TopicDataType bool serialize( void* /*data*/, - fastrtps::rtps::SerializedPayload_t* /*payload*/) override + fastdds::rtps::SerializedPayload_t* /*payload*/) override { return true; } bool serialize( void* /*data*/, - fastrtps::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t* /*payload*/, DataRepresentationId_t /*data_representation*/) override { return true; } bool deserialize( - fastrtps::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t* /*payload*/, void* /*data*/) override { return true; @@ -252,7 +251,7 @@ class InstanceTopicDataTypeMock : public TopicDataType bool getKey( void* /*data*/, - fastrtps::rtps::InstanceHandle_t* ihandle, + fastdds::rtps::InstanceHandle_t* ihandle, bool /*force_md5*/) override { ihandle->value[0] = 1; @@ -276,21 +275,21 @@ class BoundedTopicDataTypeMock : public TopicDataType bool serialize( void* /*data*/, - fastrtps::rtps::SerializedPayload_t* /*payload*/) override + fastdds::rtps::SerializedPayload_t* /*payload*/) override { return true; } bool serialize( void* /*data*/, - fastrtps::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t* /*payload*/, DataRepresentationId_t /*data_representation*/) override { return true; } bool deserialize( - fastrtps::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t* /*payload*/, void* /*data*/) override { return true; @@ -321,7 +320,7 @@ class BoundedTopicDataTypeMock : public TopicDataType bool getKey( void* /*data*/, - fastrtps::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool /*force_md5*/) override { return true; @@ -371,18 +370,18 @@ TEST(DataWriterTests, get_guid) void on_data_writer_discovery( DomainParticipant*, - fastrtps::rtps::WriterDiscoveryInfo&& info, + fastdds::rtps::WriterDiscoveryInfo&& info, bool& /*should_be_ignored*/) override { std::unique_lock lock(mutex); - if (fastrtps::rtps::WriterDiscoveryInfo::DISCOVERED_WRITER == info.status) + if (fastdds::rtps::WriterDiscoveryInfo::DISCOVERED_WRITER == info.status) { guid = info.info.guid(); cv.notify_one(); } } - fastrtps::rtps::GUID_t guid; + fastdds::rtps::GUID_t guid; std::mutex mutex; std::condition_variable cv; @@ -394,9 +393,9 @@ TEST(DataWriterTests, get_guid) DomainParticipantQos participant_qos = PARTICIPANT_QOS_DEFAULT; participant_qos.wire_protocol().builtin.discovery_config.ignoreParticipantFlags = - static_cast( - eprosima::fastrtps::rtps::ParticipantFilteringFlags_t::FILTER_DIFFERENT_HOST | - eprosima::fastrtps::rtps::ParticipantFilteringFlags_t::FILTER_DIFFERENT_PROCESS); + static_cast( + eprosima::fastdds::rtps::ParticipantFilteringFlags::FILTER_DIFFERENT_HOST | + eprosima::fastdds::rtps::ParticipantFilteringFlags::FILTER_DIFFERENT_PROCESS); DomainParticipant* listener_participant = DomainParticipantFactory::get_instance()->create_participant(0, participant_qos, @@ -423,7 +422,7 @@ TEST(DataWriterTests, get_guid) DataWriter* datawriter = publisher->create_datawriter(topic, DATAWRITER_QOS_DEFAULT); ASSERT_NE(datawriter, nullptr); - fastrtps::rtps::GUID_t guid = datawriter->guid(); + fastdds::rtps::GUID_t guid = datawriter->guid(); participant->enable(); @@ -434,7 +433,7 @@ TEST(DataWriterTests, get_guid) std::unique_lock lock(discovery_listener.mutex); discovery_listener.cv.wait(lock, [&]() { - return fastrtps::rtps::GUID_t::unknown() != discovery_listener.guid; + return fastdds::rtps::GUID_t::unknown() != discovery_listener.guid; }); } ASSERT_EQ(guid, discovery_listener.guid); @@ -564,7 +563,7 @@ TEST(DataWriterTests, ForcedDataSharing) // DataSharing automatic, unbounded topic data type qos = DATAWRITER_QOS_DEFAULT; - qos.endpoint().history_memory_policy = fastrtps::rtps::PREALLOCATED_MEMORY_MODE; + qos.endpoint().history_memory_policy = fastdds::rtps::PREALLOCATED_MEMORY_MODE; datawriter = publisher->create_datawriter(topic, qos); ASSERT_NE(datawriter, nullptr); ASSERT_EQ(publisher->delete_datawriter(datawriter), RETCODE_OK); @@ -576,7 +575,7 @@ TEST(DataWriterTests, ForcedDataSharing) // DataSharing enabled, unbounded topic data type qos = DATAWRITER_QOS_DEFAULT; - qos.endpoint().history_memory_policy = fastrtps::rtps::PREALLOCATED_MEMORY_MODE; + qos.endpoint().history_memory_policy = fastdds::rtps::PREALLOCATED_MEMORY_MODE; qos.data_sharing().on("."); datawriter = publisher->create_datawriter(topic, qos); ASSERT_EQ(datawriter, nullptr); @@ -589,7 +588,7 @@ TEST(DataWriterTests, ForcedDataSharing) // DataSharing enabled, bounded topic data type, Dynamic memory policy qos = DATAWRITER_QOS_DEFAULT; qos.data_sharing().on("."); - qos.endpoint().history_memory_policy = fastrtps::rtps::DYNAMIC_RESERVE_MEMORY_MODE; + qos.endpoint().history_memory_policy = fastdds::rtps::DYNAMIC_RESERVE_MEMORY_MODE; datawriter = publisher->create_datawriter(bounded_topic, qos); ASSERT_EQ(datawriter, nullptr); @@ -608,17 +607,17 @@ TEST(DataWriterTests, ForcedDataSharing) } #ifdef HAS_SECURITY - fastrtps::rtps::PropertyPolicy security_property; - security_property.properties().emplace_back(fastrtps::rtps::Property("dds.sec.auth.plugin", + fastdds::rtps::PropertyPolicy security_property; + security_property.properties().emplace_back(fastdds::rtps::Property("dds.sec.auth.plugin", "builtin.PKI-DH")); - security_property.properties().emplace_back(fastrtps::rtps::Property("dds.sec.auth.builtin.PKI-DH.identity_ca", + security_property.properties().emplace_back(fastdds::rtps::Property("dds.sec.auth.builtin.PKI-DH.identity_ca", "file://" + std::string(certs_path) + "/maincacert.pem")); - security_property.properties().emplace_back(fastrtps::rtps::Property( + security_property.properties().emplace_back(fastdds::rtps::Property( "dds.sec.auth.builtin.PKI-DH.identity_certificate", "file://" + std::string(certs_path) + "/mainsubcert.pem")); - security_property.properties().emplace_back(fastrtps::rtps::Property("dds.sec.auth.builtin.PKI-DH.private_key", + security_property.properties().emplace_back(fastdds::rtps::Property("dds.sec.auth.builtin.PKI-DH.private_key", "file://" + std::string(certs_path) + "/mainsubkey.pem")); - security_property.properties().emplace_back(fastrtps::rtps::Property("dds.sec.crypto.plugin", + security_property.properties().emplace_back(fastdds::rtps::Property("dds.sec.crypto.plugin", "builtin.AES-GCM-GMAC")); security_property.properties().emplace_back("rtps.participant.rtps_protection_kind", "ENCRYPT"); @@ -639,7 +638,7 @@ TEST(DataWriterTests, ForcedDataSharing) qos = DATAWRITER_QOS_DEFAULT; qos.data_sharing().on("."); - qos.endpoint().history_memory_policy = fastrtps::rtps::PREALLOCATED_MEMORY_MODE; + qos.endpoint().history_memory_policy = fastdds::rtps::PREALLOCATED_MEMORY_MODE; datawriter = publisher->create_datawriter(bounded_topic, qos); @@ -695,7 +694,7 @@ TEST(DataWriterTests, InvalidQos) EXPECT_EQ(inconsistent_code, datawriter->set_qos(qos)); qos.reliability().kind = RELIABLE_RELIABILITY_QOS; - qos.reliable_writer_qos().times.heartbeatPeriod = eprosima::fastrtps::c_TimeInfinite; + qos.reliable_writer_qos().times.heartbeatPeriod = eprosima::fastdds::c_TimeInfinite; EXPECT_EQ(inconsistent_code, datawriter->set_qos(qos)); qos = DATAWRITER_QOS_DEFAULT; @@ -709,16 +708,16 @@ TEST(DataWriterTests, InvalidQos) qos = DATAWRITER_QOS_DEFAULT; qos.data_sharing().on("/tmp"); - qos.endpoint().history_memory_policy = eprosima::fastrtps::rtps::DYNAMIC_RESERVE_MEMORY_MODE; + qos.endpoint().history_memory_policy = eprosima::fastdds::rtps::DYNAMIC_RESERVE_MEMORY_MODE; EXPECT_EQ(inconsistent_code, datawriter->set_qos(qos)); - qos.endpoint().history_memory_policy = eprosima::fastrtps::rtps::DYNAMIC_REUSABLE_MEMORY_MODE; + qos.endpoint().history_memory_policy = eprosima::fastdds::rtps::DYNAMIC_REUSABLE_MEMORY_MODE; EXPECT_EQ(inconsistent_code, datawriter->set_qos(qos)); - qos.endpoint().history_memory_policy = eprosima::fastrtps::rtps::PREALLOCATED_MEMORY_MODE; + qos.endpoint().history_memory_policy = eprosima::fastdds::rtps::PREALLOCATED_MEMORY_MODE; EXPECT_EQ(RETCODE_OK, datawriter->set_qos(qos)); - qos.endpoint().history_memory_policy = eprosima::fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; + qos.endpoint().history_memory_policy = eprosima::fastdds::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; EXPECT_EQ(RETCODE_OK, datawriter->set_qos(qos)); qos = DATAWRITER_QOS_DEFAULT; @@ -807,7 +806,7 @@ TEST(DataWriterTests, WriteWithTimestamp) DataWriter* datawriter = publisher->create_datawriter(topic, DATAWRITER_QOS_DEFAULT); ASSERT_NE(datawriter, nullptr); - eprosima::fastrtps::Time_t ts{ 0, 1 }; + eprosima::fastdds::Time_t ts{ 0, 1 }; FooType data; data.message("HelloWorld"); @@ -816,9 +815,9 @@ TEST(DataWriterTests, WriteWithTimestamp) ASSERT_EQ(RETCODE_BAD_PARAMETER, datawriter->write_w_timestamp(nullptr, HANDLE_NIL, ts)); // 2. Calling write with an invalid timestamps returns RETCODE_BAD_PARAMETER EXPECT_EQ(RETCODE_BAD_PARAMETER, - datawriter->write_w_timestamp(&data, HANDLE_NIL, fastrtps::c_TimeInfinite)); + datawriter->write_w_timestamp(&data, HANDLE_NIL, fastdds::c_TimeInfinite)); EXPECT_EQ(RETCODE_BAD_PARAMETER, - datawriter->write_w_timestamp(&data, HANDLE_NIL, fastrtps::c_TimeInvalid)); + datawriter->write_w_timestamp(&data, HANDLE_NIL, fastdds::c_TimeInvalid)); // 3. Calling write with a wrong instance handle returns RETCODE_PRECONDITION_NOT_MET ASSERT_EQ(RETCODE_PRECONDITION_NOT_MET, datawriter->write_w_timestamp(&data, participant->get_instance_handle(), ts)); @@ -1005,7 +1004,7 @@ TEST(DataWriterTests, RegisterInstanceWithTimestamp) DataWriter* instance_datawriter; create_writers_for_instance_test(datawriter, instance_datawriter); - eprosima::fastrtps::Time_t ts{ 0, 1 }; + eprosima::fastdds::Time_t ts{ 0, 1 }; // 1. Calling register_instance_w_timestamp in a disable writer returns HANDLE_NIL EXPECT_EQ(HANDLE_NIL, datawriter->register_instance_w_timestamp(&data, ts)); @@ -1020,8 +1019,8 @@ TEST(DataWriterTests, RegisterInstanceWithTimestamp) EXPECT_EQ(HANDLE_NIL, instance_datawriter->register_instance_w_timestamp(nullptr, ts)); // 4. Calling register_instance with an invalid timestamps returns HANDLE_NIL - EXPECT_EQ(HANDLE_NIL, instance_datawriter->register_instance_w_timestamp(&data, fastrtps::c_TimeInfinite)); - EXPECT_EQ(HANDLE_NIL, instance_datawriter->register_instance_w_timestamp(&data, fastrtps::c_TimeInvalid)); + EXPECT_EQ(HANDLE_NIL, instance_datawriter->register_instance_w_timestamp(&data, fastdds::c_TimeInfinite)); + EXPECT_EQ(HANDLE_NIL, instance_datawriter->register_instance_w_timestamp(&data, fastdds::c_TimeInvalid)); // 5. Calling register_instance with a valid key returns a valid handle EXPECT_NE(HANDLE_NIL, instance_datawriter->register_instance_w_timestamp(&data, ts)); @@ -1093,7 +1092,7 @@ TEST(DataWriterTests, UnregisterInstanceWithTimestamp) DataWriter* instance_datawriter; create_writers_for_instance_test(datawriter, instance_datawriter, &instance_type); - eprosima::fastrtps::Time_t ts{ 0, 1 }; + eprosima::fastdds::Time_t ts{ 0, 1 }; // 1. Calling unregister_instance in a disable writer returns RETCODE_NOT_ENABLED EXPECT_EQ(RETCODE_NOT_ENABLED, datawriter->unregister_instance_w_timestamp(&data, handle, ts)); @@ -1130,10 +1129,10 @@ TEST(DataWriterTests, UnregisterInstanceWithTimestamp) // 8. Check invalid timestamps ASSERT_EQ(RETCODE_OK, instance_datawriter->write_w_timestamp(&data, HANDLE_NIL, ts)); - ts = eprosima::fastrtps::c_TimeInfinite; + ts = eprosima::fastdds::c_TimeInfinite; EXPECT_EQ(RETCODE_BAD_PARAMETER, instance_datawriter->unregister_instance_w_timestamp(&data, handle, ts)); - ts = eprosima::fastrtps::c_TimeInvalid; + ts = eprosima::fastdds::c_TimeInvalid; EXPECT_EQ(RETCODE_BAD_PARAMETER, instance_datawriter->unregister_instance_w_timestamp(&data, handle, ts)); @@ -1207,7 +1206,7 @@ TEST(DataWriterTests, DisposeWithTimestamp) DataWriter* instance_datawriter; create_writers_for_instance_test(datawriter, instance_datawriter, &instance_type); - eprosima::fastrtps::Time_t ts{ 0, 1 }; + eprosima::fastdds::Time_t ts{ 0, 1 }; // 1. Calling dispose in a disable writer returns RETCODE_NOT_ENABLED EXPECT_EQ(RETCODE_NOT_ENABLED, datawriter->dispose_w_timestamp(&data, handle, ts)); @@ -1241,9 +1240,9 @@ TEST(DataWriterTests, DisposeWithTimestamp) // 8. Check invalid timestamps ASSERT_EQ(RETCODE_OK, instance_datawriter->write_w_timestamp(&data, HANDLE_NIL, ts)); - ts = eprosima::fastrtps::c_TimeInfinite; + ts = eprosima::fastdds::c_TimeInfinite; EXPECT_EQ(RETCODE_BAD_PARAMETER, instance_datawriter->dispose_w_timestamp(&data, handle, ts)); - ts = eprosima::fastrtps::c_TimeInvalid; + ts = eprosima::fastdds::c_TimeInvalid; EXPECT_EQ(RETCODE_BAD_PARAMETER, instance_datawriter->dispose_w_timestamp(&data, handle, ts)); // TODO(jlbueno) There are other possible errors sending the dispose message: RETCODE_OUT_OF_RESOURCES, @@ -1330,21 +1329,21 @@ class LoanableTypeSupport : public TopicDataType bool serialize( void* /*data*/, - fastrtps::rtps::SerializedPayload_t* /*payload*/) override + fastdds::rtps::SerializedPayload_t* /*payload*/) override { return true; } bool serialize( void* /*data*/, - fastrtps::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t* /*payload*/, DataRepresentationId_t /*data_representation*/) override { return true; } bool deserialize( - fastrtps::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t* /*payload*/, void* /*data*/) override { return true; @@ -1381,7 +1380,7 @@ class LoanableTypeSupport : public TopicDataType bool getKey( void* /*data*/, - fastrtps::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool /*force_md5*/) override { return true; @@ -1472,7 +1471,7 @@ TEST(DataWriterTests, LoanPositiveTests) // Write samples, both loaned and not LoanableType data; - fastrtps::rtps::InstanceHandle_t handle; + fastdds::rtps::InstanceHandle_t handle; EXPECT_EQ(RETCODE_OK, datawriter->loan_sample(sample)); EXPECT_NE(nullptr, sample); EXPECT_EQ(RETCODE_OK, datawriter->loan_sample(sample_2)); @@ -1773,7 +1772,7 @@ TEST_F(DataWriterUnsupportedTests, UnsupportedDataWriterMethods) ASSERT_NE(publisher, nullptr); builtin::SubscriptionBuiltinTopicData subscription_data; - fastrtps::rtps::InstanceHandle_t subscription_handle; + fastdds::rtps::InstanceHandle_t subscription_handle; EXPECT_EQ( RETCODE_UNSUPPORTED, data_writer->get_matched_subscription_data(subscription_data, subscription_handle)); diff --git a/test/unittest/dds/publisher/PublisherTests.cpp b/test/unittest/dds/publisher/PublisherTests.cpp index 8ae36b9f167..b83e858eb4d 100644 --- a/test/unittest/dds/publisher/PublisherTests.cpp +++ b/test/unittest/dds/publisher/PublisherTests.cpp @@ -31,7 +31,7 @@ namespace eprosima { namespace fastdds { namespace dds { -using fastrtps::rtps::PropertyPolicyHelper; +using rtps::PropertyPolicyHelper; class TopicDataTypeMock : public TopicDataType { @@ -46,21 +46,21 @@ class TopicDataTypeMock : public TopicDataType bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } bool serialize( void* /*data*/, - fastrtps::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t* /*payload*/, DataRepresentationId_t /*data_representation*/) override { return true; } bool deserialize( - fastrtps::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t* /*payload*/, void* /*data*/) override { return true; @@ -94,7 +94,7 @@ class TopicDataTypeMock : public TopicDataType bool getKey( void* /*data*/, - fastrtps::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool /*force_md5*/) override { return true; @@ -115,21 +115,21 @@ class LoanableTopicDataTypeMock : public TopicDataType bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } bool serialize( void* /*data*/, - fastrtps::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t* /*payload*/, DataRepresentationId_t /*data_representation*/) override { return true; } bool deserialize( - fastrtps::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t* /*payload*/, void* /*data*/) override { return true; @@ -176,7 +176,7 @@ class LoanableTopicDataTypeMock : public TopicDataType bool getKey( void* /*data*/, - fastrtps::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool /*force_md5*/) override { return true; @@ -237,7 +237,7 @@ TEST(PublisherTests, ChangeDefaultDataWriterQos) // .reliability qos.reliability().kind = eprosima::fastdds::dds::RELIABLE_RELIABILITY_QOS; qos.reliability().max_blocking_time.seconds = 100; - qos.reliability().max_blocking_time.nanosec = eprosima::fastrtps::Time_t::INFINITE_NANOSECONDS; + qos.reliability().max_blocking_time.nanosec = eprosima::fastdds::Time_t::INFINITE_NANOSECONDS; // .destination_order qos.destination_order().kind = eprosima::fastdds::dds::BY_RECEPTION_TIMESTAMP_DESTINATIONORDER_QOS; // .history @@ -270,7 +270,7 @@ TEST(PublisherTests, ChangeDefaultDataWriterQos) qos.publish_mode().flow_controller_name = "Prueba"; // .properties - eprosima::fastrtps::rtps::Property property; + eprosima::fastdds::rtps::Property property; property.name("Property1"); property.value("Value1"); qos.properties().properties().push_back(property); @@ -293,7 +293,7 @@ TEST(PublisherTests, ChangeDefaultDataWriterQos) // .endpoint qos.endpoint().user_defined_id = 1; qos.endpoint().entity_id = 2; - qos.endpoint().history_memory_policy = eprosima::fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; + qos.endpoint().history_memory_policy = eprosima::fastdds::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; // . writer_resource_limits qos.writer_resource_limits().matched_subscriber_allocation.initial = 30; qos.writer_resource_limits().matched_subscriber_allocation.maximum = 300; @@ -328,7 +328,7 @@ TEST(PublisherTests, ChangeDefaultDataWriterQos) // .reliability EXPECT_EQ(eprosima::fastdds::dds::RELIABLE_RELIABILITY_QOS, wqos.reliability().kind); EXPECT_EQ(100, wqos.reliability().max_blocking_time.seconds); - EXPECT_EQ(eprosima::fastrtps::Time_t::INFINITE_NANOSECONDS, wqos.reliability().max_blocking_time.nanosec); + EXPECT_EQ(eprosima::fastdds::Time_t::INFINITE_NANOSECONDS, wqos.reliability().max_blocking_time.nanosec); // .destination_order EXPECT_EQ(eprosima::fastdds::dds::BY_RECEPTION_TIMESTAMP_DESTINATIONORDER_QOS, wqos.destination_order().kind); // .history @@ -411,7 +411,7 @@ TEST(PublisherTests, ChangeDefaultDataWriterQos) // .endpoint EXPECT_EQ(1, wqos.endpoint().user_defined_id); EXPECT_EQ(2, wqos.endpoint().entity_id); - EXPECT_EQ(eprosima::fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE, wqos.endpoint().history_memory_policy); + EXPECT_EQ(eprosima::fastdds::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE, wqos.endpoint().history_memory_policy); // . writer_resource_limits EXPECT_EQ(30, wqos.writer_resource_limits().matched_subscriber_allocation.initial); EXPECT_EQ(300, wqos.writer_resource_limits().matched_subscriber_allocation.maximum); @@ -801,7 +801,7 @@ TEST(PublisherTests, datawriter_copy_from_topic_qos) control_qos.user_data().push_back(0); control_qos.endpoint().entity_id = 1; control_qos.writer_resource_limits().matched_subscriber_allocation = - eprosima::fastrtps::ResourceLimitedContainerConfig::fixed_size_configuration(1u); + eprosima::fastdds::ResourceLimitedContainerConfig::fixed_size_configuration(1u); control_qos.data_sharing().off(); // Copy control Qos to test Qos. At this point, test_qos has non-default values for the non-common Qos, diff --git a/test/unittest/dds/status/ListenerTests.cpp b/test/unittest/dds/status/ListenerTests.cpp index 428f24f1345..79937bb7932 100644 --- a/test/unittest/dds/status/ListenerTests.cpp +++ b/test/unittest/dds/status/ListenerTests.cpp @@ -42,11 +42,11 @@ using ::testing::NiceMock; using ::testing::Mock; using ::testing::_; -using eprosima::fastrtps::rtps::RTPSDomain; +using eprosima::fastdds::rtps::RTPSDomain; namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSDomain; @@ -54,12 +54,10 @@ RTPSReader* RTPSDomain::reader_ = nullptr; RTPSWriter* RTPSDomain::writer_ = nullptr; RTPSParticipant* RTPSDomain::participant_ = nullptr; } //namespace rtps -} //namespace fastrtps -namespace fastdds { namespace dds { -class RTPSParticipantMock : public eprosima::fastrtps::rtps::RTPSParticipant +class RTPSParticipantMock : public eprosima::fastdds::rtps::RTPSParticipant { public: @@ -81,26 +79,26 @@ class RTPSReaderMock : public eprosima::fastdds::rtps::BaseReader virtual ~RTPSReaderMock() = default; bool matched_writer_add( - const eprosima::fastrtps::rtps::WriterProxyData&) override + const eprosima::fastdds::rtps::WriterProxyData&) override { return true; } bool matched_writer_remove( - const eprosima::fastrtps::rtps::GUID_t&, + const eprosima::fastdds::rtps::GUID_t&, bool) override { return true; } bool matched_writer_is_matched( - const eprosima::fastrtps::rtps::GUID_t&) override + const eprosima::fastdds::rtps::GUID_t&) override { return true; } void assert_writer_liveliness( - const eprosima::fastrtps::rtps::GUID_t&) override + const eprosima::fastdds::rtps::GUID_t&) override { } @@ -111,7 +109,7 @@ class RTPSReaderMock : public eprosima::fastdds::rtps::BaseReader }; -class RTPSWriterMock : public eprosima::fastrtps::rtps::RTPSWriter +class RTPSWriterMock : public eprosima::fastdds::rtps::RTPSWriter { public: @@ -122,19 +120,19 @@ class RTPSWriterMock : public eprosima::fastrtps::rtps::RTPSWriter virtual ~RTPSWriterMock() = default; virtual bool matched_reader_add( - const eprosima::fastrtps::rtps::ReaderProxyData&) + const eprosima::fastdds::rtps::ReaderProxyData&) { return true; } virtual bool matched_reader_remove( - const eprosima::fastrtps::rtps::GUID_t&) + const eprosima::fastdds::rtps::GUID_t&) { return true; } virtual bool matched_reader_is_matched( - const eprosima::fastrtps::rtps::GUID_t&) + const eprosima::fastdds::rtps::GUID_t&) { return true; } @@ -499,13 +497,13 @@ class TopicDataTypeMock : public TopicDataType bool serialize( void* /*data*/, - fastrtps::rtps::SerializedPayload_t* /*payload*/) override + fastdds::rtps::SerializedPayload_t* /*payload*/) override { return true; } bool deserialize( - fastrtps::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t* /*payload*/, void* /*data*/) override { return true; @@ -532,7 +530,7 @@ class TopicDataTypeMock : public TopicDataType bool getKey( void* /*data*/, - fastrtps::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool /*force_md5*/) override { return true; @@ -976,7 +974,7 @@ void verify_expectations_on_subscription_matched ( StrictMock& subscriber_listener_, StrictMock& datareader_listener_) { - fastrtps::rtps::MatchingInfo status; + fastdds::rtps::MatchingInfo status; RTPSDomain::reader_->get_listener()->on_reader_matched(nullptr, status); Mock::VerifyAndClearExpectations(&datareader_listener_); @@ -1337,7 +1335,7 @@ void verify_expectations_on_data_available ( StrictMock& subscriber_listener_, StrictMock& datareader_listener_) { - fastrtps::rtps::CacheChange_t change; + fastdds::rtps::CacheChange_t change; auto seq = change.sequenceNumber; bool notify_individual = false; @@ -1355,7 +1353,7 @@ void verify_expectations_on_data_available ( TEST_F(UserListeners, data_available) { - fastrtps::rtps::CacheChange_t change; + fastdds::rtps::CacheChange_t change; //data_on_readers has priority //////////////////////////////////////////////////////////////////// diff --git a/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp b/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp index 3cd4f008841..8672f5682bd 100644 --- a/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp +++ b/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp @@ -19,15 +19,15 @@ class TestType : public TopicDataType MOCK_METHOD2(serialize, bool( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload)); + eprosima::fastdds::rtps::SerializedPayload_t* payload)); MOCK_METHOD3(serialize, bool( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, DataRepresentationId_t data_representation)); MOCK_METHOD2(deserialize, bool( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data)); MOCK_METHOD2(getSerializedSizeProvider, std::function ( @@ -59,16 +59,16 @@ TEST(DataReaderHistory, exclusive_ownership_non_keyed_sample_reception) qos.ownership().kind = eprosima::fastdds::dds::EXCLUSIVE_OWNERSHIP_QOS; qos.history().kind = KEEP_ALL_HISTORY_QOS; DataReaderHistory history(type, topic, qos); - eprosima::fastrtps::RecursiveTimedMutex mutex; - eprosima::fastrtps::rtps::StatelessReader reader(&history, &mutex); + eprosima::fastdds::RecursiveTimedMutex mutex; + eprosima::fastdds::rtps::StatelessReader reader(&history, &mutex); - eprosima::fastrtps::rtps::CacheChange_t dw1_change; + eprosima::fastdds::rtps::CacheChange_t dw1_change; dw1_change.writerGUID = {{}, 1}; dw1_change.reader_info.writer_ownership_strength = 1; - eprosima::fastrtps::rtps::CacheChange_t dw2_change; + eprosima::fastdds::rtps::CacheChange_t dw2_change; dw2_change.writerGUID = {{}, 2}; dw2_change.reader_info.writer_ownership_strength = 2; - eprosima::fastrtps::rtps::CacheChange_t dw3_change; + eprosima::fastdds::rtps::CacheChange_t dw3_change; dw3_change.writerGUID = {{}, 3}; dw3_change.reader_info.writer_ownership_strength = 3; @@ -139,19 +139,19 @@ TEST(DataReaderHistory, exclusive_ownership_keyed_sample_reception) qos.ownership().kind = eprosima::fastdds::dds::EXCLUSIVE_OWNERSHIP_QOS; qos.history().kind = KEEP_ALL_HISTORY_QOS; DataReaderHistory history(type, topic, qos); - eprosima::fastrtps::RecursiveTimedMutex mutex; - eprosima::fastrtps::rtps::StatelessReader reader(&history, &mutex); + eprosima::fastdds::RecursiveTimedMutex mutex; + eprosima::fastdds::rtps::StatelessReader reader(&history, &mutex); - const InstanceHandle_t instance_1 = eprosima::fastrtps::rtps::GUID_t{{}, 1}; - const InstanceHandle_t instance_2 = eprosima::fastrtps::rtps::GUID_t{{}, 2}; - const InstanceHandle_t instance_3 = eprosima::fastrtps::rtps::GUID_t{{}, 3}; - eprosima::fastrtps::rtps::CacheChange_t dw1_change; + const InstanceHandle_t instance_1 = eprosima::fastdds::rtps::GUID_t{{}, 1}; + const InstanceHandle_t instance_2 = eprosima::fastdds::rtps::GUID_t{{}, 2}; + const InstanceHandle_t instance_3 = eprosima::fastdds::rtps::GUID_t{{}, 3}; + eprosima::fastdds::rtps::CacheChange_t dw1_change; dw1_change.writerGUID = {{}, 1}; dw1_change.reader_info.writer_ownership_strength = 1; - eprosima::fastrtps::rtps::CacheChange_t dw2_change; + eprosima::fastdds::rtps::CacheChange_t dw2_change; dw2_change.writerGUID = {{}, 2}; dw2_change.reader_info.writer_ownership_strength = 2; - eprosima::fastrtps::rtps::CacheChange_t dw3_change; + eprosima::fastdds::rtps::CacheChange_t dw3_change; dw3_change.writerGUID = {{}, 3}; dw3_change.reader_info.writer_ownership_strength = 3; diff --git a/test/unittest/dds/subscriber/DataReaderInstanceTests.cpp b/test/unittest/dds/subscriber/DataReaderInstanceTests.cpp index 919e67c82e6..f96b0e55dd9 100644 --- a/test/unittest/dds/subscriber/DataReaderInstanceTests.cpp +++ b/test/unittest/dds/subscriber/DataReaderInstanceTests.cpp @@ -11,10 +11,10 @@ TEST(DataReaderInstance, writer_update_its_ownership_strength) { // Prepare test input. eprosima::fastdds::dds::detail::DataReaderInstance instance({}, {}); - const eprosima::fastrtps::rtps::GUID_t dw1_guid({}, 1); - const eprosima::fastrtps::rtps::GUID_t dw2_guid({}, 2); - const eprosima::fastrtps::rtps::GUID_t dw3_guid({}, 3); - const eprosima::fastrtps::rtps::GUID_t another_guid({}, 4); + const eprosima::fastdds::rtps::GUID_t dw1_guid({}, 1); + const eprosima::fastdds::rtps::GUID_t dw2_guid({}, 2); + const eprosima::fastdds::rtps::GUID_t dw3_guid({}, 3); + const eprosima::fastdds::rtps::GUID_t another_guid({}, 4); instance.alive_writers.push_back({dw1_guid, 1}); instance.alive_writers.push_back({dw2_guid, 10}); @@ -82,13 +82,13 @@ TEST(DataReaderInstance, update_state_alive) // Prepare test input. eprosima::fastdds::dds::detail::DataReaderHistoryCounters counters; eprosima::fastdds::dds::detail::DataReaderInstance instance({}, {}); - const eprosima::fastrtps::rtps::GUID_t dw1_guid({}, 1); - const eprosima::fastrtps::rtps::GUID_t dw2_guid({}, 2); - const eprosima::fastrtps::rtps::GUID_t dw3_guid({}, 3); - const eprosima::fastrtps::rtps::GUID_t another_guid({}, 4); + const eprosima::fastdds::rtps::GUID_t dw1_guid({}, 1); + const eprosima::fastdds::rtps::GUID_t dw2_guid({}, 2); + const eprosima::fastdds::rtps::GUID_t dw3_guid({}, 3); + const eprosima::fastdds::rtps::GUID_t another_guid({}, 4); // Calls `DataReaderInstance::update_state()` with a new DW1 writer with strength 2. - instance.update_state(counters, eprosima::fastrtps::rtps::ALIVE, dw1_guid, 2); + instance.update_state(counters, eprosima::fastdds::rtps::ALIVE, dw1_guid, 2); // Instance has a new owner DW1 with strength 2. ASSERT_EQ(dw1_guid, instance.current_owner.first); ASSERT_EQ(2u, instance.current_owner.second); @@ -100,7 +100,7 @@ TEST(DataReaderInstance, update_state_alive) ASSERT_EQ(0u, counters.instances_no_writers); // Calls `DataReaderInstance::update_state()` with a new DW2 writer with strength 1. - instance.update_state(counters, eprosima::fastrtps::rtps::ALIVE, dw2_guid, 1); + instance.update_state(counters, eprosima::fastdds::rtps::ALIVE, dw2_guid, 1); // Instance has a new "alive" writer DW2 with strength 1. ASSERT_EQ(dw1_guid, instance.current_owner.first); ASSERT_EQ(2u, instance.current_owner.second); @@ -112,7 +112,7 @@ TEST(DataReaderInstance, update_state_alive) ASSERT_EQ(0u, counters.instances_no_writers); // Calls `DataReaderInstance::update_state()` with a new DW3 writer with strength 6. - instance.update_state(counters, eprosima::fastrtps::rtps::ALIVE, dw3_guid, 6); + instance.update_state(counters, eprosima::fastdds::rtps::ALIVE, dw3_guid, 6); // Instance has a new "alive" writer DW3 with strength 6 and DW3 is the new owner. ASSERT_EQ(dw3_guid, instance.current_owner.first); ASSERT_EQ(6u, instance.current_owner.second); @@ -124,7 +124,7 @@ TEST(DataReaderInstance, update_state_alive) ASSERT_EQ(0u, counters.instances_no_writers); // Calls `DataReaderInstance::update_state()` with a new DW2 writer with strength 7. - instance.update_state(counters, eprosima::fastrtps::rtps::ALIVE, dw2_guid, 7); + instance.update_state(counters, eprosima::fastdds::rtps::ALIVE, dw2_guid, 7); // Instance has a new owner DW2 with strength 7. ASSERT_EQ(dw2_guid, instance.current_owner.first); ASSERT_EQ(7u, instance.current_owner.second); @@ -136,7 +136,7 @@ TEST(DataReaderInstance, update_state_alive) ASSERT_EQ(0u, counters.instances_no_writers); // Calls `DataReaderInstance::update_state()` with a new DW2 writer with strength 2. - instance.update_state(counters, eprosima::fastrtps::rtps::ALIVE, dw2_guid, 2); + instance.update_state(counters, eprosima::fastdds::rtps::ALIVE, dw2_guid, 2); // Instance maintain the owner DW2 with strength 2. ASSERT_EQ(dw2_guid, instance.current_owner.first); ASSERT_EQ(2u, instance.current_owner.second); @@ -148,7 +148,7 @@ TEST(DataReaderInstance, update_state_alive) ASSERT_EQ(0u, counters.instances_no_writers); // Calls `DataReaderInstance::update_state()` with a new DW1 writer with strength 5. - instance.update_state(counters, eprosima::fastrtps::rtps::ALIVE, dw1_guid, 5); + instance.update_state(counters, eprosima::fastdds::rtps::ALIVE, dw1_guid, 5); // Instance has a new owner DW1 with strength 5. ASSERT_EQ(dw1_guid, instance.current_owner.first); ASSERT_EQ(5u, instance.current_owner.second); @@ -160,7 +160,7 @@ TEST(DataReaderInstance, update_state_alive) ASSERT_EQ(0u, counters.instances_no_writers); // Calls `DataReaderInstance::update_state()` with a new DW1 writer with strength 10. - instance.update_state(counters, eprosima::fastrtps::rtps::ALIVE, dw1_guid, 10); + instance.update_state(counters, eprosima::fastdds::rtps::ALIVE, dw1_guid, 10); // Instance maintain the owner DW1 with strength 10. ASSERT_EQ(dw1_guid, instance.current_owner.first); ASSERT_EQ(10u, instance.current_owner.second); @@ -180,11 +180,11 @@ TEST(DataReaderInstance, update_state_unregister) // Prepare test input. eprosima::fastdds::dds::detail::DataReaderHistoryCounters counters; eprosima::fastdds::dds::detail::DataReaderInstance instance({}, {}); - const eprosima::fastrtps::rtps::GUID_t dw1_guid({}, 1); - const eprosima::fastrtps::rtps::GUID_t dw2_guid({}, 2); - const eprosima::fastrtps::rtps::GUID_t dw3_guid({}, 3); - const eprosima::fastrtps::rtps::GUID_t dw4_guid({}, 4); - const eprosima::fastrtps::rtps::GUID_t another_guid({}, 10); + const eprosima::fastdds::rtps::GUID_t dw1_guid({}, 1); + const eprosima::fastdds::rtps::GUID_t dw2_guid({}, 2); + const eprosima::fastdds::rtps::GUID_t dw3_guid({}, 3); + const eprosima::fastdds::rtps::GUID_t dw4_guid({}, 4); + const eprosima::fastdds::rtps::GUID_t another_guid({}, 10); instance.alive_writers.push_back({dw1_guid, 1}); instance.alive_writers.push_back({dw2_guid, 10}); @@ -193,7 +193,7 @@ TEST(DataReaderInstance, update_state_unregister) instance.current_owner = {dw2_guid, 10}; // Call `DataReaderInstance::update_state()` unregistering DW2. - instance.update_state(counters, eprosima::fastrtps::rtps::NOT_ALIVE_UNREGISTERED, dw2_guid, 10); + instance.update_state(counters, eprosima::fastdds::rtps::NOT_ALIVE_UNREGISTERED, dw2_guid, 10); // Instance's owner changes to DW4 ASSERT_EQ(dw4_guid, instance.current_owner.first); ASSERT_EQ(10u, instance.current_owner.second); @@ -206,7 +206,7 @@ TEST(DataReaderInstance, update_state_unregister) ASSERT_EQ(0u, counters.instances_no_writers); // Call `DataReaderInstance::update_state()` unregistering DW3. - instance.update_state(counters, eprosima::fastrtps::rtps::NOT_ALIVE_UNREGISTERED, dw3_guid, 5); + instance.update_state(counters, eprosima::fastdds::rtps::NOT_ALIVE_UNREGISTERED, dw3_guid, 5); // Instance's owner doesn't changes. ASSERT_EQ(dw4_guid, instance.current_owner.first); ASSERT_EQ(10u, instance.current_owner.second); @@ -219,7 +219,7 @@ TEST(DataReaderInstance, update_state_unregister) ASSERT_EQ(0u, counters.instances_no_writers); // Call `DataReaderInstance::update_state()` unregistering DW4. - instance.update_state(counters, eprosima::fastrtps::rtps::NOT_ALIVE_UNREGISTERED, dw4_guid, 10); + instance.update_state(counters, eprosima::fastdds::rtps::NOT_ALIVE_UNREGISTERED, dw4_guid, 10); // Instance's owner changes to DW1 ASSERT_EQ(dw1_guid, instance.current_owner.first); ASSERT_EQ(1u, instance.current_owner.second); @@ -232,7 +232,7 @@ TEST(DataReaderInstance, update_state_unregister) ASSERT_EQ(0u, counters.instances_no_writers); // Call `DataReaderInstance::update_state()` with with an unknown writer. - instance.update_state(counters, eprosima::fastrtps::rtps::NOT_ALIVE_UNREGISTERED, another_guid, 10); + instance.update_state(counters, eprosima::fastdds::rtps::NOT_ALIVE_UNREGISTERED, another_guid, 10); // Nothing happens. ASSERT_EQ(dw1_guid, instance.current_owner.first); ASSERT_EQ(1u, instance.current_owner.second); @@ -245,9 +245,9 @@ TEST(DataReaderInstance, update_state_unregister) ASSERT_EQ(0u, counters.instances_no_writers); // Call `DataReaderInstance::update_state()` unregistering DW1. - instance.update_state(counters, eprosima::fastrtps::rtps::NOT_ALIVE_UNREGISTERED, dw1_guid, 1); + instance.update_state(counters, eprosima::fastdds::rtps::NOT_ALIVE_UNREGISTERED, dw1_guid, 1); // No instance's owner. - ASSERT_EQ(eprosima::fastrtps::rtps::c_Guid_Unknown, instance.current_owner.first); + ASSERT_EQ(eprosima::fastdds::rtps::c_Guid_Unknown, instance.current_owner.first); ASSERT_EQ(0u, instance.current_owner.second); ASSERT_EQ(eprosima::fastdds::dds::NOT_ALIVE_NO_WRITERS_INSTANCE_STATE, instance.instance_state); ASSERT_EQ(0u, instance.alive_writers.size()); @@ -265,10 +265,10 @@ TEST(DataReaderInstance, deadline_missed) { // Prepare test input. eprosima::fastdds::dds::detail::DataReaderInstance instance({}, {}); - const eprosima::fastrtps::rtps::GUID_t dw1_guid({}, 1); - const eprosima::fastrtps::rtps::GUID_t dw2_guid({}, 2); - const eprosima::fastrtps::rtps::GUID_t dw3_guid({}, 3); - const eprosima::fastrtps::rtps::GUID_t dw4_guid({}, 4); + const eprosima::fastdds::rtps::GUID_t dw1_guid({}, 1); + const eprosima::fastdds::rtps::GUID_t dw2_guid({}, 2); + const eprosima::fastdds::rtps::GUID_t dw3_guid({}, 3); + const eprosima::fastdds::rtps::GUID_t dw4_guid({}, 4); instance.alive_writers.push_back({dw1_guid, 1}); instance.alive_writers.push_back({dw2_guid, 10}); @@ -303,7 +303,7 @@ TEST(DataReaderInstance, deadline_missed) // Call `DataReaderInstance::deadline_missed()`. instance.deadline_missed(); // No instance's owner. - ASSERT_EQ(eprosima::fastrtps::rtps::c_Guid_Unknown, instance.current_owner.first); + ASSERT_EQ(eprosima::fastdds::rtps::c_Guid_Unknown, instance.current_owner.first); ASSERT_EQ(0u, instance.current_owner.second); ASSERT_EQ(eprosima::fastdds::dds::NOT_ALIVE_NO_WRITERS_INSTANCE_STATE, instance.instance_state); ASSERT_EQ(0u, instance.alive_writers.size()); @@ -311,7 +311,7 @@ TEST(DataReaderInstance, deadline_missed) // Ownership fallback when multiple writers have the same strength eprosima::fastdds::dds::detail::DataReaderInstance second_instance({}, {}); - const eprosima::fastrtps::rtps::GUID_t dw2_2_guid({}, 3); + const eprosima::fastdds::rtps::GUID_t dw2_2_guid({}, 3); second_instance.alive_writers.push_back({dw2_2_guid, 2}); second_instance.alive_writers.push_back({dw2_guid, 2}); second_instance.alive_writers.push_back({dw4_guid, 4}); @@ -333,12 +333,12 @@ TEST(DataReaderInstance, same_ownership_strenght) // Prepare test input. eprosima::fastdds::dds::detail::DataReaderHistoryCounters counters; eprosima::fastdds::dds::detail::DataReaderInstance instance({}, {}); - const eprosima::fastrtps::rtps::GUID_t dw1_guid({}, 2); - const eprosima::fastrtps::rtps::GUID_t dw2_guid({}, 3); - const eprosima::fastrtps::rtps::GUID_t dw3_guid({}, 1); + const eprosima::fastdds::rtps::GUID_t dw1_guid({}, 2); + const eprosima::fastdds::rtps::GUID_t dw2_guid({}, 3); + const eprosima::fastdds::rtps::GUID_t dw3_guid({}, 1); // Calls `DataReaderInstance::update_state()` with a new DW1 writer with strength 10. - instance.update_state(counters, eprosima::fastrtps::rtps::ALIVE, dw1_guid, 10); + instance.update_state(counters, eprosima::fastdds::rtps::ALIVE, dw1_guid, 10); // Instance has a new owner DW1 with strength 10. ASSERT_EQ(dw1_guid, instance.current_owner.first); ASSERT_EQ(10u, instance.current_owner.second); @@ -350,7 +350,7 @@ TEST(DataReaderInstance, same_ownership_strenght) ASSERT_EQ(0u, counters.instances_no_writers); // Calls `DataReaderInstance::update_state()` with a new DW2 writer with strength 10 and greater GUID. - instance.update_state(counters, eprosima::fastrtps::rtps::ALIVE, dw2_guid, 10); + instance.update_state(counters, eprosima::fastdds::rtps::ALIVE, dw2_guid, 10); // Instance has a new "alive" writer DW3 with strength 10 and owner doesn't change. ASSERT_EQ(dw1_guid, instance.current_owner.first); ASSERT_EQ(10u, instance.current_owner.second); @@ -362,7 +362,7 @@ TEST(DataReaderInstance, same_ownership_strenght) ASSERT_EQ(0u, counters.instances_no_writers); // Calls `DataReaderInstance::update_state()` with a new DW3 writer with strength 10. - instance.update_state(counters, eprosima::fastrtps::rtps::ALIVE, dw3_guid, 10); + instance.update_state(counters, eprosima::fastdds::rtps::ALIVE, dw3_guid, 10); // Instance has a new "alive" writer DW3 with strength 10 and DW3 is the new owner. ASSERT_EQ(dw3_guid, instance.current_owner.first); ASSERT_EQ(10u, instance.current_owner.second); diff --git a/test/unittest/dds/subscriber/DataReaderTests.cpp b/test/unittest/dds/subscriber/DataReaderTests.cpp index 5379c7999e9..129608f08e0 100644 --- a/test/unittest/dds/subscriber/DataReaderTests.cpp +++ b/test/unittest/dds/subscriber/DataReaderTests.cpp @@ -76,7 +76,6 @@ using namespace eprosima::fastdds::dds; using namespace eprosima::fastdds::rtps; -using namespace eprosima::fastrtps::rtps; static constexpr LoanableCollection::size_type num_test_elements = 10; @@ -619,9 +618,9 @@ TEST_F(DataReaderTests, get_guid) DomainParticipantQos participant_qos = PARTICIPANT_QOS_DEFAULT; participant_qos.wire_protocol().builtin.discovery_config.ignoreParticipantFlags = - static_cast( - ParticipantFilteringFlags_t::FILTER_DIFFERENT_HOST | - ParticipantFilteringFlags_t::FILTER_DIFFERENT_PROCESS); + static_cast( + ParticipantFilteringFlags::FILTER_DIFFERENT_HOST | + ParticipantFilteringFlags::FILTER_DIFFERENT_PROCESS); DomainParticipant* listener_participant = DomainParticipantFactory::get_instance()->create_participant( @@ -3771,21 +3770,21 @@ class DataRepresentationTestsTypeSupport : public TopicDataType bool serialize( void* /*data*/, - eprosima::fastrtps::rtps::SerializedPayload_t* /*payload*/) override + eprosima::fastdds::rtps::SerializedPayload_t* /*payload*/) override { return true; } bool serialize( void* /*data*/, - eprosima::fastrtps::rtps::SerializedPayload_t* /*payload*/, + eprosima::fastdds::rtps::SerializedPayload_t* /*payload*/, DataRepresentationId_t /*data_representation*/) override { return true; } bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* /*payload*/, + eprosima::fastdds::rtps::SerializedPayload_t* /*payload*/, void* /*data*/) override { return true; @@ -3822,7 +3821,7 @@ class DataRepresentationTestsTypeSupport : public TopicDataType bool getKey( void* /*data*/, - eprosima::fastrtps::rtps::InstanceHandle_t* /*ihandle*/, + eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool /*force_md5*/) override { return true; diff --git a/test/unittest/dds/subscriber/FooBoundedTypeSupport.hpp b/test/unittest/dds/subscriber/FooBoundedTypeSupport.hpp index d55d950041c..433492366e9 100644 --- a/test/unittest/dds/subscriber/FooBoundedTypeSupport.hpp +++ b/test/unittest/dds/subscriber/FooBoundedTypeSupport.hpp @@ -41,14 +41,14 @@ class FooBoundedTypeSupport : public TopicDataType bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } bool serialize( void* data, - fastrtps::rtps::SerializedPayload_t* payload, + fastdds::rtps::SerializedPayload_t* payload, DataRepresentationId_t data_representation) override { type* p_type = static_cast(data); @@ -90,7 +90,7 @@ class FooBoundedTypeSupport : public TopicDataType } bool deserialize( - fastrtps::rtps::SerializedPayload_t* payload, + fastdds::rtps::SerializedPayload_t* payload, void* data) override { //Convert DATA to pointer of your type @@ -155,7 +155,7 @@ class FooBoundedTypeSupport : public TopicDataType bool getKey( void* /*data*/, - fastrtps::rtps::InstanceHandle_t* /*handle*/, + fastdds::rtps::InstanceHandle_t* /*handle*/, bool /*force_md5*/) override { return false; diff --git a/test/unittest/dds/subscriber/FooTypeSupport.hpp b/test/unittest/dds/subscriber/FooTypeSupport.hpp index 893a61fb8a3..c1711f1dbf3 100644 --- a/test/unittest/dds/subscriber/FooTypeSupport.hpp +++ b/test/unittest/dds/subscriber/FooTypeSupport.hpp @@ -39,14 +39,14 @@ class FooTypeSupport : public TopicDataType bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } bool serialize( void* data, - fastrtps::rtps::SerializedPayload_t* payload, + fastdds::rtps::SerializedPayload_t* payload, DataRepresentationId_t data_representation) override { FooType* p_type = static_cast(data); @@ -88,7 +88,7 @@ class FooTypeSupport : public TopicDataType } bool deserialize( - fastrtps::rtps::SerializedPayload_t* payload, + fastdds::rtps::SerializedPayload_t* payload, void* data) override { //Convert DATA to pointer of your type @@ -152,7 +152,7 @@ class FooTypeSupport : public TopicDataType bool getKey( void* data, - fastrtps::rtps::InstanceHandle_t* handle, + fastdds::rtps::InstanceHandle_t* handle, bool force_md5) override { FooType* p_type = static_cast(data); diff --git a/test/unittest/dds/subscriber/SubscriberTests.cpp b/test/unittest/dds/subscriber/SubscriberTests.cpp index 98b01053bd3..b667f484810 100644 --- a/test/unittest/dds/subscriber/SubscriberTests.cpp +++ b/test/unittest/dds/subscriber/SubscriberTests.cpp @@ -34,7 +34,7 @@ namespace eprosima { namespace fastdds { namespace dds { -using fastrtps::rtps::PropertyPolicyHelper; +using rtps::PropertyPolicyHelper; class FooType { @@ -155,21 +155,21 @@ class TopicDataTypeMock : public TopicDataType bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } bool serialize( void* /*data*/, - fastrtps::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t* /*payload*/, DataRepresentationId_t /*data_representation*/) override { return true; } bool deserialize( - fastrtps::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t* /*payload*/, void* /*data*/) override { return true; @@ -203,7 +203,7 @@ class TopicDataTypeMock : public TopicDataType bool getKey( void* /*data*/, - fastrtps::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool /*force_md5*/) override { return true; @@ -285,8 +285,8 @@ TEST(SubscriberTests, ChangeDefaultDataReaderQos) // .ownership qos.ownership().kind = eprosima::fastdds::dds::EXCLUSIVE_OWNERSHIP_QOS; // .time_based_filter - qos.time_based_filter().minimum_separation.seconds = eprosima::fastrtps::Time_t::INFINITE_SECONDS; - qos.time_based_filter().minimum_separation.nanosec = eprosima::fastrtps::Time_t::INFINITE_NANOSECONDS; + qos.time_based_filter().minimum_separation.seconds = eprosima::fastdds::Time_t::INFINITE_SECONDS; + qos.time_based_filter().minimum_separation.nanosec = eprosima::fastdds::Time_t::INFINITE_NANOSECONDS; // .reader_data_lifecycle qos.reader_data_lifecycle().autopurge_disposed_samples_delay.seconds = 100; qos.reader_data_lifecycle().autopurge_disposed_samples_delay.nanosec = 30000u; @@ -320,7 +320,7 @@ TEST(SubscriberTests, ChangeDefaultDataReaderQos) // .expects_inline_qos qos.expects_inline_qos(true); // .properties - eprosima::fastrtps::rtps::Property property; + eprosima::fastdds::rtps::Property property; property.name("Property1"); property.value("Value1"); qos.properties().properties().push_back(property); @@ -331,7 +331,7 @@ TEST(SubscriberTests, ChangeDefaultDataReaderQos) // .endpoint qos.endpoint().user_defined_id = 1; qos.endpoint().entity_id = 2; - qos.endpoint().history_memory_policy = eprosima::fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; + qos.endpoint().history_memory_policy = eprosima::fastdds::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE; // .reader_resource_limits qos.reader_resource_limits().matched_publisher_allocation.initial = 30; @@ -407,8 +407,8 @@ TEST(SubscriberTests, ChangeDefaultDataReaderQos) // .ownership EXPECT_EQ(eprosima::fastdds::dds::EXCLUSIVE_OWNERSHIP_QOS, rqos.ownership().kind); // .time_based_filter - EXPECT_EQ(eprosima::fastrtps::Time_t::INFINITE_SECONDS, rqos.time_based_filter().minimum_separation.seconds); - EXPECT_EQ(eprosima::fastrtps::Time_t::INFINITE_NANOSECONDS, rqos.time_based_filter().minimum_separation.nanosec); + EXPECT_EQ(eprosima::fastdds::Time_t::INFINITE_SECONDS, rqos.time_based_filter().minimum_separation.seconds); + EXPECT_EQ(eprosima::fastdds::Time_t::INFINITE_NANOSECONDS, rqos.time_based_filter().minimum_separation.nanosec); // .reader_data_lifecycle EXPECT_EQ(100, rqos.reader_data_lifecycle().autopurge_disposed_samples_delay.seconds); EXPECT_EQ(30000u, rqos.reader_data_lifecycle().autopurge_disposed_samples_delay.nanosec); @@ -463,7 +463,7 @@ TEST(SubscriberTests, ChangeDefaultDataReaderQos) // .endpoint EXPECT_EQ(1, rqos.endpoint().user_defined_id); EXPECT_EQ(2, rqos.endpoint().entity_id); - EXPECT_EQ(eprosima::fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE, rqos.endpoint().history_memory_policy); + EXPECT_EQ(eprosima::fastdds::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE, rqos.endpoint().history_memory_policy); // .reader_resource_limits EXPECT_EQ(30u, rqos.reader_resource_limits().matched_publisher_allocation.initial); EXPECT_EQ(300u, rqos.reader_resource_limits().matched_publisher_allocation.maximum); @@ -954,7 +954,7 @@ TEST(SubscriberTests, datareader_copy_from_topic_qos) control_qos.user_data().push_back(0); control_qos.endpoint().entity_id = 1; control_qos.reader_resource_limits().matched_publisher_allocation = - eprosima::fastrtps::ResourceLimitedContainerConfig::fixed_size_configuration(1u); + eprosima::fastdds::ResourceLimitedContainerConfig::fixed_size_configuration(1u); control_qos.data_sharing().off(); // Copy control Qos to test Qos. At this point, test_qos has non-default values for the non-common Qos, diff --git a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.cxx b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.cxx index bf8391a2c86..55bf8373591 100644 --- a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.cxx +++ b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.cxx @@ -27,8 +27,8 @@ #include "ContentFilterTestTypeCdrAux.hpp" #include "ContentFilterTestTypeTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; StructTypePubSubType::StructTypePubSubType() diff --git a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.h b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.h index 384ee540d3d..fec23a3ee47 100644 --- a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.h +++ b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.h @@ -54,18 +54,18 @@ class StructTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -80,7 +80,7 @@ class StructTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; @@ -147,18 +147,18 @@ class ContentFilterTestTypePubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -173,7 +173,7 @@ class ContentFilterTestTypePubSubType : public eprosima::fastdds::dds::TopicData eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/test/unittest/dds/topic/TopicTests.cpp b/test/unittest/dds/topic/TopicTests.cpp index 94b38e4ee46..b38ae20f758 100644 --- a/test/unittest/dds/topic/TopicTests.cpp +++ b/test/unittest/dds/topic/TopicTests.cpp @@ -74,13 +74,13 @@ class TopicDataTypeMock : public TopicDataType bool serialize( void* /*data*/, - fastrtps::rtps::SerializedPayload_t* /*payload*/) override + fastdds::rtps::SerializedPayload_t* /*payload*/) override { return true; } bool deserialize( - fastrtps::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t* /*payload*/, void* /*data*/) override { return true; @@ -107,7 +107,7 @@ class TopicDataTypeMock : public TopicDataType bool getKey( void* /*data*/, - fastrtps::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool /*force_md5*/) override { return true; diff --git a/test/unittest/rtps/DataSharing/SHMSegmentTests.cpp b/test/unittest/rtps/DataSharing/SHMSegmentTests.cpp index 70cb3f07343..83fcd1608ed 100644 --- a/test/unittest/rtps/DataSharing/SHMSegmentTests.cpp +++ b/test/unittest/rtps/DataSharing/SHMSegmentTests.cpp @@ -28,7 +28,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { using namespace testing; @@ -38,7 +38,7 @@ using namespace testing; TEST(SHMSegmentTests, Writer) { RTPSParticipantAttributes p_attr; - p_attr.builtin.discovery_config.discoveryProtocol = eprosima::fastrtps::rtps::DiscoveryProtocol::SIMPLE; + p_attr.builtin.discovery_config.discoveryProtocol = eprosima::fastdds::rtps::DiscoveryProtocol::SIMPLE; p_attr.builtin.use_WriterLivelinessProtocol = true; RTPSParticipant* participant = RTPSDomain::createParticipant( 0, p_attr); @@ -68,7 +68,7 @@ TEST(SHMSegmentTests, Writer) } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima int main( diff --git a/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp b/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp index 5f99cf952ae..7da759bd2c6 100644 --- a/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp +++ b/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp @@ -34,7 +34,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { constexpr size_t max_unicast_locators = 4u; @@ -1125,24 +1125,24 @@ TEST(BuiltinDataSerializationTests, contentfilterproperty_wrong_topic_name_deser filter_expression, expression_parameters ); - EXPECT_TRUE(fastrtps::rtps::CDRMessage::addUInt16(&msg, fastdds::dds::PID_CONTENT_FILTER_PROPERTY)); - EXPECT_TRUE(fastrtps::rtps::CDRMessage::addUInt16(&msg, static_cast(len - 4))); + EXPECT_TRUE(fastdds::rtps::CDRMessage::addUInt16(&msg, fastdds::dds::PID_CONTENT_FILTER_PROPERTY)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::addUInt16(&msg, static_cast(len - 4))); // content_filtered_topic_name - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, content_filtered_topic_name)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, content_filtered_topic_name)); // related_topic_name - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, related_topic_name)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, related_topic_name)); // filter_class_name - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, filter_class_name)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, filter_class_name)); // filter_expression - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, filter_expression)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, filter_expression)); // expression_parameters // sequence length uint32_t num_params = static_cast(expression_parameters.size()); - EXPECT_TRUE(fastrtps::rtps::CDRMessage::addUInt32(&msg, num_params)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::addUInt32(&msg, num_params)); // Add all parameters for (const std::string& param : expression_parameters) { - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, param)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, param)); } } EXPECT_TRUE(fastdds::dds::ParameterSerializer::add_parameter_sentinel(&msg)); @@ -1174,24 +1174,24 @@ TEST(BuiltinDataSerializationTests, contentfilterproperty_wrong_topic_name_deser filter_expression, expression_parameters ); - EXPECT_TRUE(fastrtps::rtps::CDRMessage::addUInt16(&msg, fastdds::dds::PID_CONTENT_FILTER_PROPERTY)); - EXPECT_TRUE(fastrtps::rtps::CDRMessage::addUInt16(&msg, static_cast(len - 4))); + EXPECT_TRUE(fastdds::rtps::CDRMessage::addUInt16(&msg, fastdds::dds::PID_CONTENT_FILTER_PROPERTY)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::addUInt16(&msg, static_cast(len - 4))); // content_filtered_topic_name - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, content_filtered_topic_name)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, content_filtered_topic_name)); // related_topic_name - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, related_topic_name)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, related_topic_name)); // filter_class_name - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, filter_class_name)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, filter_class_name)); // filter_expression - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, filter_expression)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, filter_expression)); // expression_parameters // sequence length uint32_t num_params = static_cast(expression_parameters.size()); - EXPECT_TRUE(fastrtps::rtps::CDRMessage::addUInt32(&msg, num_params)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::addUInt32(&msg, num_params)); // Add all parameters for (const std::string& param : expression_parameters) { - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, param)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, param)); } } EXPECT_TRUE(fastdds::dds::ParameterSerializer::add_parameter_sentinel(&msg)); @@ -1259,24 +1259,24 @@ TEST(BuiltinDataSerializationTests, contentfilterproperty_wrong_related_topic_na filter_expression, expression_parameters ); - EXPECT_TRUE(fastrtps::rtps::CDRMessage::addUInt16(&msg, fastdds::dds::PID_CONTENT_FILTER_PROPERTY)); - EXPECT_TRUE(fastrtps::rtps::CDRMessage::addUInt16(&msg, static_cast(len - 4))); + EXPECT_TRUE(fastdds::rtps::CDRMessage::addUInt16(&msg, fastdds::dds::PID_CONTENT_FILTER_PROPERTY)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::addUInt16(&msg, static_cast(len - 4))); // content_filtered_topic_name - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, content_filtered_topic_name)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, content_filtered_topic_name)); // related_topic_name - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, related_topic_name)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, related_topic_name)); // filter_class_name - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, filter_class_name)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, filter_class_name)); // filter_expression - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, filter_expression)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, filter_expression)); // expression_parameters // sequence length uint32_t num_params = static_cast(expression_parameters.size()); - EXPECT_TRUE(fastrtps::rtps::CDRMessage::addUInt32(&msg, num_params)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::addUInt32(&msg, num_params)); // Add all parameters for (const std::string& param : expression_parameters) { - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, param)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, param)); } } EXPECT_TRUE(fastdds::dds::ParameterSerializer::add_parameter_sentinel(&msg)); @@ -1308,24 +1308,24 @@ TEST(BuiltinDataSerializationTests, contentfilterproperty_wrong_related_topic_na filter_expression, expression_parameters ); - EXPECT_TRUE(fastrtps::rtps::CDRMessage::addUInt16(&msg, fastdds::dds::PID_CONTENT_FILTER_PROPERTY)); - EXPECT_TRUE(fastrtps::rtps::CDRMessage::addUInt16(&msg, static_cast(len - 4))); + EXPECT_TRUE(fastdds::rtps::CDRMessage::addUInt16(&msg, fastdds::dds::PID_CONTENT_FILTER_PROPERTY)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::addUInt16(&msg, static_cast(len - 4))); // content_filtered_topic_name - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, content_filtered_topic_name)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, content_filtered_topic_name)); // related_topic_name - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, related_topic_name)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, related_topic_name)); // filter_class_name - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, filter_class_name)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, filter_class_name)); // filter_expression - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, filter_expression)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, filter_expression)); // expression_parameters // sequence length uint32_t num_params = static_cast(expression_parameters.size()); - EXPECT_TRUE(fastrtps::rtps::CDRMessage::addUInt32(&msg, num_params)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::addUInt32(&msg, num_params)); // Add all parameters for (const std::string& param : expression_parameters) { - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, param)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, param)); } } EXPECT_TRUE(fastdds::dds::ParameterSerializer::add_parameter_sentinel(&msg)); @@ -1397,24 +1397,24 @@ TEST(BuiltinDataSerializationTests, contentfilterproperty_wrong_filter_class_des filter_expression, expression_parameters ); - EXPECT_TRUE(fastrtps::rtps::CDRMessage::addUInt16(&msg, fastdds::dds::PID_CONTENT_FILTER_PROPERTY)); - EXPECT_TRUE(fastrtps::rtps::CDRMessage::addUInt16(&msg, static_cast(len - 4))); + EXPECT_TRUE(fastdds::rtps::CDRMessage::addUInt16(&msg, fastdds::dds::PID_CONTENT_FILTER_PROPERTY)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::addUInt16(&msg, static_cast(len - 4))); // content_filtered_topic_name - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, content_filtered_topic_name)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, content_filtered_topic_name)); // related_topic_name - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, related_topic_name)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, related_topic_name)); // filter_class_name - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, filter_class_name)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, filter_class_name)); // filter_expression - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, filter_expression)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, filter_expression)); // expression_parameters // sequence length uint32_t num_params = static_cast(expression_parameters.size()); - EXPECT_TRUE(fastrtps::rtps::CDRMessage::addUInt32(&msg, num_params)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::addUInt32(&msg, num_params)); // Add all parameters for (const std::string& param : expression_parameters) { - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, param)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, param)); } } EXPECT_TRUE(fastdds::dds::ParameterSerializer::add_parameter_sentinel(&msg)); @@ -1446,24 +1446,24 @@ TEST(BuiltinDataSerializationTests, contentfilterproperty_wrong_filter_class_des filter_expression, expression_parameters ); - EXPECT_TRUE(fastrtps::rtps::CDRMessage::addUInt16(&msg, fastdds::dds::PID_CONTENT_FILTER_PROPERTY)); - EXPECT_TRUE(fastrtps::rtps::CDRMessage::addUInt16(&msg, static_cast(len - 4))); + EXPECT_TRUE(fastdds::rtps::CDRMessage::addUInt16(&msg, fastdds::dds::PID_CONTENT_FILTER_PROPERTY)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::addUInt16(&msg, static_cast(len - 4))); // content_filtered_topic_name - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, content_filtered_topic_name)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, content_filtered_topic_name)); // related_topic_name - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, related_topic_name)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, related_topic_name)); // filter_class_name - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, filter_class_name)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, filter_class_name)); // filter_expression - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, filter_expression)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, filter_expression)); // expression_parameters // sequence length uint32_t num_params = static_cast(expression_parameters.size()); - EXPECT_TRUE(fastrtps::rtps::CDRMessage::addUInt32(&msg, num_params)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::addUInt32(&msg, num_params)); // Add all parameters for (const std::string& param : expression_parameters) { - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, param)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, param)); } } EXPECT_TRUE(fastdds::dds::ParameterSerializer::add_parameter_sentinel(&msg)); @@ -1535,24 +1535,24 @@ TEST(BuiltinDataSerializationTests, contentfilterproperty_wrong_filter_expressio filter_expression, expression_parameters ); - EXPECT_TRUE(fastrtps::rtps::CDRMessage::addUInt16(&msg, fastdds::dds::PID_CONTENT_FILTER_PROPERTY)); - EXPECT_TRUE(fastrtps::rtps::CDRMessage::addUInt16(&msg, static_cast(len - 4))); + EXPECT_TRUE(fastdds::rtps::CDRMessage::addUInt16(&msg, fastdds::dds::PID_CONTENT_FILTER_PROPERTY)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::addUInt16(&msg, static_cast(len - 4))); // content_filtered_topic_name - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, content_filtered_topic_name)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, content_filtered_topic_name)); // related_topic_name - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, related_topic_name)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, related_topic_name)); // filter_class_name - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, filter_class_name)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, filter_class_name)); // filter_expression - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, filter_expression)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, filter_expression)); // expression_parameters // sequence length uint32_t num_params = static_cast(expression_parameters.size()); - EXPECT_TRUE(fastrtps::rtps::CDRMessage::addUInt32(&msg, num_params)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::addUInt32(&msg, num_params)); // Add all parameters for (const std::string& param : expression_parameters) { - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, param)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, param)); } } EXPECT_TRUE(fastdds::dds::ParameterSerializer::add_parameter_sentinel(&msg)); @@ -1628,16 +1628,16 @@ TEST(BuiltinDataSerializationTests, contentfilterproperty_wrong_cdr_message_dese //Empty buffer but not enough memory. { CDRMessage_t msg(20); - fastrtps::rtps::CDRMessage::addUInt16(&msg, fastdds::dds::PID_CONTENT_FILTER_PROPERTY); - fastrtps::rtps::CDRMessage::addUInt16(&msg, len - 4); + fastdds::rtps::CDRMessage::addUInt16(&msg, fastdds::dds::PID_CONTENT_FILTER_PROPERTY); + fastdds::rtps::CDRMessage::addUInt16(&msg, len - 4); // content_filtered_topic_name - fastrtps::rtps::CDRMessage::add_string(&msg, content_filtered_topic_name); + fastdds::rtps::CDRMessage::add_string(&msg, content_filtered_topic_name); // related_topic_name - fastrtps::rtps::CDRMessage::add_string(&msg, related_topic_name); + fastdds::rtps::CDRMessage::add_string(&msg, related_topic_name); // filter_class_name - fastrtps::rtps::CDRMessage::add_string(&msg, filter_class_name); + fastdds::rtps::CDRMessage::add_string(&msg, filter_class_name); // filter_expression - fastrtps::rtps::CDRMessage::add_string(&msg, filter_expression); + fastdds::rtps::CDRMessage::add_string(&msg, filter_expression); ASSERT_FALSE(fastdds::dds::ParameterSerializer::read_from_cdr_message( content_filter_property, &msg, len)); } @@ -1645,16 +1645,16 @@ TEST(BuiltinDataSerializationTests, contentfilterproperty_wrong_cdr_message_dese { CDRMessage_t msg(30); msg.pos = 10; - fastrtps::rtps::CDRMessage::addUInt16(&msg, fastdds::dds::PID_CONTENT_FILTER_PROPERTY); - fastrtps::rtps::CDRMessage::addUInt16(&msg, len - 4); + fastdds::rtps::CDRMessage::addUInt16(&msg, fastdds::dds::PID_CONTENT_FILTER_PROPERTY); + fastdds::rtps::CDRMessage::addUInt16(&msg, len - 4); // content_filtered_topic_name - fastrtps::rtps::CDRMessage::add_string(&msg, content_filtered_topic_name); + fastdds::rtps::CDRMessage::add_string(&msg, content_filtered_topic_name); // related_topic_name - fastrtps::rtps::CDRMessage::add_string(&msg, related_topic_name); + fastdds::rtps::CDRMessage::add_string(&msg, related_topic_name); // filter_class_name - fastrtps::rtps::CDRMessage::add_string(&msg, filter_class_name); + fastdds::rtps::CDRMessage::add_string(&msg, filter_class_name); // filter_expression - fastrtps::rtps::CDRMessage::add_string(&msg, filter_expression); + fastdds::rtps::CDRMessage::add_string(&msg, filter_expression); msg.pos = 10; ASSERT_FALSE(fastdds::dds::ParameterSerializer::read_from_cdr_message( content_filter_property, &msg, len)); @@ -1790,25 +1790,25 @@ TEST(BuiltinDataSerializationTests, contentfilterproperty_max_parameter_check) filter_expression, expression_parameters ); - EXPECT_TRUE(fastrtps::rtps::CDRMessage::addUInt16(&msg, fastdds::dds::PID_CONTENT_FILTER_PROPERTY)); - EXPECT_TRUE(fastrtps::rtps::CDRMessage::addUInt16(&msg, static_cast(len - 4))); + EXPECT_TRUE(fastdds::rtps::CDRMessage::addUInt16(&msg, fastdds::dds::PID_CONTENT_FILTER_PROPERTY)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::addUInt16(&msg, static_cast(len - 4))); // content_filtered_topic_name - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, content_filtered_topic_name)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, content_filtered_topic_name)); // related_topic_name - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, related_topic_name)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, related_topic_name)); // filter_class_name - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, filter_class_name)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, filter_class_name)); // filter_expression - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, filter_expression)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, filter_expression)); // expression_parameters // sequence length uint32_t num_params = static_cast(expression_parameters.size()); EXPECT_EQ(num_params, 100u); - EXPECT_TRUE(fastrtps::rtps::CDRMessage::addUInt32(&msg, num_params)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::addUInt32(&msg, num_params)); // Add all parameters for (const std::string& param : expression_parameters) { - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg, param)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg, param)); } } EXPECT_TRUE(fastdds::dds::ParameterSerializer::add_parameter_sentinel(&msg)); @@ -1830,16 +1830,16 @@ TEST(BuiltinDataSerializationTests, contentfilterproperty_max_parameter_check) filter_expression, expression_parameters ); - EXPECT_TRUE(fastrtps::rtps::CDRMessage::addUInt16(&msg_fault, fastdds::dds::PID_CONTENT_FILTER_PROPERTY)); - EXPECT_TRUE(fastrtps::rtps::CDRMessage::addUInt16(&msg_fault, static_cast(len - 4))); + EXPECT_TRUE(fastdds::rtps::CDRMessage::addUInt16(&msg_fault, fastdds::dds::PID_CONTENT_FILTER_PROPERTY)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::addUInt16(&msg_fault, static_cast(len - 4))); // content_filtered_topic_name - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg_fault, content_filtered_topic_name)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg_fault, content_filtered_topic_name)); // related_topic_name - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg_fault, related_topic_name)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg_fault, related_topic_name)); // filter_class_name - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg_fault, filter_class_name)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg_fault, filter_class_name)); // filter_expression - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg_fault, filter_expression)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg_fault, filter_expression)); // expression_parameters // sequence length @@ -1847,11 +1847,11 @@ TEST(BuiltinDataSerializationTests, contentfilterproperty_max_parameter_check) expression_parameters.push_back("Parameter"); uint32_t num_params = static_cast(expression_parameters.size()); EXPECT_EQ(num_params, 101u); - EXPECT_TRUE(fastrtps::rtps::CDRMessage::addUInt32(&msg_fault, num_params)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::addUInt32(&msg_fault, num_params)); // Add all parameters for (const std::string& param : expression_parameters) { - EXPECT_TRUE(fastrtps::rtps::CDRMessage::add_string(&msg_fault, param)); + EXPECT_TRUE(fastdds::rtps::CDRMessage::add_string(&msg_fault, param)); } } EXPECT_TRUE(fastdds::dds::ParameterSerializer::add_parameter_sentinel(&msg_fault)); @@ -1882,7 +1882,7 @@ TEST(BuiltinDataSerializationTests, null_checks) } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima int main( diff --git a/test/unittest/rtps/common/CacheChangeTests.cpp b/test/unittest/rtps/common/CacheChangeTests.cpp index bdc53a79063..f8cf2c00a76 100644 --- a/test/unittest/rtps/common/CacheChangeTests.cpp +++ b/test/unittest/rtps/common/CacheChangeTests.cpp @@ -19,7 +19,7 @@ #include -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; struct FragmentTestStep { diff --git a/test/unittest/rtps/common/EntityIdTests.cpp b/test/unittest/rtps/common/EntityIdTests.cpp index 4b055240584..66d0c308f1d 100644 --- a/test/unittest/rtps/common/EntityIdTests.cpp +++ b/test/unittest/rtps/common/EntityIdTests.cpp @@ -16,7 +16,7 @@ #include -using EntityId = eprosima::fastrtps::rtps::EntityId_t; +using EntityId = eprosima::fastdds::rtps::EntityId_t; namespace test { diff --git a/test/unittest/rtps/common/GuidPrefixTests.cpp b/test/unittest/rtps/common/GuidPrefixTests.cpp index 171b393092c..950bb3e4406 100644 --- a/test/unittest/rtps/common/GuidPrefixTests.cpp +++ b/test/unittest/rtps/common/GuidPrefixTests.cpp @@ -16,7 +16,7 @@ #include -using GuidPrefix = eprosima::fastrtps::rtps::GuidPrefix_t; +using GuidPrefix = eprosima::fastdds::rtps::GuidPrefix_t; namespace test { diff --git a/test/unittest/rtps/common/GuidTests.cpp b/test/unittest/rtps/common/GuidTests.cpp index 86d75578ea1..87155823377 100644 --- a/test/unittest/rtps/common/GuidTests.cpp +++ b/test/unittest/rtps/common/GuidTests.cpp @@ -16,7 +16,7 @@ #include -using Guid = eprosima::fastrtps::rtps::GUID_t; +using Guid = eprosima::fastdds::rtps::GUID_t; namespace test { diff --git a/test/unittest/rtps/common/GuidUtilsTests.cpp b/test/unittest/rtps/common/GuidUtilsTests.cpp index 84e42a96601..97eec7cc2c4 100644 --- a/test/unittest/rtps/common/GuidUtilsTests.cpp +++ b/test/unittest/rtps/common/GuidUtilsTests.cpp @@ -20,7 +20,7 @@ #include -using GUID_t = eprosima::fastrtps::rtps::GUID_t; +using GUID_t = eprosima::fastdds::rtps::GUID_t; using GuidUtils = eprosima::fastdds::rtps::GuidUtils; /*! diff --git a/test/unittest/rtps/common/PortParametersTests.cpp b/test/unittest/rtps/common/PortParametersTests.cpp index a0eacc02ab3..56e5a37f1e3 100644 --- a/test/unittest/rtps/common/PortParametersTests.cpp +++ b/test/unittest/rtps/common/PortParametersTests.cpp @@ -18,7 +18,7 @@ #include -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; /*! * @fn TEST(PortParameters, Limit_Unicast_Domain_OK) diff --git a/test/unittest/rtps/common/SequenceNumberTests.cpp b/test/unittest/rtps/common/SequenceNumberTests.cpp index 96f8252832b..b63098c9a42 100644 --- a/test/unittest/rtps/common/SequenceNumberTests.cpp +++ b/test/unittest/rtps/common/SequenceNumberTests.cpp @@ -18,7 +18,7 @@ #include -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; /*! * @fn TEST(SequenceNumber, IncrementalOperator) diff --git a/test/unittest/rtps/common/TimeTests.cpp b/test/unittest/rtps/common/TimeTests.cpp index ca00d4e278c..eb5dd0c5a46 100644 --- a/test/unittest/rtps/common/TimeTests.cpp +++ b/test/unittest/rtps/common/TimeTests.cpp @@ -16,7 +16,7 @@ #include -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; /* * Test << operator diff --git a/test/unittest/rtps/discovery/EdpTests.cpp b/test/unittest/rtps/discovery/EdpTests.cpp index b63dbe25fcc..d5d19d44703 100644 --- a/test/unittest/rtps/discovery/EdpTests.cpp +++ b/test/unittest/rtps/discovery/EdpTests.cpp @@ -28,7 +28,7 @@ #endif // if HAVE_SECURITY namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { using ::testing::Return; @@ -503,7 +503,7 @@ TEST(MatchingFailureMask, matching_failure_mask_overflow) } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima int main( diff --git a/test/unittest/rtps/discovery/PDPTests.cpp b/test/unittest/rtps/discovery/PDPTests.cpp index 7e04d245017..4cded84ece7 100644 --- a/test/unittest/rtps/discovery/PDPTests.cpp +++ b/test/unittest/rtps/discovery/PDPTests.cpp @@ -52,7 +52,7 @@ #endif // if defined(_WIN32) namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { using ::testing::Return; @@ -62,48 +62,48 @@ class TesterPDPEndpoints : public fastdds::rtps::PDPEndpoints { ~TesterPDPEndpoints() override = default; - fastrtps::rtps::BuiltinEndpointSet_t builtin_endpoints() const override + fastdds::rtps::BuiltinEndpointSet_t builtin_endpoints() const override { return fastdds::rtps::DISC_BUILTIN_ENDPOINT_PARTICIPANT_ANNOUNCER | fastdds::rtps::DISC_BUILTIN_ENDPOINT_PARTICIPANT_DETECTOR; } - const std::unique_ptr& main_listener() const override + const std::unique_ptr& main_listener() const override { return no_listener_; } bool enable_pdp_readers( - fastrtps::rtps::RTPSParticipantImpl*) override + fastdds::rtps::RTPSParticipantImpl*) override { return true; } void disable_pdp_readers( - fastrtps::rtps::RTPSParticipantImpl*) override + fastdds::rtps::RTPSParticipantImpl*) override { } void delete_pdp_endpoints( - fastrtps::rtps::RTPSParticipantImpl* ) override + fastdds::rtps::RTPSParticipantImpl* ) override { } void remove_from_pdp_reader_history( - const fastrtps::rtps::InstanceHandle_t&) override + const fastdds::rtps::InstanceHandle_t&) override { } void remove_from_pdp_reader_history( - fastrtps::rtps::CacheChange_t*) override + fastdds::rtps::CacheChange_t*) override { } - std::unique_ptr no_listener_; + std::unique_ptr no_listener_; }; @@ -259,7 +259,7 @@ class Listener : public eprosima::fastdds::dds::DomainParticipantListener void on_participant_discovery( fastdds::dds::DomainParticipant* participant, - fastrtps::rtps::ParticipantDiscoveryInfo&& /*info*/, + fastdds::rtps::ParticipantDiscoveryInfo&& /*info*/, bool& /*should_be_ignored*/) override { if (std::find(p_matched_.begin(), p_matched_.end(), participant->guid()) == p_matched_.end()) @@ -273,7 +273,7 @@ class Listener : public eprosima::fastdds::dds::DomainParticipantListener private: - std::vector p_matched_; + std::vector p_matched_; }; class PDPTests : public ::testing::Test @@ -432,7 +432,7 @@ TEST_F(PDPTests, iproxy_queryable_get_serialized_proxy) } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima int main( diff --git a/test/unittest/rtps/domain/RTPSDomainTests.cpp b/test/unittest/rtps/domain/RTPSDomainTests.cpp index ed89b579c8f..110b853704b 100644 --- a/test/unittest/rtps/domain/RTPSDomainTests.cpp +++ b/test/unittest/rtps/domain/RTPSDomainTests.cpp @@ -24,7 +24,7 @@ TEST(RTPSDomainTests, library_settings_test) { eprosima::fastdds::LibrarySettings library_settings; - EXPECT_TRUE(eprosima::fastrtps::rtps::RTPSDomain::get_library_settings(library_settings)); + EXPECT_TRUE(eprosima::fastdds::rtps::RTPSDomain::get_library_settings(library_settings)); // Get LibrarySettings default values #if HAVE_STRICT_REALTIME EXPECT_EQ(eprosima::fastdds::INTRAPROCESS_OFF, library_settings.intraprocess_delivery); @@ -33,27 +33,27 @@ TEST(RTPSDomainTests, library_settings_test) #endif // if HAVE_STRICT_REALTIME library_settings.intraprocess_delivery = eprosima::fastdds::INTRAPROCESS_USER_DATA_ONLY; // Setting the library settings within an empty RTPSDomain shall return true - EXPECT_TRUE(eprosima::fastrtps::rtps::RTPSDomain::set_library_settings(library_settings)); - EXPECT_TRUE(eprosima::fastrtps::rtps::RTPSDomain::get_library_settings(library_settings)); + EXPECT_TRUE(eprosima::fastdds::rtps::RTPSDomain::set_library_settings(library_settings)); + EXPECT_TRUE(eprosima::fastdds::rtps::RTPSDomain::get_library_settings(library_settings)); EXPECT_EQ(eprosima::fastdds::INTRAPROCESS_USER_DATA_ONLY, library_settings.intraprocess_delivery); // Create RTPSParticipant - eprosima::fastrtps::rtps::RTPSParticipantAttributes part_attr; - eprosima::fastrtps::rtps::RTPSParticipant* participant = - eprosima::fastrtps::rtps::RTPSDomain::createParticipant(0, part_attr); + eprosima::fastdds::rtps::RTPSParticipantAttributes part_attr; + eprosima::fastdds::rtps::RTPSParticipant* participant = + eprosima::fastdds::rtps::RTPSDomain::createParticipant(0, part_attr); ASSERT_NE(nullptr, participant); library_settings.intraprocess_delivery = eprosima::fastdds::INTRAPROCESS_OFF; // Setting LibrarySettings with any RTPSParticipant shall fail - EXPECT_FALSE(eprosima::fastrtps::rtps::RTPSDomain::set_library_settings(library_settings)); - EXPECT_TRUE(eprosima::fastrtps::rtps::RTPSDomain::get_library_settings(library_settings)); + EXPECT_FALSE(eprosima::fastdds::rtps::RTPSDomain::set_library_settings(library_settings)); + EXPECT_TRUE(eprosima::fastdds::rtps::RTPSDomain::get_library_settings(library_settings)); EXPECT_EQ(eprosima::fastdds::INTRAPROCESS_USER_DATA_ONLY, library_settings.intraprocess_delivery); // Remove RTPSParticipant - EXPECT_TRUE(eprosima::fastrtps::rtps::RTPSDomain::removeRTPSParticipant(participant)); + EXPECT_TRUE(eprosima::fastdds::rtps::RTPSDomain::removeRTPSParticipant(participant)); library_settings.intraprocess_delivery = eprosima::fastdds::INTRAPROCESS_OFF; // Setting LibrarySettings with no participants shall suceed - EXPECT_TRUE(eprosima::fastrtps::rtps::RTPSDomain::set_library_settings(library_settings)); - EXPECT_TRUE(eprosima::fastrtps::rtps::RTPSDomain::get_library_settings(library_settings)); + EXPECT_TRUE(eprosima::fastdds::rtps::RTPSDomain::set_library_settings(library_settings)); + EXPECT_TRUE(eprosima::fastdds::rtps::RTPSDomain::get_library_settings(library_settings)); EXPECT_EQ(eprosima::fastdds::INTRAPROCESS_OFF, library_settings.intraprocess_delivery); - eprosima::fastrtps::rtps::RTPSDomain::stopAll(); + eprosima::fastdds::rtps::RTPSDomain::stopAll(); } /** @@ -62,8 +62,8 @@ TEST(RTPSDomainTests, library_settings_test) TEST(RTPSDomainTests, get_topic_attributes_from_profile_test) { std::string profile_name = "test_profile_name"; - eprosima::fastrtps::TopicAttributes topic_att; - EXPECT_FALSE(eprosima::fastrtps::rtps::RTPSDomain::get_topic_attributes_from_profile(profile_name, topic_att)); + eprosima::fastdds::TopicAttributes topic_att; + EXPECT_FALSE(eprosima::fastdds::rtps::RTPSDomain::get_topic_attributes_from_profile(profile_name, topic_att)); const std::string xml = R"( @@ -86,7 +86,7 @@ TEST(RTPSDomainTests, get_topic_attributes_from_profile_test) EXPECT_EQ(eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->load_XML_profiles_string(xml.c_str(), xml.length()), eprosima::fastdds::dds::RETCODE_OK); - EXPECT_TRUE(eprosima::fastrtps::rtps::RTPSDomain::get_topic_attributes_from_profile(profile_name, topic_att)); + EXPECT_TRUE(eprosima::fastdds::rtps::RTPSDomain::get_topic_attributes_from_profile(profile_name, topic_att)); EXPECT_EQ(topic_att.topicName, "Test"); EXPECT_EQ(topic_att.topicDataType, "DataTest"); EXPECT_EQ(topic_att.historyQos.kind, eprosima::fastdds::dds::HistoryQosPolicyKind::KEEP_LAST_HISTORY_QOS); diff --git a/test/unittest/rtps/flowcontrol/FlowControllerFactoryTests.cpp b/test/unittest/rtps/flowcontrol/FlowControllerFactoryTests.cpp index ba30728fbb0..433352268b9 100644 --- a/test/unittest/rtps/flowcontrol/FlowControllerFactoryTests.cpp +++ b/test/unittest/rtps/flowcontrol/FlowControllerFactoryTests.cpp @@ -27,14 +27,14 @@ TEST(FlowControllerFactory, get_default_flow_controllers) // Initialize factory. factory.init(nullptr); - eprosima::fastrtps::rtps::WriterAttributes besteffort_sync_attributes; - besteffort_sync_attributes.endpoint.reliabilityKind = eprosima::fastrtps::rtps::BEST_EFFORT; - eprosima::fastrtps::rtps::WriterAttributes reliable_sync_attributes; - eprosima::fastrtps::rtps::WriterAttributes besteffort_async_attributes; - besteffort_async_attributes.endpoint.reliabilityKind = eprosima::fastrtps::rtps::BEST_EFFORT; - besteffort_async_attributes.mode = eprosima::fastrtps::rtps::ASYNCHRONOUS_WRITER; - eprosima::fastrtps::rtps::WriterAttributes reliable_async_attributes; - reliable_async_attributes.mode = eprosima::fastrtps::rtps::ASYNCHRONOUS_WRITER; + eprosima::fastdds::rtps::WriterAttributes besteffort_sync_attributes; + besteffort_sync_attributes.endpoint.reliabilityKind = eprosima::fastdds::rtps::BEST_EFFORT; + eprosima::fastdds::rtps::WriterAttributes reliable_sync_attributes; + eprosima::fastdds::rtps::WriterAttributes besteffort_async_attributes; + besteffort_async_attributes.endpoint.reliabilityKind = eprosima::fastdds::rtps::BEST_EFFORT; + besteffort_async_attributes.mode = eprosima::fastdds::rtps::ASYNCHRONOUS_WRITER; + eprosima::fastdds::rtps::WriterAttributes reliable_async_attributes; + reliable_async_attributes.mode = eprosima::fastdds::rtps::ASYNCHRONOUS_WRITER; // Retrieve PureSyncFlowController. @@ -69,7 +69,7 @@ TEST(FlowControllerFactory, register_flow_controllers) FlowControllerFactory factory; FlowController* flow_controller = nullptr; FlowControllerDescriptor flow_controller_descr; - eprosima::fastrtps::rtps::WriterAttributes writer_attributes; + eprosima::fastdds::rtps::WriterAttributes writer_attributes; // Initialize factory. factory.init(nullptr); diff --git a/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnAsyncTests.cpp b/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnAsyncTests.cpp index 28fd92b6dfe..bfce4ac359d 100644 --- a/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnAsyncTests.cpp +++ b/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnAsyncTests.cpp @@ -29,14 +29,14 @@ TYPED_TEST(FlowControllerPublishModes, async_publish_mode) async.init(); // Instantiate writers. - eprosima::fastrtps::rtps::RTPSWriter writer1; - eprosima::fastrtps::rtps::RTPSWriter writer2; + eprosima::fastdds::rtps::RTPSWriter writer1; + eprosima::fastdds::rtps::RTPSWriter writer2; // Initialize callback to get info. auto send_functor = [&]( - eprosima::fastrtps::rtps::CacheChange_t* change, - eprosima::fastrtps::rtps::RTPSMessageGroup&, - eprosima::fastrtps::rtps::LocatorSelectorSender&, + eprosima::fastdds::rtps::CacheChange_t* change, + eprosima::fastdds::rtps::RTPSMessageGroup&, + eprosima::fastdds::rtps::LocatorSelectorSender&, const std::chrono::time_point&) { this->last_thread_delivering_sample = std::this_thread::get_id(); @@ -50,16 +50,16 @@ TYPED_TEST(FlowControllerPublishModes, async_publish_mode) // Register writers. async.register_writer(&writer1); - eprosima::fastrtps::rtps::CacheChange_t change_writer1; + eprosima::fastdds::rtps::CacheChange_t change_writer1; INIT_CACHE_CHANGE(change_writer1, writer1, 1); - eprosima::fastrtps::rtps::CacheChange_t change_writer2; + eprosima::fastdds::rtps::CacheChange_t change_writer2; INIT_CACHE_CHANGE(change_writer2, writer2, 1); // Testing add_new_sample. Writer will be able to deliver it. EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_new_sample(&writer1, &change_writer1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -71,10 +71,10 @@ TYPED_TEST(FlowControllerPublishModes, async_publish_mode) // Testing add_new_sample. Writer will not be able to deliver it. auto& fail_call = EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastrtps::rtps::DeliveryRetCode::NOT_DELIVERED)); + WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::NOT_DELIVERED)); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)).After(fail_call). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_new_sample(&writer1, &change_writer1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -86,7 +86,7 @@ TYPED_TEST(FlowControllerPublishModes, async_publish_mode) // Testing add_old_sample. Writer will be able to deliver it. EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_old_sample(&writer1, &change_writer1)); writer1.getMutex().unlock(); @@ -97,8 +97,8 @@ TYPED_TEST(FlowControllerPublishModes, async_publish_mode) // Testing add_old_sample. Writer will not be able to deliver it. EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastrtps::rtps::DeliveryRetCode::NOT_DELIVERED)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::NOT_DELIVERED)). + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_old_sample(&writer1, &change_writer1)); writer1.getMutex().unlock(); @@ -107,59 +107,59 @@ TYPED_TEST(FlowControllerPublishModes, async_publish_mode) this->changes_delivered.clear(); // Testing add_old_sample with a change already enqueued. - change_writer1.writer_info.previous = (eprosima::fastrtps::rtps::CacheChange_t*)1; - change_writer1.writer_info.next = (eprosima::fastrtps::rtps::CacheChange_t*)1; + change_writer1.writer_info.previous = (eprosima::fastdds::rtps::CacheChange_t*)1; + change_writer1.writer_info.next = (eprosima::fastdds::rtps::CacheChange_t*)1; // Send 10 samples using add_new_sample. INIT_CACHE_CHANGE(change_writer1, writer1, 1); INIT_CACHE_CHANGE(change_writer2, writer1, 1); - eprosima::fastrtps::rtps::CacheChange_t change_writer3; + eprosima::fastdds::rtps::CacheChange_t change_writer3; INIT_CACHE_CHANGE(change_writer3, writer1, 1); - eprosima::fastrtps::rtps::CacheChange_t change_writer4; + eprosima::fastdds::rtps::CacheChange_t change_writer4; INIT_CACHE_CHANGE(change_writer4, writer1, 1); - eprosima::fastrtps::rtps::CacheChange_t change_writer5; + eprosima::fastdds::rtps::CacheChange_t change_writer5; INIT_CACHE_CHANGE(change_writer5, writer1, 1); - eprosima::fastrtps::rtps::CacheChange_t change_writer6; + eprosima::fastdds::rtps::CacheChange_t change_writer6; INIT_CACHE_CHANGE(change_writer6, writer1, 1); - eprosima::fastrtps::rtps::CacheChange_t change_writer7; + eprosima::fastdds::rtps::CacheChange_t change_writer7; INIT_CACHE_CHANGE(change_writer7, writer1, 1); - eprosima::fastrtps::rtps::CacheChange_t change_writer8; + eprosima::fastdds::rtps::CacheChange_t change_writer8; INIT_CACHE_CHANGE(change_writer8, writer1, 1); - eprosima::fastrtps::rtps::CacheChange_t change_writer9; + eprosima::fastdds::rtps::CacheChange_t change_writer9; INIT_CACHE_CHANGE(change_writer9, writer1, 1); - eprosima::fastrtps::rtps::CacheChange_t change_writer10; + eprosima::fastdds::rtps::CacheChange_t change_writer10; INIT_CACHE_CHANGE(change_writer10, writer1, 1); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer2, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer3, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer4, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer5, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer6, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer7, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer8, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer9, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer10, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_new_sample(&writer1, &change_writer1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -189,34 +189,34 @@ TYPED_TEST(FlowControllerPublishModes, async_publish_mode) // Send 10 samples using add_old_sample. EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer2, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer3, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer4, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer5, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer6, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer7, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer8, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer9, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer10, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_old_sample(&writer1, &change_writer1)); ASSERT_TRUE(async.add_old_sample(&writer1, &change_writer2)); @@ -236,8 +236,8 @@ TYPED_TEST(FlowControllerPublishModes, async_publish_mode) // Remove changes after add_new_sample. EXPECT_CALL(writer1, deliver_sample_nts(_, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))). - WillRepeatedly(Return(eprosima::fastrtps::rtps::DeliveryRetCode::NOT_DELIVERED)); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))). + WillRepeatedly(Return(eprosima::fastdds::rtps::DeliveryRetCode::NOT_DELIVERED)); writer1.getMutex().lock(); ASSERT_TRUE(async.add_new_sample(&writer1, &change_writer1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -334,8 +334,8 @@ TYPED_TEST(FlowControllerPublishModes, async_publish_mode) // Remove changes after add_old_sample. EXPECT_CALL(writer1, deliver_sample_nts(_, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))). - WillRepeatedly(Return(eprosima::fastrtps::rtps::DeliveryRetCode::NOT_DELIVERED)); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))). + WillRepeatedly(Return(eprosima::fastdds::rtps::DeliveryRetCode::NOT_DELIVERED)); writer1.getMutex().lock(); ASSERT_TRUE(async.add_old_sample(&writer1, &change_writer1)); ASSERT_TRUE(async.add_old_sample(&writer1, &change_writer2)); diff --git a/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnLimitedAsyncTests.cpp b/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnLimitedAsyncTests.cpp index 142312dc358..825daf2170a 100644 --- a/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnLimitedAsyncTests.cpp +++ b/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnLimitedAsyncTests.cpp @@ -24,21 +24,21 @@ using namespace testing; struct FlowControllerLimitedAsyncPublishModeMock : FlowControllerLimitedAsyncPublishMode { FlowControllerLimitedAsyncPublishModeMock( - eprosima::fastrtps::rtps::RTPSParticipantImpl* participant, + eprosima::fastdds::rtps::RTPSParticipantImpl* participant, const FlowControllerDescriptor* descriptor) : FlowControllerLimitedAsyncPublishMode(participant, descriptor) { group_mock = &group; } - static eprosima::fastrtps::rtps::RTPSMessageGroup* get_group() + static eprosima::fastdds::rtps::RTPSMessageGroup* get_group() { return group_mock; } - static eprosima::fastrtps::rtps::RTPSMessageGroup* group_mock; + static eprosima::fastdds::rtps::RTPSMessageGroup* group_mock; }; -eprosima::fastrtps::rtps::RTPSMessageGroup* FlowControllerLimitedAsyncPublishModeMock::group_mock = nullptr; +eprosima::fastdds::rtps::RTPSMessageGroup* FlowControllerLimitedAsyncPublishModeMock::group_mock = nullptr; TYPED_TEST(FlowControllerPublishModes, limited_async_publish_mode) { @@ -50,14 +50,14 @@ TYPED_TEST(FlowControllerPublishModes, limited_async_publish_mode) async.init(); // Instantiate writers. - eprosima::fastrtps::rtps::RTPSWriter writer1; - eprosima::fastrtps::rtps::RTPSWriter writer2; + eprosima::fastdds::rtps::RTPSWriter writer1; + eprosima::fastdds::rtps::RTPSWriter writer2; // Initialize callback to get info. auto send_functor = [&]( - eprosima::fastrtps::rtps::CacheChange_t* change, - eprosima::fastrtps::rtps::RTPSMessageGroup&, - eprosima::fastrtps::rtps::LocatorSelectorSender&, + eprosima::fastdds::rtps::CacheChange_t* change, + eprosima::fastdds::rtps::RTPSMessageGroup&, + eprosima::fastdds::rtps::LocatorSelectorSender&, const std::chrono::time_point&) { this->last_thread_delivering_sample = std::this_thread::get_id(); @@ -75,10 +75,10 @@ TYPED_TEST(FlowControllerPublishModes, limited_async_publish_mode) // Register writers. async.register_writer(&writer1); - eprosima::fastrtps::rtps::CacheChange_t change_writer1; + eprosima::fastdds::rtps::CacheChange_t change_writer1; INIT_CACHE_CHANGE(change_writer1, writer1, 1); - eprosima::fastrtps::rtps::CacheChange_t change_writer2; + eprosima::fastdds::rtps::CacheChange_t change_writer2; INIT_CACHE_CHANGE(change_writer2, writer2, 1); EXPECT_CALL(*FlowControllerLimitedAsyncPublishModeMock::get_group(), @@ -92,7 +92,7 @@ TYPED_TEST(FlowControllerPublishModes, limited_async_publish_mode) 0)); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_new_sample(&writer1, &change_writer1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -104,10 +104,10 @@ TYPED_TEST(FlowControllerPublishModes, limited_async_publish_mode) // Testing add_new_sample. Writer will not be able to deliver it. auto& fail_call = EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastrtps::rtps::DeliveryRetCode::NOT_DELIVERED)); + WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::NOT_DELIVERED)); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)).After(fail_call). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_new_sample(&writer1, &change_writer1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -119,7 +119,7 @@ TYPED_TEST(FlowControllerPublishModes, limited_async_publish_mode) // Testing add_old_sample. Writer will be able to deliver it. EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_old_sample(&writer1, &change_writer1)); writer1.getMutex().unlock(); @@ -130,8 +130,8 @@ TYPED_TEST(FlowControllerPublishModes, limited_async_publish_mode) // Testing add_old_sample. Writer will not be able to deliver it. EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastrtps::rtps::DeliveryRetCode::NOT_DELIVERED)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::NOT_DELIVERED)). + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_old_sample(&writer1, &change_writer1)); writer1.getMutex().unlock(); @@ -140,59 +140,59 @@ TYPED_TEST(FlowControllerPublishModes, limited_async_publish_mode) this->changes_delivered.clear(); // Testing add_old_sample with a change already enqueued. - change_writer1.writer_info.previous = (eprosima::fastrtps::rtps::CacheChange_t*)1; - change_writer1.writer_info.next = (eprosima::fastrtps::rtps::CacheChange_t*)1; + change_writer1.writer_info.previous = (eprosima::fastdds::rtps::CacheChange_t*)1; + change_writer1.writer_info.next = (eprosima::fastdds::rtps::CacheChange_t*)1; // Send 10 samples using add_new_sample. INIT_CACHE_CHANGE(change_writer1, writer1, 1); INIT_CACHE_CHANGE(change_writer2, writer1, 1); - eprosima::fastrtps::rtps::CacheChange_t change_writer3; + eprosima::fastdds::rtps::CacheChange_t change_writer3; INIT_CACHE_CHANGE(change_writer3, writer1, 1); - eprosima::fastrtps::rtps::CacheChange_t change_writer4; + eprosima::fastdds::rtps::CacheChange_t change_writer4; INIT_CACHE_CHANGE(change_writer4, writer1, 1); - eprosima::fastrtps::rtps::CacheChange_t change_writer5; + eprosima::fastdds::rtps::CacheChange_t change_writer5; INIT_CACHE_CHANGE(change_writer5, writer1, 1); - eprosima::fastrtps::rtps::CacheChange_t change_writer6; + eprosima::fastdds::rtps::CacheChange_t change_writer6; INIT_CACHE_CHANGE(change_writer6, writer1, 1); - eprosima::fastrtps::rtps::CacheChange_t change_writer7; + eprosima::fastdds::rtps::CacheChange_t change_writer7; INIT_CACHE_CHANGE(change_writer7, writer1, 1); - eprosima::fastrtps::rtps::CacheChange_t change_writer8; + eprosima::fastdds::rtps::CacheChange_t change_writer8; INIT_CACHE_CHANGE(change_writer8, writer1, 1); - eprosima::fastrtps::rtps::CacheChange_t change_writer9; + eprosima::fastdds::rtps::CacheChange_t change_writer9; INIT_CACHE_CHANGE(change_writer9, writer1, 1); - eprosima::fastrtps::rtps::CacheChange_t change_writer10; + eprosima::fastdds::rtps::CacheChange_t change_writer10; INIT_CACHE_CHANGE(change_writer10, writer1, 1); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer2, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer3, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer4, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer5, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer6, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer7, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer8, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer9, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer10, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_new_sample(&writer1, &change_writer1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -222,34 +222,34 @@ TYPED_TEST(FlowControllerPublishModes, limited_async_publish_mode) // Send 10 samples using add_old_sample. EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer2, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer3, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer4, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer5, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer6, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer7, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer8, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer9, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer10, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_old_sample(&writer1, &change_writer1)); ASSERT_TRUE(async.add_old_sample(&writer1, &change_writer2)); @@ -269,8 +269,8 @@ TYPED_TEST(FlowControllerPublishModes, limited_async_publish_mode) // Remove changes after add_new_sample. EXPECT_CALL(writer1, deliver_sample_nts(_, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))). - WillRepeatedly(Return(eprosima::fastrtps::rtps::DeliveryRetCode::NOT_DELIVERED)); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))). + WillRepeatedly(Return(eprosima::fastdds::rtps::DeliveryRetCode::NOT_DELIVERED)); writer1.getMutex().lock(); ASSERT_TRUE(async.add_new_sample(&writer1, &change_writer1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -367,8 +367,8 @@ TYPED_TEST(FlowControllerPublishModes, limited_async_publish_mode) // Remove changes after add_old_sample. EXPECT_CALL(writer1, deliver_sample_nts(_, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))). - WillRepeatedly(Return(eprosima::fastrtps::rtps::DeliveryRetCode::NOT_DELIVERED)); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))). + WillRepeatedly(Return(eprosima::fastdds::rtps::DeliveryRetCode::NOT_DELIVERED)); writer1.getMutex().lock(); ASSERT_TRUE(async.add_old_sample(&writer1, &change_writer1)); ASSERT_TRUE(async.add_old_sample(&writer1, &change_writer2)); @@ -455,44 +455,44 @@ TYPED_TEST(FlowControllerPublishModes, limited_async_publish_mode) // Sending 10 samples applying limitations with add_new_sample. EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastrtps::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer2, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastrtps::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer3, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastrtps::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer4, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastrtps::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer5, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastrtps::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer6, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastrtps::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer7, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastrtps::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer8, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastrtps::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer9, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastrtps::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer10, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastrtps::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(*FlowControllerLimitedAsyncPublishModeMock::get_group(), get_current_bytes_processed()). WillOnce(Return(10100)). @@ -554,44 +554,44 @@ TYPED_TEST(FlowControllerPublishModes, limited_async_publish_mode) // Sending 10 samples applying limitations with add_old_sample. EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastrtps::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer2, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastrtps::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer3, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastrtps::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer4, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastrtps::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer5, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastrtps::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer6, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastrtps::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer7, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastrtps::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer8, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastrtps::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer9, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastrtps::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer10, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastrtps::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::EXCEEDED_LIMIT)). + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(*FlowControllerLimitedAsyncPublishModeMock::get_group(), get_current_bytes_processed()). WillOnce(Return(10100)). diff --git a/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnPureSyncTests.cpp b/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnPureSyncTests.cpp index 47da5d32eb6..8712ab1ba8f 100644 --- a/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnPureSyncTests.cpp +++ b/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnPureSyncTests.cpp @@ -30,9 +30,9 @@ TYPED_TEST(FlowControllerPublishModes, pure_sync_publish_mode) // Initialize callback to get info. auto send_functor = [&]( - eprosima::fastrtps::rtps::CacheChange_t*, - eprosima::fastrtps::rtps::RTPSMessageGroup&, - eprosima::fastrtps::rtps::LocatorSelectorSender&, + eprosima::fastdds::rtps::CacheChange_t*, + eprosima::fastdds::rtps::RTPSMessageGroup&, + eprosima::fastdds::rtps::LocatorSelectorSender&, const std::chrono::time_point&) { this->last_thread_delivering_sample = std::this_thread::get_id(); @@ -40,22 +40,22 @@ TYPED_TEST(FlowControllerPublishModes, pure_sync_publish_mode) // Instantiate writers. - eprosima::fastrtps::rtps::RTPSWriter writer1; - eprosima::fastrtps::rtps::RTPSWriter writer2; + eprosima::fastdds::rtps::RTPSWriter writer1; + eprosima::fastdds::rtps::RTPSWriter writer2; // Register writers. pure_sync.register_writer(&writer1); - eprosima::fastrtps::rtps::CacheChange_t change_writer1; + eprosima::fastdds::rtps::CacheChange_t change_writer1; INIT_CACHE_CHANGE(change_writer1, writer1, 1); - eprosima::fastrtps::rtps::CacheChange_t change_writer2; + eprosima::fastdds::rtps::CacheChange_t change_writer2; INIT_CACHE_CHANGE(change_writer2, writer2, 1); // Testing add_new_sample. Writer will be able to deliver it. EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.general_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(pure_sync.add_new_sample(&writer1, &change_writer1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -64,7 +64,7 @@ TYPED_TEST(FlowControllerPublishModes, pure_sync_publish_mode) EXPECT_CALL(writer2, deliver_sample_nts(&change_writer2, _, Ref(writer2.general_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); writer2.getMutex().lock(); ASSERT_TRUE(pure_sync.add_new_sample(&writer2, &change_writer2, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -74,7 +74,7 @@ TYPED_TEST(FlowControllerPublishModes, pure_sync_publish_mode) // Testing add_new_sample. Writer will not be able to deliver it. EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.general_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::NOT_DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::NOT_DELIVERED))); writer1.getMutex().lock(); ASSERT_FALSE(pure_sync.add_new_sample(&writer1, &change_writer1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -83,7 +83,7 @@ TYPED_TEST(FlowControllerPublishModes, pure_sync_publish_mode) EXPECT_CALL(writer2, deliver_sample_nts(&change_writer2, _, Ref(writer2.general_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::NOT_DELIVERED))); + WillOnce(DoAll(send_functor, Return(eprosima::fastdds::rtps::DeliveryRetCode::NOT_DELIVERED))); writer2.getMutex().lock(); ASSERT_FALSE(pure_sync.add_new_sample(&writer2, &change_writer2, std::chrono::steady_clock::now() + std::chrono::hours(24))); diff --git a/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnSyncTests.cpp b/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnSyncTests.cpp index e2674ed80d3..f6d189e989f 100644 --- a/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnSyncTests.cpp +++ b/test/unittest/rtps/flowcontrol/FlowControllerPublishModesOnSyncTests.cpp @@ -29,14 +29,14 @@ TYPED_TEST(FlowControllerPublishModes, sync_publish_mode) sync.init(); // Instantiate writers. - eprosima::fastrtps::rtps::RTPSWriter writer1; - eprosima::fastrtps::rtps::RTPSWriter writer2; + eprosima::fastdds::rtps::RTPSWriter writer1; + eprosima::fastdds::rtps::RTPSWriter writer2; // Initialize callback to get info. auto send_functor_adding = [&]( - eprosima::fastrtps::rtps::CacheChange_t* change, - eprosima::fastrtps::rtps::RTPSMessageGroup&, - eprosima::fastrtps::rtps::LocatorSelectorSender&, + eprosima::fastdds::rtps::CacheChange_t* change, + eprosima::fastdds::rtps::RTPSMessageGroup&, + eprosima::fastdds::rtps::LocatorSelectorSender&, const std::chrono::time_point&) { this->last_thread_delivering_sample = std::this_thread::get_id(); @@ -47,9 +47,9 @@ TYPED_TEST(FlowControllerPublishModes, sync_publish_mode) this->number_changes_delivered_cv.notify_one(); }; auto send_functor_not_adding = [&]( - eprosima::fastrtps::rtps::CacheChange_t*, - eprosima::fastrtps::rtps::RTPSMessageGroup&, - eprosima::fastrtps::rtps::LocatorSelectorSender&, + eprosima::fastdds::rtps::CacheChange_t*, + eprosima::fastdds::rtps::RTPSMessageGroup&, + eprosima::fastdds::rtps::LocatorSelectorSender&, const std::chrono::time_point&) { this->last_thread_delivering_sample = std::this_thread::get_id(); @@ -58,16 +58,16 @@ TYPED_TEST(FlowControllerPublishModes, sync_publish_mode) // Register writers. sync.register_writer(&writer1); - eprosima::fastrtps::rtps::CacheChange_t change_writer1; + eprosima::fastdds::rtps::CacheChange_t change_writer1; INIT_CACHE_CHANGE(change_writer1, writer1, 1); - eprosima::fastrtps::rtps::CacheChange_t change_writer2; + eprosima::fastdds::rtps::CacheChange_t change_writer2; INIT_CACHE_CHANGE(change_writer2, writer2, 1); // Testing add_new_sample. Writer will be able to deliver it. EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.general_locator_selector_), _)). - WillOnce(DoAll(send_functor_not_adding, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor_not_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(sync.add_new_sample(&writer1, &change_writer1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -76,7 +76,7 @@ TYPED_TEST(FlowControllerPublishModes, sync_publish_mode) EXPECT_CALL(writer2, deliver_sample_nts(&change_writer2, _, Ref(writer2.general_locator_selector_), _)). - WillOnce(DoAll(send_functor_not_adding, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor_not_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); writer2.getMutex().lock(); ASSERT_TRUE(sync.add_new_sample(&writer2, &change_writer2, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -86,10 +86,10 @@ TYPED_TEST(FlowControllerPublishModes, sync_publish_mode) // Testing add_new_sample. Writer will not be able to deliver it. auto& fail_call = EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.general_locator_selector_), _)). - WillOnce(Return(eprosima::fastrtps::rtps::DeliveryRetCode::NOT_DELIVERED)); + WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::NOT_DELIVERED)); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)).After(fail_call). - WillOnce(DoAll(send_functor_adding, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(sync.add_new_sample(&writer1, &change_writer1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -101,7 +101,7 @@ TYPED_TEST(FlowControllerPublishModes, sync_publish_mode) // Testing add_old_sample. Writer will be able to deliver it. EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor_adding, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(sync.add_old_sample(&writer1, &change_writer1)); writer1.getMutex().unlock(); @@ -112,8 +112,8 @@ TYPED_TEST(FlowControllerPublishModes, sync_publish_mode) // Testing add_old_sample. Writer will not be able to deliver it. EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(Return(eprosima::fastrtps::rtps::DeliveryRetCode::NOT_DELIVERED)). - WillOnce(DoAll(send_functor_adding, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(Return(eprosima::fastdds::rtps::DeliveryRetCode::NOT_DELIVERED)). + WillOnce(DoAll(send_functor_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(sync.add_old_sample(&writer1, &change_writer1)); writer1.getMutex().unlock(); @@ -122,59 +122,59 @@ TYPED_TEST(FlowControllerPublishModes, sync_publish_mode) this->changes_delivered.clear(); // Testing add_old_sample with a change already enqueued. - change_writer1.writer_info.previous = (eprosima::fastrtps::rtps::CacheChange_t*)1; - change_writer1.writer_info.next = (eprosima::fastrtps::rtps::CacheChange_t*)1; + change_writer1.writer_info.previous = (eprosima::fastdds::rtps::CacheChange_t*)1; + change_writer1.writer_info.next = (eprosima::fastdds::rtps::CacheChange_t*)1; // Send 10 samples using add_old_sample. INIT_CACHE_CHANGE(change_writer1, writer1, 1); INIT_CACHE_CHANGE(change_writer2, writer1, 1); - eprosima::fastrtps::rtps::CacheChange_t change_writer3; + eprosima::fastdds::rtps::CacheChange_t change_writer3; INIT_CACHE_CHANGE(change_writer3, writer1, 1); - eprosima::fastrtps::rtps::CacheChange_t change_writer4; + eprosima::fastdds::rtps::CacheChange_t change_writer4; INIT_CACHE_CHANGE(change_writer4, writer1, 1); - eprosima::fastrtps::rtps::CacheChange_t change_writer5; + eprosima::fastdds::rtps::CacheChange_t change_writer5; INIT_CACHE_CHANGE(change_writer5, writer1, 1); - eprosima::fastrtps::rtps::CacheChange_t change_writer6; + eprosima::fastdds::rtps::CacheChange_t change_writer6; INIT_CACHE_CHANGE(change_writer6, writer1, 1); - eprosima::fastrtps::rtps::CacheChange_t change_writer7; + eprosima::fastdds::rtps::CacheChange_t change_writer7; INIT_CACHE_CHANGE(change_writer7, writer1, 1); - eprosima::fastrtps::rtps::CacheChange_t change_writer8; + eprosima::fastdds::rtps::CacheChange_t change_writer8; INIT_CACHE_CHANGE(change_writer8, writer1, 1); - eprosima::fastrtps::rtps::CacheChange_t change_writer9; + eprosima::fastdds::rtps::CacheChange_t change_writer9; INIT_CACHE_CHANGE(change_writer9, writer1, 1); - eprosima::fastrtps::rtps::CacheChange_t change_writer10; + eprosima::fastdds::rtps::CacheChange_t change_writer10; INIT_CACHE_CHANGE(change_writer10, writer1, 1); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor_adding, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer2, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor_adding, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer3, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor_adding, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer4, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor_adding, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer5, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor_adding, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer6, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor_adding, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer7, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor_adding, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer8, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor_adding, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer9, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor_adding, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer1, deliver_sample_nts(&change_writer10, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor_adding, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(sync.add_old_sample(&writer1, &change_writer1)); ASSERT_TRUE(sync.add_old_sample(&writer1, &change_writer2)); @@ -194,8 +194,8 @@ TYPED_TEST(FlowControllerPublishModes, sync_publish_mode) // Remove changes EXPECT_CALL(writer1, deliver_sample_nts(_, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor_adding, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))). - WillRepeatedly(Return(eprosima::fastrtps::rtps::DeliveryRetCode::NOT_DELIVERED)); + WillOnce(DoAll(send_functor_adding, Return(eprosima::fastdds::rtps::DeliveryRetCode::DELIVERED))). + WillRepeatedly(Return(eprosima::fastdds::rtps::DeliveryRetCode::NOT_DELIVERED)); writer1.getMutex().lock(); ASSERT_TRUE(sync.add_old_sample(&writer1, &change_writer1)); ASSERT_TRUE(sync.add_old_sample(&writer1, &change_writer2)); diff --git a/test/unittest/rtps/flowcontrol/FlowControllerPublishModesTests.cpp b/test/unittest/rtps/flowcontrol/FlowControllerPublishModesTests.cpp index e418f11a552..2a3cca736f3 100644 --- a/test/unittest/rtps/flowcontrol/FlowControllerPublishModesTests.cpp +++ b/test/unittest/rtps/flowcontrol/FlowControllerPublishModesTests.cpp @@ -3,7 +3,7 @@ using namespace testing; namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { std::ostream& operator <<( @@ -21,7 +21,7 @@ std::ostream& operator <<( } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima int main( diff --git a/test/unittest/rtps/flowcontrol/FlowControllerPublishModesTests.hpp b/test/unittest/rtps/flowcontrol/FlowControllerPublishModesTests.hpp index 1ccb38f5558..d08861c5a93 100644 --- a/test/unittest/rtps/flowcontrol/FlowControllerPublishModesTests.hpp +++ b/test/unittest/rtps/flowcontrol/FlowControllerPublishModesTests.hpp @@ -7,7 +7,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { std::ostream& operator <<( @@ -18,7 +18,7 @@ std::ostream& operator <<( const CacheChange_t* change); } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima template @@ -44,7 +44,7 @@ class FlowControllerPublishModes : public testing::Test std::thread::id last_thread_delivering_sample; - std::vector changes_delivered; + std::vector changes_delivered; std::mutex changes_delivered_mutex; diff --git a/test/unittest/rtps/flowcontrol/FlowControllerSchedulersTests.cpp b/test/unittest/rtps/flowcontrol/FlowControllerSchedulersTests.cpp index c356ad75d11..d0d047369b4 100644 --- a/test/unittest/rtps/flowcontrol/FlowControllerSchedulersTests.cpp +++ b/test/unittest/rtps/flowcontrol/FlowControllerSchedulersTests.cpp @@ -22,7 +22,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { std::ostream& operator <<( std::ostream& output, @@ -38,31 +38,26 @@ std::ostream& operator <<( return output << "change_writer" << uint16_t(change->writerGUID.entityId.value[3]) << "_" << change->sequenceNumber; } -} // namespace rtps -} // namespace fastrtps -} // namespace eprosima - -using namespace eprosima::fastdds::rtps; using namespace testing; struct FlowControllerLimitedAsyncPublishModeMock : FlowControllerLimitedAsyncPublishMode { FlowControllerLimitedAsyncPublishModeMock( - eprosima::fastrtps::rtps::RTPSParticipantImpl* participant, + RTPSParticipantImpl* participant, const FlowControllerDescriptor* descriptor) : FlowControllerLimitedAsyncPublishMode(participant, descriptor) { group_mock = &group; } - static eprosima::fastrtps::rtps::RTPSMessageGroup* get_group() + static RTPSMessageGroup* get_group() { return group_mock; } - static eprosima::fastrtps::rtps::RTPSMessageGroup* group_mock; + static RTPSMessageGroup* group_mock; }; -eprosima::fastrtps::rtps::RTPSMessageGroup* FlowControllerLimitedAsyncPublishModeMock::group_mock = nullptr; +RTPSMessageGroup* FlowControllerLimitedAsyncPublishModeMock::group_mock = nullptr; class FlowControllerSchedulers : public testing::Test { @@ -84,7 +79,7 @@ class FlowControllerSchedulers : public testing::Test }); } - std::vector changes_delivered; + std::vector changes_delivered; std::mutex changes_delivered_mutex; @@ -112,22 +107,22 @@ TEST_F(FlowControllerSchedulers, Fifo) async.init(); // Instantiate writers. - eprosima::fastrtps::rtps::RTPSWriter writer1; - eprosima::fastrtps::rtps::RTPSWriter writer2; - eprosima::fastrtps::rtps::RTPSWriter writer3; - eprosima::fastrtps::rtps::RTPSWriter writer4; - eprosima::fastrtps::rtps::RTPSWriter writer5; - eprosima::fastrtps::rtps::RTPSWriter writer6; - eprosima::fastrtps::rtps::RTPSWriter writer7; - eprosima::fastrtps::rtps::RTPSWriter writer8; - eprosima::fastrtps::rtps::RTPSWriter writer9; - eprosima::fastrtps::rtps::RTPSWriter writer10; + RTPSWriter writer1; + RTPSWriter writer2; + RTPSWriter writer3; + RTPSWriter writer4; + RTPSWriter writer5; + RTPSWriter writer6; + RTPSWriter writer7; + RTPSWriter writer8; + RTPSWriter writer9; + RTPSWriter writer10; // Initialize callback to get info. auto send_functor = [&]( - eprosima::fastrtps::rtps::CacheChange_t* change, - eprosima::fastrtps::rtps::RTPSMessageGroup&, - eprosima::fastrtps::rtps::LocatorSelectorSender&, + CacheChange_t* change, + RTPSMessageGroup&, + LocatorSelectorSender&, const std::chrono::time_point&) { this->current_bytes_processed += change->serializedPayload.length; @@ -150,63 +145,63 @@ TEST_F(FlowControllerSchedulers, Fifo) async.register_writer(&writer9); async.register_writer(&writer10); - eprosima::fastrtps::rtps::CacheChange_t change_writer1_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer1_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer1_3; + CacheChange_t change_writer1_1; + CacheChange_t change_writer1_2; + CacheChange_t change_writer1_3; INIT_CACHE_CHANGE(change_writer1_1, writer1, 1); INIT_CACHE_CHANGE(change_writer1_2, writer1, 2); INIT_CACHE_CHANGE(change_writer1_3, writer1, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer2_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer2_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer2_3; + CacheChange_t change_writer2_1; + CacheChange_t change_writer2_2; + CacheChange_t change_writer2_3; INIT_CACHE_CHANGE(change_writer2_1, writer2, 1); INIT_CACHE_CHANGE(change_writer2_2, writer2, 2); INIT_CACHE_CHANGE(change_writer2_3, writer2, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer3_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer3_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer3_3; + CacheChange_t change_writer3_1; + CacheChange_t change_writer3_2; + CacheChange_t change_writer3_3; INIT_CACHE_CHANGE(change_writer3_1, writer3, 1); INIT_CACHE_CHANGE(change_writer3_2, writer3, 2); INIT_CACHE_CHANGE(change_writer3_3, writer3, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer4_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer4_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer4_3; + CacheChange_t change_writer4_1; + CacheChange_t change_writer4_2; + CacheChange_t change_writer4_3; INIT_CACHE_CHANGE(change_writer4_1, writer4, 1); INIT_CACHE_CHANGE(change_writer4_2, writer4, 2); INIT_CACHE_CHANGE(change_writer4_3, writer4, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer5_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer5_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer5_3; + CacheChange_t change_writer5_1; + CacheChange_t change_writer5_2; + CacheChange_t change_writer5_3; INIT_CACHE_CHANGE(change_writer5_1, writer5, 1); INIT_CACHE_CHANGE(change_writer5_2, writer5, 2); INIT_CACHE_CHANGE(change_writer5_3, writer5, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer6_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer6_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer6_3; + CacheChange_t change_writer6_1; + CacheChange_t change_writer6_2; + CacheChange_t change_writer6_3; INIT_CACHE_CHANGE(change_writer6_1, writer6, 1); INIT_CACHE_CHANGE(change_writer6_2, writer6, 2); INIT_CACHE_CHANGE(change_writer6_3, writer6, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer7_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer7_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer7_3; + CacheChange_t change_writer7_1; + CacheChange_t change_writer7_2; + CacheChange_t change_writer7_3; INIT_CACHE_CHANGE(change_writer7_1, writer7, 1); INIT_CACHE_CHANGE(change_writer7_2, writer7, 2); INIT_CACHE_CHANGE(change_writer7_3, writer7, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer8_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer8_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer8_3; + CacheChange_t change_writer8_1; + CacheChange_t change_writer8_2; + CacheChange_t change_writer8_3; INIT_CACHE_CHANGE(change_writer8_1, writer8, 1); INIT_CACHE_CHANGE(change_writer8_2, writer8, 2); INIT_CACHE_CHANGE(change_writer8_3, writer8, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer9_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer9_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer9_3; + CacheChange_t change_writer9_1; + CacheChange_t change_writer9_2; + CacheChange_t change_writer9_3; INIT_CACHE_CHANGE(change_writer9_1, writer9, 1); INIT_CACHE_CHANGE(change_writer9_2, writer9, 2); INIT_CACHE_CHANGE(change_writer9_3, writer9, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer10_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer10_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer10_3; + CacheChange_t change_writer10_1; + CacheChange_t change_writer10_2; + CacheChange_t change_writer10_3; INIT_CACHE_CHANGE(change_writer10_1, writer10, 1); INIT_CACHE_CHANGE(change_writer10_2, writer10, 2); INIT_CACHE_CHANGE(change_writer10_3, writer10, 3); @@ -228,123 +223,123 @@ TEST_F(FlowControllerSchedulers, Fifo) }); auto& call_change_writer1_1 = EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1_1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer1_2 = EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1_2, _, Ref(writer1.async_locator_selector_), _)). After(call_change_writer1_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer1_3 = EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1_3, _, Ref(writer1.async_locator_selector_), _)). After(call_change_writer1_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer2_1 = EXPECT_CALL(writer2, deliver_sample_nts(&change_writer2_1, _, Ref(writer2.async_locator_selector_), _)). After(call_change_writer1_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer2_2 = EXPECT_CALL(writer2, deliver_sample_nts(&change_writer2_2, _, Ref(writer2.async_locator_selector_), _)). After(call_change_writer2_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer2_3 = EXPECT_CALL(writer2, deliver_sample_nts(&change_writer2_3, _, Ref(writer2.async_locator_selector_), _)). After(call_change_writer2_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer3_1 = EXPECT_CALL(writer3, deliver_sample_nts(&change_writer3_1, _, Ref(writer3.async_locator_selector_), _)). After(call_change_writer2_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer3_2 = EXPECT_CALL(writer3, deliver_sample_nts(&change_writer3_2, _, Ref(writer3.async_locator_selector_), _)). After(call_change_writer3_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer3_3 = EXPECT_CALL(writer3, deliver_sample_nts(&change_writer3_3, _, Ref(writer3.async_locator_selector_), _)). After(call_change_writer3_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer4_1 = EXPECT_CALL(writer4, deliver_sample_nts(&change_writer4_1, _, Ref(writer4.async_locator_selector_), _)). After(call_change_writer3_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer4_2 = EXPECT_CALL(writer4, deliver_sample_nts(&change_writer4_2, _, Ref(writer4.async_locator_selector_), _)). After(call_change_writer4_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer4_3 = EXPECT_CALL(writer4, deliver_sample_nts(&change_writer4_3, _, Ref(writer4.async_locator_selector_), _)). After(call_change_writer4_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer5_1 = EXPECT_CALL(writer5, deliver_sample_nts(&change_writer5_1, _, Ref(writer5.async_locator_selector_), _)). After(call_change_writer4_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer5_2 = EXPECT_CALL(writer5, deliver_sample_nts(&change_writer5_2, _, Ref(writer5.async_locator_selector_), _)). After(call_change_writer5_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer5_3 = EXPECT_CALL(writer5, deliver_sample_nts(&change_writer5_3, _, Ref(writer5.async_locator_selector_), _)). After(call_change_writer5_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer6_1 = EXPECT_CALL(writer6, deliver_sample_nts(&change_writer6_1, _, Ref(writer6.async_locator_selector_), _)). After(call_change_writer5_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer6_2 = EXPECT_CALL(writer6, deliver_sample_nts(&change_writer6_2, _, Ref(writer6.async_locator_selector_), _)). After(call_change_writer6_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer6_3 = EXPECT_CALL(writer6, deliver_sample_nts(&change_writer6_3, _, Ref(writer6.async_locator_selector_), _)). After(call_change_writer6_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer7_1 = EXPECT_CALL(writer7, deliver_sample_nts(&change_writer7_1, _, Ref(writer7.async_locator_selector_), _)). After(call_change_writer6_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer7_2 = EXPECT_CALL(writer7, deliver_sample_nts(&change_writer7_2, _, Ref(writer7.async_locator_selector_), _)). After(call_change_writer7_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer7_3 = EXPECT_CALL(writer7, deliver_sample_nts(&change_writer7_3, _, Ref(writer7.async_locator_selector_), _)). After(call_change_writer7_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer8_1 = EXPECT_CALL(writer8, deliver_sample_nts(&change_writer8_1, _, Ref(writer8.async_locator_selector_), _)). After(call_change_writer7_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer8_2 = EXPECT_CALL(writer8, deliver_sample_nts(&change_writer8_2, _, Ref(writer8.async_locator_selector_), _)). After(call_change_writer8_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer8_3 = EXPECT_CALL(writer8, deliver_sample_nts(&change_writer8_3, _, Ref(writer8.async_locator_selector_), _)). After(call_change_writer8_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer9_1 = EXPECT_CALL(writer9, deliver_sample_nts(&change_writer9_1, _, Ref(writer9.async_locator_selector_), _)). After(call_change_writer8_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer9_2 = EXPECT_CALL(writer9, deliver_sample_nts(&change_writer9_2, _, Ref(writer9.async_locator_selector_), _)). After(call_change_writer9_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer9_3 = EXPECT_CALL(writer9, deliver_sample_nts(&change_writer9_3, _, Ref(writer9.async_locator_selector_), _)). After(call_change_writer9_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer10_1 = EXPECT_CALL(writer10, deliver_sample_nts(&change_writer10_1, _, Ref(writer10.async_locator_selector_), _)). After(call_change_writer9_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer10_2 = EXPECT_CALL(writer10, deliver_sample_nts(&change_writer10_2, _, Ref(writer10.async_locator_selector_), _)). After(call_change_writer10_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer10, deliver_sample_nts(&change_writer10_3, _, Ref(writer10.async_locator_selector_), _)). After(call_change_writer10_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_new_sample(&writer1, &change_writer1_1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -447,123 +442,123 @@ TEST_F(FlowControllerSchedulers, Fifo) }); auto& call_change_writer1_1 = EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1_1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer2_1 = EXPECT_CALL(writer2, deliver_sample_nts(&change_writer2_1, _, Ref(writer2.async_locator_selector_), _)). After(call_change_writer1_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer3_1 = EXPECT_CALL(writer3, deliver_sample_nts(&change_writer3_1, _, Ref(writer3.async_locator_selector_), _)). After(call_change_writer2_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer4_1 = EXPECT_CALL(writer4, deliver_sample_nts(&change_writer4_1, _, Ref(writer4.async_locator_selector_), _)). After(call_change_writer3_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer5_1 = EXPECT_CALL(writer5, deliver_sample_nts(&change_writer5_1, _, Ref(writer5.async_locator_selector_), _)). After(call_change_writer4_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer6_1 = EXPECT_CALL(writer6, deliver_sample_nts(&change_writer6_1, _, Ref(writer6.async_locator_selector_), _)). After(call_change_writer5_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer7_1 = EXPECT_CALL(writer7, deliver_sample_nts(&change_writer7_1, _, Ref(writer7.async_locator_selector_), _)). After(call_change_writer6_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer8_1 = EXPECT_CALL(writer8, deliver_sample_nts(&change_writer8_1, _, Ref(writer8.async_locator_selector_), _)). After(call_change_writer7_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer9_1 = EXPECT_CALL(writer9, deliver_sample_nts(&change_writer9_1, _, Ref(writer9.async_locator_selector_), _)). After(call_change_writer8_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer10_1 = EXPECT_CALL(writer10, deliver_sample_nts(&change_writer10_1, _, Ref(writer10.async_locator_selector_), _)). After(call_change_writer9_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer1_2 = EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1_2, _, Ref(writer1.async_locator_selector_), _)). After(call_change_writer10_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer2_2 = EXPECT_CALL(writer2, deliver_sample_nts(&change_writer2_2, _, Ref(writer2.async_locator_selector_), _)). After(call_change_writer1_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer3_2 = EXPECT_CALL(writer3, deliver_sample_nts(&change_writer3_2, _, Ref(writer3.async_locator_selector_), _)). After(call_change_writer2_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer4_2 = EXPECT_CALL(writer4, deliver_sample_nts(&change_writer4_2, _, Ref(writer4.async_locator_selector_), _)). After(call_change_writer3_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer5_2 = EXPECT_CALL(writer5, deliver_sample_nts(&change_writer5_2, _, Ref(writer5.async_locator_selector_), _)). After(call_change_writer4_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer6_2 = EXPECT_CALL(writer6, deliver_sample_nts(&change_writer6_2, _, Ref(writer6.async_locator_selector_), _)). After(call_change_writer5_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer7_2 = EXPECT_CALL(writer7, deliver_sample_nts(&change_writer7_2, _, Ref(writer7.async_locator_selector_), _)). After(call_change_writer6_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer8_2 = EXPECT_CALL(writer8, deliver_sample_nts(&change_writer8_2, _, Ref(writer8.async_locator_selector_), _)). After(call_change_writer7_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer9_2 = EXPECT_CALL(writer9, deliver_sample_nts(&change_writer9_2, _, Ref(writer9.async_locator_selector_), _)). After(call_change_writer8_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer10_2 = EXPECT_CALL(writer10, deliver_sample_nts(&change_writer10_2, _, Ref(writer10.async_locator_selector_), _)). After(call_change_writer9_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer1_3 = EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1_3, _, Ref(writer1.async_locator_selector_), _)). After(call_change_writer10_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer2_3 = EXPECT_CALL(writer2, deliver_sample_nts(&change_writer2_3, _, Ref(writer2.async_locator_selector_), _)). After(call_change_writer1_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer3_3 = EXPECT_CALL(writer3, deliver_sample_nts(&change_writer3_3, _, Ref(writer3.async_locator_selector_), _)). After(call_change_writer2_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer4_3 = EXPECT_CALL(writer4, deliver_sample_nts(&change_writer4_3, _, Ref(writer4.async_locator_selector_), _)). After(call_change_writer3_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer5_3 = EXPECT_CALL(writer5, deliver_sample_nts(&change_writer5_3, _, Ref(writer5.async_locator_selector_), _)). After(call_change_writer4_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer6_3 = EXPECT_CALL(writer6, deliver_sample_nts(&change_writer6_3, _, Ref(writer6.async_locator_selector_), _)). After(call_change_writer5_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer7_3 = EXPECT_CALL(writer7, deliver_sample_nts(&change_writer7_3, _, Ref(writer7.async_locator_selector_), _)). After(call_change_writer6_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer8_3 = EXPECT_CALL(writer8, deliver_sample_nts(&change_writer8_3, _, Ref(writer8.async_locator_selector_), _)). After(call_change_writer7_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer9_3 = EXPECT_CALL(writer9, deliver_sample_nts(&change_writer9_3, _, Ref(writer9.async_locator_selector_), _)). After(call_change_writer8_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer10, deliver_sample_nts(&change_writer10_3, _, Ref(writer10.async_locator_selector_), _)). After(call_change_writer9_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_new_sample(&writer1, &change_writer1_1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -713,22 +708,22 @@ TEST_F(FlowControllerSchedulers, RoundRobin) async.init(); // Instantiate writers. - eprosima::fastrtps::rtps::RTPSWriter writer1; - eprosima::fastrtps::rtps::RTPSWriter writer2; - eprosima::fastrtps::rtps::RTPSWriter writer3; - eprosima::fastrtps::rtps::RTPSWriter writer4; - eprosima::fastrtps::rtps::RTPSWriter writer5; - eprosima::fastrtps::rtps::RTPSWriter writer6; - eprosima::fastrtps::rtps::RTPSWriter writer7; - eprosima::fastrtps::rtps::RTPSWriter writer8; - eprosima::fastrtps::rtps::RTPSWriter writer9; - eprosima::fastrtps::rtps::RTPSWriter writer10; + RTPSWriter writer1; + RTPSWriter writer2; + RTPSWriter writer3; + RTPSWriter writer4; + RTPSWriter writer5; + RTPSWriter writer6; + RTPSWriter writer7; + RTPSWriter writer8; + RTPSWriter writer9; + RTPSWriter writer10; // Initialize callback to get info. auto send_functor = [&]( - eprosima::fastrtps::rtps::CacheChange_t* change, - eprosima::fastrtps::rtps::RTPSMessageGroup&, - eprosima::fastrtps::rtps::LocatorSelectorSender&, + CacheChange_t* change, + RTPSMessageGroup&, + LocatorSelectorSender&, const std::chrono::time_point&) { this->current_bytes_processed += change->serializedPayload.length; @@ -751,63 +746,63 @@ TEST_F(FlowControllerSchedulers, RoundRobin) async.register_writer(&writer9); async.register_writer(&writer10); - eprosima::fastrtps::rtps::CacheChange_t change_writer1_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer1_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer1_3; + CacheChange_t change_writer1_1; + CacheChange_t change_writer1_2; + CacheChange_t change_writer1_3; INIT_CACHE_CHANGE(change_writer1_1, writer1, 1); INIT_CACHE_CHANGE(change_writer1_2, writer1, 2); INIT_CACHE_CHANGE(change_writer1_3, writer1, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer2_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer2_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer2_3; + CacheChange_t change_writer2_1; + CacheChange_t change_writer2_2; + CacheChange_t change_writer2_3; INIT_CACHE_CHANGE(change_writer2_1, writer2, 1); INIT_CACHE_CHANGE(change_writer2_2, writer2, 2); INIT_CACHE_CHANGE(change_writer2_3, writer2, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer3_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer3_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer3_3; + CacheChange_t change_writer3_1; + CacheChange_t change_writer3_2; + CacheChange_t change_writer3_3; INIT_CACHE_CHANGE(change_writer3_1, writer3, 1); INIT_CACHE_CHANGE(change_writer3_2, writer3, 2); INIT_CACHE_CHANGE(change_writer3_3, writer3, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer4_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer4_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer4_3; + CacheChange_t change_writer4_1; + CacheChange_t change_writer4_2; + CacheChange_t change_writer4_3; INIT_CACHE_CHANGE(change_writer4_1, writer4, 1); INIT_CACHE_CHANGE(change_writer4_2, writer4, 2); INIT_CACHE_CHANGE(change_writer4_3, writer4, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer5_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer5_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer5_3; + CacheChange_t change_writer5_1; + CacheChange_t change_writer5_2; + CacheChange_t change_writer5_3; INIT_CACHE_CHANGE(change_writer5_1, writer5, 1); INIT_CACHE_CHANGE(change_writer5_2, writer5, 2); INIT_CACHE_CHANGE(change_writer5_3, writer5, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer6_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer6_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer6_3; + CacheChange_t change_writer6_1; + CacheChange_t change_writer6_2; + CacheChange_t change_writer6_3; INIT_CACHE_CHANGE(change_writer6_1, writer6, 1); INIT_CACHE_CHANGE(change_writer6_2, writer6, 2); INIT_CACHE_CHANGE(change_writer6_3, writer6, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer7_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer7_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer7_3; + CacheChange_t change_writer7_1; + CacheChange_t change_writer7_2; + CacheChange_t change_writer7_3; INIT_CACHE_CHANGE(change_writer7_1, writer7, 1); INIT_CACHE_CHANGE(change_writer7_2, writer7, 2); INIT_CACHE_CHANGE(change_writer7_3, writer7, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer8_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer8_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer8_3; + CacheChange_t change_writer8_1; + CacheChange_t change_writer8_2; + CacheChange_t change_writer8_3; INIT_CACHE_CHANGE(change_writer8_1, writer8, 1); INIT_CACHE_CHANGE(change_writer8_2, writer8, 2); INIT_CACHE_CHANGE(change_writer8_3, writer8, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer9_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer9_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer9_3; + CacheChange_t change_writer9_1; + CacheChange_t change_writer9_2; + CacheChange_t change_writer9_3; INIT_CACHE_CHANGE(change_writer9_1, writer9, 1); INIT_CACHE_CHANGE(change_writer9_2, writer9, 2); INIT_CACHE_CHANGE(change_writer9_3, writer9, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer10_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer10_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer10_3; + CacheChange_t change_writer10_1; + CacheChange_t change_writer10_2; + CacheChange_t change_writer10_3; INIT_CACHE_CHANGE(change_writer10_1, writer10, 1); INIT_CACHE_CHANGE(change_writer10_2, writer10, 2); INIT_CACHE_CHANGE(change_writer10_3, writer10, 3); @@ -829,123 +824,123 @@ TEST_F(FlowControllerSchedulers, RoundRobin) }); auto& call_change_writer1_1 = EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1_1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer2_1 = EXPECT_CALL(writer2, deliver_sample_nts(&change_writer2_1, _, Ref(writer2.async_locator_selector_), _)). After(call_change_writer1_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer3_1 = EXPECT_CALL(writer3, deliver_sample_nts(&change_writer3_1, _, Ref(writer3.async_locator_selector_), _)). After(call_change_writer2_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer4_1 = EXPECT_CALL(writer4, deliver_sample_nts(&change_writer4_1, _, Ref(writer4.async_locator_selector_), _)). After(call_change_writer3_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer5_1 = EXPECT_CALL(writer5, deliver_sample_nts(&change_writer5_1, _, Ref(writer5.async_locator_selector_), _)). After(call_change_writer4_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer6_1 = EXPECT_CALL(writer6, deliver_sample_nts(&change_writer6_1, _, Ref(writer6.async_locator_selector_), _)). After(call_change_writer5_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer7_1 = EXPECT_CALL(writer7, deliver_sample_nts(&change_writer7_1, _, Ref(writer7.async_locator_selector_), _)). After(call_change_writer6_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer8_1 = EXPECT_CALL(writer8, deliver_sample_nts(&change_writer8_1, _, Ref(writer8.async_locator_selector_), _)). After(call_change_writer7_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer9_1 = EXPECT_CALL(writer9, deliver_sample_nts(&change_writer9_1, _, Ref(writer9.async_locator_selector_), _)). After(call_change_writer8_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer10_1 = EXPECT_CALL(writer10, deliver_sample_nts(&change_writer10_1, _, Ref(writer10.async_locator_selector_), _)). After(call_change_writer9_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer1_2 = EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1_2, _, Ref(writer1.async_locator_selector_), _)). After(call_change_writer10_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer2_2 = EXPECT_CALL(writer2, deliver_sample_nts(&change_writer2_2, _, Ref(writer2.async_locator_selector_), _)). After(call_change_writer1_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer3_2 = EXPECT_CALL(writer3, deliver_sample_nts(&change_writer3_2, _, Ref(writer3.async_locator_selector_), _)). After(call_change_writer2_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer4_2 = EXPECT_CALL(writer4, deliver_sample_nts(&change_writer4_2, _, Ref(writer4.async_locator_selector_), _)). After(call_change_writer3_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer5_2 = EXPECT_CALL(writer5, deliver_sample_nts(&change_writer5_2, _, Ref(writer5.async_locator_selector_), _)). After(call_change_writer4_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer6_2 = EXPECT_CALL(writer6, deliver_sample_nts(&change_writer6_2, _, Ref(writer6.async_locator_selector_), _)). After(call_change_writer5_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer7_2 = EXPECT_CALL(writer7, deliver_sample_nts(&change_writer7_2, _, Ref(writer7.async_locator_selector_), _)). After(call_change_writer6_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer8_2 = EXPECT_CALL(writer8, deliver_sample_nts(&change_writer8_2, _, Ref(writer8.async_locator_selector_), _)). After(call_change_writer7_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer9_2 = EXPECT_CALL(writer9, deliver_sample_nts(&change_writer9_2, _, Ref(writer9.async_locator_selector_), _)). After(call_change_writer8_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer10_2 = EXPECT_CALL(writer10, deliver_sample_nts(&change_writer10_2, _, Ref(writer10.async_locator_selector_), _)). After(call_change_writer9_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer1_3 = EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1_3, _, Ref(writer1.async_locator_selector_), _)). After(call_change_writer10_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer2_3 = EXPECT_CALL(writer2, deliver_sample_nts(&change_writer2_3, _, Ref(writer2.async_locator_selector_), _)). After(call_change_writer1_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer3_3 = EXPECT_CALL(writer3, deliver_sample_nts(&change_writer3_3, _, Ref(writer3.async_locator_selector_), _)). After(call_change_writer2_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer4_3 = EXPECT_CALL(writer4, deliver_sample_nts(&change_writer4_3, _, Ref(writer4.async_locator_selector_), _)). After(call_change_writer3_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer5_3 = EXPECT_CALL(writer5, deliver_sample_nts(&change_writer5_3, _, Ref(writer5.async_locator_selector_), _)). After(call_change_writer4_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer6_3 = EXPECT_CALL(writer6, deliver_sample_nts(&change_writer6_3, _, Ref(writer6.async_locator_selector_), _)). After(call_change_writer5_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer7_3 = EXPECT_CALL(writer7, deliver_sample_nts(&change_writer7_3, _, Ref(writer7.async_locator_selector_), _)). After(call_change_writer6_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer8_3 = EXPECT_CALL(writer8, deliver_sample_nts(&change_writer8_3, _, Ref(writer8.async_locator_selector_), _)). After(call_change_writer7_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer9_3 = EXPECT_CALL(writer9, deliver_sample_nts(&change_writer9_3, _, Ref(writer9.async_locator_selector_), _)). After(call_change_writer8_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer10, deliver_sample_nts(&change_writer10_3, _, Ref(writer10.async_locator_selector_), _)). After(call_change_writer9_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_new_sample(&writer1, &change_writer1_1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -1048,123 +1043,123 @@ TEST_F(FlowControllerSchedulers, RoundRobin) }); auto& call_change_writer1_1 = EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1_1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer2_1 = EXPECT_CALL(writer2, deliver_sample_nts(&change_writer2_1, _, Ref(writer2.async_locator_selector_), _)). After(call_change_writer1_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer3_1 = EXPECT_CALL(writer3, deliver_sample_nts(&change_writer3_1, _, Ref(writer3.async_locator_selector_), _)). After(call_change_writer2_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer4_1 = EXPECT_CALL(writer4, deliver_sample_nts(&change_writer4_1, _, Ref(writer4.async_locator_selector_), _)). After(call_change_writer3_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer5_1 = EXPECT_CALL(writer5, deliver_sample_nts(&change_writer5_1, _, Ref(writer5.async_locator_selector_), _)). After(call_change_writer4_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer6_1 = EXPECT_CALL(writer6, deliver_sample_nts(&change_writer6_1, _, Ref(writer6.async_locator_selector_), _)). After(call_change_writer5_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer7_1 = EXPECT_CALL(writer7, deliver_sample_nts(&change_writer7_1, _, Ref(writer7.async_locator_selector_), _)). After(call_change_writer6_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer8_1 = EXPECT_CALL(writer8, deliver_sample_nts(&change_writer8_1, _, Ref(writer8.async_locator_selector_), _)). After(call_change_writer7_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer9_1 = EXPECT_CALL(writer9, deliver_sample_nts(&change_writer9_1, _, Ref(writer9.async_locator_selector_), _)). After(call_change_writer8_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer10_1 = EXPECT_CALL(writer10, deliver_sample_nts(&change_writer10_1, _, Ref(writer10.async_locator_selector_), _)). After(call_change_writer9_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer1_2 = EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1_2, _, Ref(writer1.async_locator_selector_), _)). After(call_change_writer10_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer2_2 = EXPECT_CALL(writer2, deliver_sample_nts(&change_writer2_2, _, Ref(writer2.async_locator_selector_), _)). After(call_change_writer1_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer3_2 = EXPECT_CALL(writer3, deliver_sample_nts(&change_writer3_2, _, Ref(writer3.async_locator_selector_), _)). After(call_change_writer2_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer4_2 = EXPECT_CALL(writer4, deliver_sample_nts(&change_writer4_2, _, Ref(writer4.async_locator_selector_), _)). After(call_change_writer3_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer5_2 = EXPECT_CALL(writer5, deliver_sample_nts(&change_writer5_2, _, Ref(writer5.async_locator_selector_), _)). After(call_change_writer4_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer6_2 = EXPECT_CALL(writer6, deliver_sample_nts(&change_writer6_2, _, Ref(writer6.async_locator_selector_), _)). After(call_change_writer5_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer7_2 = EXPECT_CALL(writer7, deliver_sample_nts(&change_writer7_2, _, Ref(writer7.async_locator_selector_), _)). After(call_change_writer6_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer8_2 = EXPECT_CALL(writer8, deliver_sample_nts(&change_writer8_2, _, Ref(writer8.async_locator_selector_), _)). After(call_change_writer7_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer9_2 = EXPECT_CALL(writer9, deliver_sample_nts(&change_writer9_2, _, Ref(writer9.async_locator_selector_), _)). After(call_change_writer8_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer10_2 = EXPECT_CALL(writer10, deliver_sample_nts(&change_writer10_2, _, Ref(writer10.async_locator_selector_), _)). After(call_change_writer9_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer1_3 = EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1_3, _, Ref(writer1.async_locator_selector_), _)). After(call_change_writer10_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer2_3 = EXPECT_CALL(writer2, deliver_sample_nts(&change_writer2_3, _, Ref(writer2.async_locator_selector_), _)). After(call_change_writer1_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer3_3 = EXPECT_CALL(writer3, deliver_sample_nts(&change_writer3_3, _, Ref(writer3.async_locator_selector_), _)). After(call_change_writer2_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer4_3 = EXPECT_CALL(writer4, deliver_sample_nts(&change_writer4_3, _, Ref(writer4.async_locator_selector_), _)). After(call_change_writer3_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer5_3 = EXPECT_CALL(writer5, deliver_sample_nts(&change_writer5_3, _, Ref(writer5.async_locator_selector_), _)). After(call_change_writer4_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer6_3 = EXPECT_CALL(writer6, deliver_sample_nts(&change_writer6_3, _, Ref(writer6.async_locator_selector_), _)). After(call_change_writer5_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer7_3 = EXPECT_CALL(writer7, deliver_sample_nts(&change_writer7_3, _, Ref(writer7.async_locator_selector_), _)). After(call_change_writer6_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer8_3 = EXPECT_CALL(writer8, deliver_sample_nts(&change_writer8_3, _, Ref(writer8.async_locator_selector_), _)). After(call_change_writer7_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer9_3 = EXPECT_CALL(writer9, deliver_sample_nts(&change_writer9_3, _, Ref(writer9.async_locator_selector_), _)). After(call_change_writer8_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer10, deliver_sample_nts(&change_writer10_3, _, Ref(writer10.async_locator_selector_), _)). After(call_change_writer9_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_new_sample(&writer1, &change_writer1_1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -1314,44 +1309,44 @@ TEST_F(FlowControllerSchedulers, HighPriority) async.init(); // Instantiate writers. - eprosima::fastrtps::rtps::Property priority_property; - eprosima::fastrtps::rtps::RTPSWriter writer1; + Property priority_property; + RTPSWriter writer1; priority_property.name("fastdds.sfc.priority"); priority_property.value("1"); writer1.m_att.endpoint.properties.properties().push_back(priority_property); - eprosima::fastrtps::rtps::RTPSWriter writer2; + RTPSWriter writer2; priority_property.value("2"); writer2.m_att.endpoint.properties.properties().push_back(priority_property); - eprosima::fastrtps::rtps::RTPSWriter writer3; + RTPSWriter writer3; priority_property.value("3"); writer3.m_att.endpoint.properties.properties().push_back(priority_property); - eprosima::fastrtps::rtps::RTPSWriter writer4; + RTPSWriter writer4; priority_property.value("4"); writer4.m_att.endpoint.properties.properties().push_back(priority_property); - eprosima::fastrtps::rtps::RTPSWriter writer5; + RTPSWriter writer5; priority_property.value("5"); writer5.m_att.endpoint.properties.properties().push_back(priority_property); - eprosima::fastrtps::rtps::RTPSWriter writer6; + RTPSWriter writer6; priority_property.value("6"); writer6.m_att.endpoint.properties.properties().push_back(priority_property); - eprosima::fastrtps::rtps::RTPSWriter writer7; + RTPSWriter writer7; priority_property.value("7"); writer7.m_att.endpoint.properties.properties().push_back(priority_property); - eprosima::fastrtps::rtps::RTPSWriter writer8; + RTPSWriter writer8; priority_property.value("8"); writer8.m_att.endpoint.properties.properties().push_back(priority_property); - eprosima::fastrtps::rtps::RTPSWriter writer9; + RTPSWriter writer9; priority_property.value("9"); writer9.m_att.endpoint.properties.properties().push_back(priority_property); - eprosima::fastrtps::rtps::RTPSWriter writer10; + RTPSWriter writer10; priority_property.value("10"); writer10.m_att.endpoint.properties.properties().push_back(priority_property); // Initialize callback to get info. auto send_functor = [&]( - eprosima::fastrtps::rtps::CacheChange_t* change, - eprosima::fastrtps::rtps::RTPSMessageGroup&, - eprosima::fastrtps::rtps::LocatorSelectorSender&, + CacheChange_t* change, + RTPSMessageGroup&, + LocatorSelectorSender&, const std::chrono::time_point&) { this->current_bytes_processed += change->serializedPayload.length; @@ -1374,63 +1369,63 @@ TEST_F(FlowControllerSchedulers, HighPriority) async.register_writer(&writer9); async.register_writer(&writer10); - eprosima::fastrtps::rtps::CacheChange_t change_writer1_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer1_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer1_3; + CacheChange_t change_writer1_1; + CacheChange_t change_writer1_2; + CacheChange_t change_writer1_3; INIT_CACHE_CHANGE(change_writer1_1, writer1, 1); INIT_CACHE_CHANGE(change_writer1_2, writer1, 2); INIT_CACHE_CHANGE(change_writer1_3, writer1, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer2_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer2_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer2_3; + CacheChange_t change_writer2_1; + CacheChange_t change_writer2_2; + CacheChange_t change_writer2_3; INIT_CACHE_CHANGE(change_writer2_1, writer2, 1); INIT_CACHE_CHANGE(change_writer2_2, writer2, 2); INIT_CACHE_CHANGE(change_writer2_3, writer2, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer3_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer3_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer3_3; + CacheChange_t change_writer3_1; + CacheChange_t change_writer3_2; + CacheChange_t change_writer3_3; INIT_CACHE_CHANGE(change_writer3_1, writer3, 1); INIT_CACHE_CHANGE(change_writer3_2, writer3, 2); INIT_CACHE_CHANGE(change_writer3_3, writer3, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer4_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer4_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer4_3; + CacheChange_t change_writer4_1; + CacheChange_t change_writer4_2; + CacheChange_t change_writer4_3; INIT_CACHE_CHANGE(change_writer4_1, writer4, 1); INIT_CACHE_CHANGE(change_writer4_2, writer4, 2); INIT_CACHE_CHANGE(change_writer4_3, writer4, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer5_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer5_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer5_3; + CacheChange_t change_writer5_1; + CacheChange_t change_writer5_2; + CacheChange_t change_writer5_3; INIT_CACHE_CHANGE(change_writer5_1, writer5, 1); INIT_CACHE_CHANGE(change_writer5_2, writer5, 2); INIT_CACHE_CHANGE(change_writer5_3, writer5, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer6_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer6_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer6_3; + CacheChange_t change_writer6_1; + CacheChange_t change_writer6_2; + CacheChange_t change_writer6_3; INIT_CACHE_CHANGE(change_writer6_1, writer6, 1); INIT_CACHE_CHANGE(change_writer6_2, writer6, 2); INIT_CACHE_CHANGE(change_writer6_3, writer6, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer7_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer7_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer7_3; + CacheChange_t change_writer7_1; + CacheChange_t change_writer7_2; + CacheChange_t change_writer7_3; INIT_CACHE_CHANGE(change_writer7_1, writer7, 1); INIT_CACHE_CHANGE(change_writer7_2, writer7, 2); INIT_CACHE_CHANGE(change_writer7_3, writer7, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer8_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer8_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer8_3; + CacheChange_t change_writer8_1; + CacheChange_t change_writer8_2; + CacheChange_t change_writer8_3; INIT_CACHE_CHANGE(change_writer8_1, writer8, 1); INIT_CACHE_CHANGE(change_writer8_2, writer8, 2); INIT_CACHE_CHANGE(change_writer8_3, writer8, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer9_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer9_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer9_3; + CacheChange_t change_writer9_1; + CacheChange_t change_writer9_2; + CacheChange_t change_writer9_3; INIT_CACHE_CHANGE(change_writer9_1, writer9, 1); INIT_CACHE_CHANGE(change_writer9_2, writer9, 2); INIT_CACHE_CHANGE(change_writer9_3, writer9, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer10_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer10_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer10_3; + CacheChange_t change_writer10_1; + CacheChange_t change_writer10_2; + CacheChange_t change_writer10_3; INIT_CACHE_CHANGE(change_writer10_1, writer10, 1); INIT_CACHE_CHANGE(change_writer10_2, writer10, 2); INIT_CACHE_CHANGE(change_writer10_3, writer10, 3); @@ -1452,123 +1447,123 @@ TEST_F(FlowControllerSchedulers, HighPriority) }); auto& call_change_writer1_1 = EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1_1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer1_2 = EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1_2, _, Ref(writer1.async_locator_selector_), _)). After(call_change_writer1_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer1_3 = EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1_3, _, Ref(writer1.async_locator_selector_), _)). After(call_change_writer1_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer2_1 = EXPECT_CALL(writer2, deliver_sample_nts(&change_writer2_1, _, Ref(writer2.async_locator_selector_), _)). After(call_change_writer1_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer2_2 = EXPECT_CALL(writer2, deliver_sample_nts(&change_writer2_2, _, Ref(writer2.async_locator_selector_), _)). After(call_change_writer2_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer2_3 = EXPECT_CALL(writer2, deliver_sample_nts(&change_writer2_3, _, Ref(writer2.async_locator_selector_), _)). After(call_change_writer2_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer3_1 = EXPECT_CALL(writer3, deliver_sample_nts(&change_writer3_1, _, Ref(writer3.async_locator_selector_), _)). After(call_change_writer2_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer3_2 = EXPECT_CALL(writer3, deliver_sample_nts(&change_writer3_2, _, Ref(writer3.async_locator_selector_), _)). After(call_change_writer3_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer3_3 = EXPECT_CALL(writer3, deliver_sample_nts(&change_writer3_3, _, Ref(writer3.async_locator_selector_), _)). After(call_change_writer3_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer4_1 = EXPECT_CALL(writer4, deliver_sample_nts(&change_writer4_1, _, Ref(writer4.async_locator_selector_), _)). After(call_change_writer3_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer4_2 = EXPECT_CALL(writer4, deliver_sample_nts(&change_writer4_2, _, Ref(writer4.async_locator_selector_), _)). After(call_change_writer4_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer4_3 = EXPECT_CALL(writer4, deliver_sample_nts(&change_writer4_3, _, Ref(writer4.async_locator_selector_), _)). After(call_change_writer4_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer5_1 = EXPECT_CALL(writer5, deliver_sample_nts(&change_writer5_1, _, Ref(writer5.async_locator_selector_), _)). After(call_change_writer4_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer5_2 = EXPECT_CALL(writer5, deliver_sample_nts(&change_writer5_2, _, Ref(writer5.async_locator_selector_), _)). After(call_change_writer5_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer5_3 = EXPECT_CALL(writer5, deliver_sample_nts(&change_writer5_3, _, Ref(writer5.async_locator_selector_), _)). After(call_change_writer5_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer6_1 = EXPECT_CALL(writer6, deliver_sample_nts(&change_writer6_1, _, Ref(writer6.async_locator_selector_), _)). After(call_change_writer5_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer6_2 = EXPECT_CALL(writer6, deliver_sample_nts(&change_writer6_2, _, Ref(writer6.async_locator_selector_), _)). After(call_change_writer6_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer6_3 = EXPECT_CALL(writer6, deliver_sample_nts(&change_writer6_3, _, Ref(writer6.async_locator_selector_), _)). After(call_change_writer6_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer7_1 = EXPECT_CALL(writer7, deliver_sample_nts(&change_writer7_1, _, Ref(writer7.async_locator_selector_), _)). After(call_change_writer6_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer7_2 = EXPECT_CALL(writer7, deliver_sample_nts(&change_writer7_2, _, Ref(writer7.async_locator_selector_), _)). After(call_change_writer7_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer7_3 = EXPECT_CALL(writer7, deliver_sample_nts(&change_writer7_3, _, Ref(writer7.async_locator_selector_), _)). After(call_change_writer7_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer8_1 = EXPECT_CALL(writer8, deliver_sample_nts(&change_writer8_1, _, Ref(writer8.async_locator_selector_), _)). After(call_change_writer7_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer8_2 = EXPECT_CALL(writer8, deliver_sample_nts(&change_writer8_2, _, Ref(writer8.async_locator_selector_), _)). After(call_change_writer8_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer8_3 = EXPECT_CALL(writer8, deliver_sample_nts(&change_writer8_3, _, Ref(writer8.async_locator_selector_), _)). After(call_change_writer8_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer9_1 = EXPECT_CALL(writer9, deliver_sample_nts(&change_writer9_1, _, Ref(writer9.async_locator_selector_), _)). After(call_change_writer8_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer9_2 = EXPECT_CALL(writer9, deliver_sample_nts(&change_writer9_2, _, Ref(writer9.async_locator_selector_), _)). After(call_change_writer9_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer9_3 = EXPECT_CALL(writer9, deliver_sample_nts(&change_writer9_3, _, Ref(writer9.async_locator_selector_), _)). After(call_change_writer9_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer10_1 = EXPECT_CALL(writer10, deliver_sample_nts(&change_writer10_1, _, Ref(writer10.async_locator_selector_), _)). After(call_change_writer9_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer10_2 = EXPECT_CALL(writer10, deliver_sample_nts(&change_writer10_2, _, Ref(writer10.async_locator_selector_), _)). After(call_change_writer10_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer10, deliver_sample_nts(&change_writer10_3, _, Ref(writer10.async_locator_selector_), _)). After(call_change_writer10_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_new_sample(&writer1, &change_writer1_1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -1671,123 +1666,123 @@ TEST_F(FlowControllerSchedulers, HighPriority) }); auto& call_change_writer1_1 = EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1_1, _, Ref(writer1.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer1_2 = EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1_2, _, Ref(writer1.async_locator_selector_), _)). After(call_change_writer1_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer1_3 = EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1_3, _, Ref(writer1.async_locator_selector_), _)). After(call_change_writer1_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer2_1 = EXPECT_CALL(writer2, deliver_sample_nts(&change_writer2_1, _, Ref(writer2.async_locator_selector_), _)). After(call_change_writer1_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer2_2 = EXPECT_CALL(writer2, deliver_sample_nts(&change_writer2_2, _, Ref(writer2.async_locator_selector_), _)). After(call_change_writer2_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer2_3 = EXPECT_CALL(writer2, deliver_sample_nts(&change_writer2_3, _, Ref(writer2.async_locator_selector_), _)). After(call_change_writer2_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer3_1 = EXPECT_CALL(writer3, deliver_sample_nts(&change_writer3_1, _, Ref(writer3.async_locator_selector_), _)). After(call_change_writer2_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer3_2 = EXPECT_CALL(writer3, deliver_sample_nts(&change_writer3_2, _, Ref(writer3.async_locator_selector_), _)). After(call_change_writer3_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer3_3 = EXPECT_CALL(writer3, deliver_sample_nts(&change_writer3_3, _, Ref(writer3.async_locator_selector_), _)). After(call_change_writer3_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer4_1 = EXPECT_CALL(writer4, deliver_sample_nts(&change_writer4_1, _, Ref(writer4.async_locator_selector_), _)). After(call_change_writer3_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer4_2 = EXPECT_CALL(writer4, deliver_sample_nts(&change_writer4_2, _, Ref(writer4.async_locator_selector_), _)). After(call_change_writer4_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer4_3 = EXPECT_CALL(writer4, deliver_sample_nts(&change_writer4_3, _, Ref(writer4.async_locator_selector_), _)). After(call_change_writer4_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer5_1 = EXPECT_CALL(writer5, deliver_sample_nts(&change_writer5_1, _, Ref(writer5.async_locator_selector_), _)). After(call_change_writer4_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer5_2 = EXPECT_CALL(writer5, deliver_sample_nts(&change_writer5_2, _, Ref(writer5.async_locator_selector_), _)). After(call_change_writer5_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer5_3 = EXPECT_CALL(writer5, deliver_sample_nts(&change_writer5_3, _, Ref(writer5.async_locator_selector_), _)). After(call_change_writer5_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer6_1 = EXPECT_CALL(writer6, deliver_sample_nts(&change_writer6_1, _, Ref(writer6.async_locator_selector_), _)). After(call_change_writer5_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer6_2 = EXPECT_CALL(writer6, deliver_sample_nts(&change_writer6_2, _, Ref(writer6.async_locator_selector_), _)). After(call_change_writer6_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer6_3 = EXPECT_CALL(writer6, deliver_sample_nts(&change_writer6_3, _, Ref(writer6.async_locator_selector_), _)). After(call_change_writer6_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer7_1 = EXPECT_CALL(writer7, deliver_sample_nts(&change_writer7_1, _, Ref(writer7.async_locator_selector_), _)). After(call_change_writer6_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer7_2 = EXPECT_CALL(writer7, deliver_sample_nts(&change_writer7_2, _, Ref(writer7.async_locator_selector_), _)). After(call_change_writer7_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer7_3 = EXPECT_CALL(writer7, deliver_sample_nts(&change_writer7_3, _, Ref(writer7.async_locator_selector_), _)). After(call_change_writer7_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer8_1 = EXPECT_CALL(writer8, deliver_sample_nts(&change_writer8_1, _, Ref(writer8.async_locator_selector_), _)). After(call_change_writer7_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer8_2 = EXPECT_CALL(writer8, deliver_sample_nts(&change_writer8_2, _, Ref(writer8.async_locator_selector_), _)). After(call_change_writer8_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer8_3 = EXPECT_CALL(writer8, deliver_sample_nts(&change_writer8_3, _, Ref(writer8.async_locator_selector_), _)). After(call_change_writer8_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer9_1 = EXPECT_CALL(writer9, deliver_sample_nts(&change_writer9_1, _, Ref(writer9.async_locator_selector_), _)). After(call_change_writer8_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer9_2 = EXPECT_CALL(writer9, deliver_sample_nts(&change_writer9_2, _, Ref(writer9.async_locator_selector_), _)). After(call_change_writer9_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer9_3 = EXPECT_CALL(writer9, deliver_sample_nts(&change_writer9_3, _, Ref(writer9.async_locator_selector_), _)). After(call_change_writer9_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer10_1 = EXPECT_CALL(writer10, deliver_sample_nts(&change_writer10_1, _, Ref(writer10.async_locator_selector_), _)). After(call_change_writer9_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer10_2 = EXPECT_CALL(writer10, deliver_sample_nts(&change_writer10_2, _, Ref(writer10.async_locator_selector_), _)). After(call_change_writer10_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer10, deliver_sample_nts(&change_writer10_3, _, Ref(writer10.async_locator_selector_), _)). After(call_change_writer10_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_new_sample(&writer1, &change_writer1_1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -1938,39 +1933,39 @@ TEST_F(FlowControllerSchedulers, PriorityWithReservation) async.init(); // Instantiate writers. - eprosima::fastrtps::rtps::Property priority_property; - eprosima::fastrtps::rtps::RTPSWriter writer1; + Property priority_property; + RTPSWriter writer1; priority_property.name("fastdds.sfc.priority"); priority_property.value("1"); writer1.m_att.endpoint.properties.properties().push_back(priority_property); - eprosima::fastrtps::rtps::RTPSWriter writer2; + RTPSWriter writer2; priority_property.value("2"); writer2.m_att.endpoint.properties.properties().push_back(priority_property); - eprosima::fastrtps::rtps::RTPSWriter writer3; + RTPSWriter writer3; priority_property.value("3"); writer3.m_att.endpoint.properties.properties().push_back(priority_property); - eprosima::fastrtps::rtps::RTPSWriter writer4; + RTPSWriter writer4; priority_property.value("4"); writer4.m_att.endpoint.properties.properties().push_back(priority_property); - eprosima::fastrtps::rtps::RTPSWriter writer5; + RTPSWriter writer5; priority_property.value("5"); writer5.m_att.endpoint.properties.properties().push_back(priority_property); - eprosima::fastrtps::rtps::RTPSWriter writer6; + RTPSWriter writer6; priority_property.value("6"); writer6.m_att.endpoint.properties.properties().push_back(priority_property); - eprosima::fastrtps::rtps::RTPSWriter writer7; + RTPSWriter writer7; priority_property.value("7"); writer7.m_att.endpoint.properties.properties().push_back(priority_property); - eprosima::fastrtps::rtps::RTPSWriter writer8; + RTPSWriter writer8; priority_property.value("8"); writer8.m_att.endpoint.properties.properties().push_back(priority_property); - eprosima::fastrtps::rtps::RTPSWriter writer9; + RTPSWriter writer9; priority_property.value("9"); writer9.m_att.endpoint.properties.properties().push_back(priority_property); - eprosima::fastrtps::rtps::RTPSWriter writer10; + RTPSWriter writer10; priority_property.value("10"); writer10.m_att.endpoint.properties.properties().push_back(priority_property); - eprosima::fastrtps::rtps::Property reservation_property; + Property reservation_property; reservation_property.name("fastdds.sfc.bandwidth_reservation"); reservation_property.value("30"); writer10.m_att.endpoint.properties.properties().push_back(reservation_property); @@ -1981,9 +1976,9 @@ TEST_F(FlowControllerSchedulers, PriorityWithReservation) // Initialize callback to get info. auto send_functor = [&]( - eprosima::fastrtps::rtps::CacheChange_t* change, - eprosima::fastrtps::rtps::RTPSMessageGroup&, - eprosima::fastrtps::rtps::LocatorSelectorSender&, + CacheChange_t* change, + RTPSMessageGroup&, + LocatorSelectorSender&, const std::chrono::time_point&) { this->current_bytes_processed += change->serializedPayload.length; @@ -2006,63 +2001,63 @@ TEST_F(FlowControllerSchedulers, PriorityWithReservation) async.register_writer(&writer9); async.register_writer(&writer10); - eprosima::fastrtps::rtps::CacheChange_t change_writer1_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer1_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer1_3; + CacheChange_t change_writer1_1; + CacheChange_t change_writer1_2; + CacheChange_t change_writer1_3; INIT_CACHE_CHANGE(change_writer1_1, writer1, 1); INIT_CACHE_CHANGE(change_writer1_2, writer1, 2); INIT_CACHE_CHANGE(change_writer1_3, writer1, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer2_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer2_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer2_3; + CacheChange_t change_writer2_1; + CacheChange_t change_writer2_2; + CacheChange_t change_writer2_3; INIT_CACHE_CHANGE(change_writer2_1, writer2, 1); INIT_CACHE_CHANGE(change_writer2_2, writer2, 2); INIT_CACHE_CHANGE(change_writer2_3, writer2, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer3_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer3_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer3_3; + CacheChange_t change_writer3_1; + CacheChange_t change_writer3_2; + CacheChange_t change_writer3_3; INIT_CACHE_CHANGE(change_writer3_1, writer3, 1); INIT_CACHE_CHANGE(change_writer3_2, writer3, 2); INIT_CACHE_CHANGE(change_writer3_3, writer3, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer4_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer4_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer4_3; + CacheChange_t change_writer4_1; + CacheChange_t change_writer4_2; + CacheChange_t change_writer4_3; INIT_CACHE_CHANGE(change_writer4_1, writer4, 1); INIT_CACHE_CHANGE(change_writer4_2, writer4, 2); INIT_CACHE_CHANGE(change_writer4_3, writer4, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer5_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer5_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer5_3; + CacheChange_t change_writer5_1; + CacheChange_t change_writer5_2; + CacheChange_t change_writer5_3; INIT_CACHE_CHANGE(change_writer5_1, writer5, 1); INIT_CACHE_CHANGE(change_writer5_2, writer5, 2); INIT_CACHE_CHANGE(change_writer5_3, writer5, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer6_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer6_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer6_3; + CacheChange_t change_writer6_1; + CacheChange_t change_writer6_2; + CacheChange_t change_writer6_3; INIT_CACHE_CHANGE(change_writer6_1, writer6, 1); INIT_CACHE_CHANGE(change_writer6_2, writer6, 2); INIT_CACHE_CHANGE(change_writer6_3, writer6, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer7_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer7_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer7_3; + CacheChange_t change_writer7_1; + CacheChange_t change_writer7_2; + CacheChange_t change_writer7_3; INIT_CACHE_CHANGE(change_writer7_1, writer7, 1); INIT_CACHE_CHANGE(change_writer7_2, writer7, 2); INIT_CACHE_CHANGE(change_writer7_3, writer7, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer8_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer8_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer8_3; + CacheChange_t change_writer8_1; + CacheChange_t change_writer8_2; + CacheChange_t change_writer8_3; INIT_CACHE_CHANGE(change_writer8_1, writer8, 1); INIT_CACHE_CHANGE(change_writer8_2, writer8, 2); INIT_CACHE_CHANGE(change_writer8_3, writer8, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer9_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer9_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer9_3; + CacheChange_t change_writer9_1; + CacheChange_t change_writer9_2; + CacheChange_t change_writer9_3; INIT_CACHE_CHANGE(change_writer9_1, writer9, 1); INIT_CACHE_CHANGE(change_writer9_2, writer9, 2); INIT_CACHE_CHANGE(change_writer9_3, writer9, 3); - eprosima::fastrtps::rtps::CacheChange_t change_writer10_1; - eprosima::fastrtps::rtps::CacheChange_t change_writer10_2; - eprosima::fastrtps::rtps::CacheChange_t change_writer10_3; + CacheChange_t change_writer10_1; + CacheChange_t change_writer10_2; + CacheChange_t change_writer10_3; INIT_CACHE_CHANGE(change_writer10_1, writer10, 1); INIT_CACHE_CHANGE(change_writer10_2, writer10, 2); INIT_CACHE_CHANGE(change_writer10_3, writer10, 3); @@ -2084,123 +2079,123 @@ TEST_F(FlowControllerSchedulers, PriorityWithReservation) }); auto& call_change_writer8_1 = EXPECT_CALL(writer8, deliver_sample_nts(&change_writer8_1, _, Ref(writer8.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer9_1 = EXPECT_CALL(writer9, deliver_sample_nts(&change_writer9_1, _, Ref(writer9.async_locator_selector_), _)). After(call_change_writer8_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer9_2 = EXPECT_CALL(writer9, deliver_sample_nts(&change_writer9_2, _, Ref(writer9.async_locator_selector_), _)). After(call_change_writer9_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer10_1 = EXPECT_CALL(writer10, deliver_sample_nts(&change_writer10_1, _, Ref(writer10.async_locator_selector_), _)). After(call_change_writer9_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer10_2 = EXPECT_CALL(writer10, deliver_sample_nts(&change_writer10_2, _, Ref(writer10.async_locator_selector_), _)). After(call_change_writer10_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer10_3 = EXPECT_CALL(writer10, deliver_sample_nts(&change_writer10_3, _, Ref(writer10.async_locator_selector_), _)). After(call_change_writer10_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer1_1 = EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1_1, _, Ref(writer1.async_locator_selector_), _)). After(call_change_writer10_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer1_2 = EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1_2, _, Ref(writer1.async_locator_selector_), _)). After(call_change_writer1_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer1_3 = EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1_3, _, Ref(writer1.async_locator_selector_), _)). After(call_change_writer1_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer2_1 = EXPECT_CALL(writer2, deliver_sample_nts(&change_writer2_1, _, Ref(writer2.async_locator_selector_), _)). After(call_change_writer1_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer8_2 = EXPECT_CALL(writer8, deliver_sample_nts(&change_writer8_2, _, Ref(writer8.async_locator_selector_), _)). After(call_change_writer2_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer9_3 = EXPECT_CALL(writer9, deliver_sample_nts(&change_writer9_3, _, Ref(writer9.async_locator_selector_), _)). After(call_change_writer8_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer2_2 = EXPECT_CALL(writer2, deliver_sample_nts(&change_writer2_2, _, Ref(writer2.async_locator_selector_), _)). After(call_change_writer9_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer2_3 = EXPECT_CALL(writer2, deliver_sample_nts(&change_writer2_3, _, Ref(writer2.async_locator_selector_), _)). After(call_change_writer2_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer3_1 = EXPECT_CALL(writer3, deliver_sample_nts(&change_writer3_1, _, Ref(writer3.async_locator_selector_), _)). After(call_change_writer2_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer3_2 = EXPECT_CALL(writer3, deliver_sample_nts(&change_writer3_2, _, Ref(writer3.async_locator_selector_), _)). After(call_change_writer3_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer3_3 = EXPECT_CALL(writer3, deliver_sample_nts(&change_writer3_3, _, Ref(writer3.async_locator_selector_), _)). After(call_change_writer3_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer4_1 = EXPECT_CALL(writer4, deliver_sample_nts(&change_writer4_1, _, Ref(writer4.async_locator_selector_), _)). After(call_change_writer3_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer4_2 = EXPECT_CALL(writer4, deliver_sample_nts(&change_writer4_2, _, Ref(writer4.async_locator_selector_), _)). After(call_change_writer4_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer4_3 = EXPECT_CALL(writer4, deliver_sample_nts(&change_writer4_3, _, Ref(writer4.async_locator_selector_), _)). After(call_change_writer4_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer8_3 = EXPECT_CALL(writer8, deliver_sample_nts(&change_writer8_3, _, Ref(writer8.async_locator_selector_), _)). After(call_change_writer4_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer5_1 = EXPECT_CALL(writer5, deliver_sample_nts(&change_writer5_1, _, Ref(writer5.async_locator_selector_), _)). After(call_change_writer8_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer5_2 = EXPECT_CALL(writer5, deliver_sample_nts(&change_writer5_2, _, Ref(writer5.async_locator_selector_), _)). After(call_change_writer5_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer5_3 = EXPECT_CALL(writer5, deliver_sample_nts(&change_writer5_3, _, Ref(writer5.async_locator_selector_), _)). After(call_change_writer5_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer6_1 = EXPECT_CALL(writer6, deliver_sample_nts(&change_writer6_1, _, Ref(writer6.async_locator_selector_), _)). After(call_change_writer5_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer6_2 = EXPECT_CALL(writer6, deliver_sample_nts(&change_writer6_2, _, Ref(writer6.async_locator_selector_), _)). After(call_change_writer6_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer6_3 = EXPECT_CALL(writer6, deliver_sample_nts(&change_writer6_3, _, Ref(writer6.async_locator_selector_), _)). After(call_change_writer6_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer7_1 = EXPECT_CALL(writer7, deliver_sample_nts(&change_writer7_1, _, Ref(writer7.async_locator_selector_), _)). After(call_change_writer6_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer7_2 = EXPECT_CALL(writer7, deliver_sample_nts(&change_writer7_2, _, Ref(writer7.async_locator_selector_), _)). After(call_change_writer7_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer7, deliver_sample_nts(&change_writer7_3, _, Ref(writer7.async_locator_selector_), _)). After(call_change_writer7_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_new_sample(&writer1, &change_writer1_1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -2305,123 +2300,123 @@ TEST_F(FlowControllerSchedulers, PriorityWithReservation) }); auto& call_change_writer8_1 = EXPECT_CALL(writer8, deliver_sample_nts(&change_writer8_1, _, Ref(writer8.async_locator_selector_), _)). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer9_1 = EXPECT_CALL(writer9, deliver_sample_nts(&change_writer9_1, _, Ref(writer9.async_locator_selector_), _)). After(call_change_writer8_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer9_2 = EXPECT_CALL(writer9, deliver_sample_nts(&change_writer9_2, _, Ref(writer9.async_locator_selector_), _)). After(call_change_writer9_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer10_1 = EXPECT_CALL(writer10, deliver_sample_nts(&change_writer10_1, _, Ref(writer10.async_locator_selector_), _)). After(call_change_writer9_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer10_2 = EXPECT_CALL(writer10, deliver_sample_nts(&change_writer10_2, _, Ref(writer10.async_locator_selector_), _)). After(call_change_writer10_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer10_3 = EXPECT_CALL(writer10, deliver_sample_nts(&change_writer10_3, _, Ref(writer10.async_locator_selector_), _)). After(call_change_writer10_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer1_1 = EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1_1, _, Ref(writer1.async_locator_selector_), _)). After(call_change_writer10_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer1_2 = EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1_2, _, Ref(writer1.async_locator_selector_), _)). After(call_change_writer1_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer1_3 = EXPECT_CALL(writer1, deliver_sample_nts(&change_writer1_3, _, Ref(writer1.async_locator_selector_), _)). After(call_change_writer1_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer2_1 = EXPECT_CALL(writer2, deliver_sample_nts(&change_writer2_1, _, Ref(writer2.async_locator_selector_), _)). After(call_change_writer1_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer8_2 = EXPECT_CALL(writer8, deliver_sample_nts(&change_writer8_2, _, Ref(writer8.async_locator_selector_), _)). After(call_change_writer2_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer9_3 = EXPECT_CALL(writer9, deliver_sample_nts(&change_writer9_3, _, Ref(writer9.async_locator_selector_), _)). After(call_change_writer8_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer2_2 = EXPECT_CALL(writer2, deliver_sample_nts(&change_writer2_2, _, Ref(writer2.async_locator_selector_), _)). After(call_change_writer9_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer2_3 = EXPECT_CALL(writer2, deliver_sample_nts(&change_writer2_3, _, Ref(writer2.async_locator_selector_), _)). After(call_change_writer2_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer3_1 = EXPECT_CALL(writer3, deliver_sample_nts(&change_writer3_1, _, Ref(writer3.async_locator_selector_), _)). After(call_change_writer2_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer3_2 = EXPECT_CALL(writer3, deliver_sample_nts(&change_writer3_2, _, Ref(writer3.async_locator_selector_), _)). After(call_change_writer3_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer3_3 = EXPECT_CALL(writer3, deliver_sample_nts(&change_writer3_3, _, Ref(writer3.async_locator_selector_), _)). After(call_change_writer3_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer4_1 = EXPECT_CALL(writer4, deliver_sample_nts(&change_writer4_1, _, Ref(writer4.async_locator_selector_), _)). After(call_change_writer3_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer4_2 = EXPECT_CALL(writer4, deliver_sample_nts(&change_writer4_2, _, Ref(writer4.async_locator_selector_), _)). After(call_change_writer4_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer4_3 = EXPECT_CALL(writer4, deliver_sample_nts(&change_writer4_3, _, Ref(writer4.async_locator_selector_), _)). After(call_change_writer4_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer8_3 = EXPECT_CALL(writer8, deliver_sample_nts(&change_writer8_3, _, Ref(writer8.async_locator_selector_), _)). After(call_change_writer4_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer5_1 = EXPECT_CALL(writer5, deliver_sample_nts(&change_writer5_1, _, Ref(writer5.async_locator_selector_), _)). After(call_change_writer8_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer5_2 = EXPECT_CALL(writer5, deliver_sample_nts(&change_writer5_2, _, Ref(writer5.async_locator_selector_), _)). After(call_change_writer5_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer5_3 = EXPECT_CALL(writer5, deliver_sample_nts(&change_writer5_3, _, Ref(writer5.async_locator_selector_), _)). After(call_change_writer5_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer6_1 = EXPECT_CALL(writer6, deliver_sample_nts(&change_writer6_1, _, Ref(writer6.async_locator_selector_), _)). After(call_change_writer5_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer6_2 = EXPECT_CALL(writer6, deliver_sample_nts(&change_writer6_2, _, Ref(writer6.async_locator_selector_), _)). After(call_change_writer6_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer6_3 = EXPECT_CALL(writer6, deliver_sample_nts(&change_writer6_3, _, Ref(writer6.async_locator_selector_), _)). After(call_change_writer6_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer7_1 = EXPECT_CALL(writer7, deliver_sample_nts(&change_writer7_1, _, Ref(writer7.async_locator_selector_), _)). After(call_change_writer6_3). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); auto& call_change_writer7_2 = EXPECT_CALL(writer7, deliver_sample_nts(&change_writer7_2, _, Ref(writer7.async_locator_selector_), _)). After(call_change_writer7_1). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); EXPECT_CALL(writer7, deliver_sample_nts(&change_writer7_3, _, Ref(writer7.async_locator_selector_), _)). After(call_change_writer7_2). - WillOnce(DoAll(send_functor, Return(eprosima::fastrtps::rtps::DeliveryRetCode::DELIVERED))); + WillOnce(DoAll(send_functor, Return(DeliveryRetCode::DELIVERED))); writer1.getMutex().lock(); ASSERT_TRUE(async.add_new_sample(&writer1, &change_writer1_1, std::chrono::steady_clock::now() + std::chrono::hours(24))); @@ -2561,6 +2556,10 @@ TEST_F(FlowControllerSchedulers, PriorityWithReservation) async.unregister_writer(&writer10); } +} // namespace rtps +} // namespace fastdds +} // namespace eprosima + int main( int argc, char** argv) diff --git a/test/unittest/rtps/history/BasicPoolsTests.cpp b/test/unittest/rtps/history/BasicPoolsTests.cpp index cac7f6702e0..c263dc0f643 100644 --- a/test/unittest/rtps/history/BasicPoolsTests.cpp +++ b/test/unittest/rtps/history/BasicPoolsTests.cpp @@ -22,7 +22,7 @@ #include -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; using namespace ::testing; using namespace std; diff --git a/test/unittest/rtps/history/CacheChangePoolTests.cpp b/test/unittest/rtps/history/CacheChangePoolTests.cpp index 16a02f9d0f3..a0d452d557c 100644 --- a/test/unittest/rtps/history/CacheChangePoolTests.cpp +++ b/test/unittest/rtps/history/CacheChangePoolTests.cpp @@ -21,7 +21,7 @@ #include -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; using namespace ::testing; using namespace std; diff --git a/test/unittest/rtps/history/ReaderHistoryTests.cpp b/test/unittest/rtps/history/ReaderHistoryTests.cpp index be709c71f33..d171b926084 100644 --- a/test/unittest/rtps/history/ReaderHistoryTests.cpp +++ b/test/unittest/rtps/history/ReaderHistoryTests.cpp @@ -25,7 +25,7 @@ #include -using namespace eprosima::fastrtps; +using namespace eprosima::fastdds; using namespace ::rtps; using namespace ::testing; using namespace std; diff --git a/test/unittest/rtps/history/TopicPayloadPoolRegistryTests.cpp b/test/unittest/rtps/history/TopicPayloadPoolRegistryTests.cpp index 4da1f7b370b..e68af1e1cab 100644 --- a/test/unittest/rtps/history/TopicPayloadPoolRegistryTests.cpp +++ b/test/unittest/rtps/history/TopicPayloadPoolRegistryTests.cpp @@ -18,7 +18,7 @@ #include -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; using namespace ::testing; using namespace std; diff --git a/test/unittest/rtps/history/TopicPayloadPoolTests.cpp b/test/unittest/rtps/history/TopicPayloadPoolTests.cpp index 7c4d524167b..119773e2e19 100644 --- a/test/unittest/rtps/history/TopicPayloadPoolTests.cpp +++ b/test/unittest/rtps/history/TopicPayloadPoolTests.cpp @@ -19,7 +19,7 @@ #include -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; using namespace ::testing; using namespace std; diff --git a/test/unittest/rtps/network/ExternalLocatorsTests.cpp b/test/unittest/rtps/network/ExternalLocatorsTests.cpp index a81467bab89..a1651baa259 100644 --- a/test/unittest/rtps/network/ExternalLocatorsTests.cpp +++ b/test/unittest/rtps/network/ExternalLocatorsTests.cpp @@ -21,12 +21,11 @@ using namespace eprosima::fastdds::rtps; using namespace eprosima::fastdds::rtps::network; -using namespace eprosima::fastrtps::rtps; // -------------------- Auxiliary methods to compare locator lists -------------------- static bool operator == ( - const eprosima::fastrtps::ResourceLimitedVector& lhs, + const eprosima::fastdds::ResourceLimitedVector& lhs, const eprosima::fastdds::rtps::LocatorList& rhs) { LocatorList left_list; @@ -40,8 +39,8 @@ static bool operator == ( } static bool operator == ( - const eprosima::fastrtps::ResourceLimitedVector& lhs, - const eprosima::fastrtps::ResourceLimitedVector& rhs) + const eprosima::fastdds::ResourceLimitedVector& lhs, + const eprosima::fastdds::ResourceLimitedVector& rhs) { LocatorList right_list; @@ -54,8 +53,8 @@ static bool operator == ( } static bool operator == ( - const eprosima::fastrtps::rtps::RemoteLocatorList& lhs, - const eprosima::fastrtps::rtps::RemoteLocatorList& rhs) + const eprosima::fastdds::rtps::RemoteLocatorList& lhs, + const eprosima::fastdds::rtps::RemoteLocatorList& rhs) { return lhs.multicast == rhs.multicast && lhs.unicast == rhs.unicast; } diff --git a/test/unittest/rtps/network/NetworkFactoryTests.cpp b/test/unittest/rtps/network/NetworkFactoryTests.cpp index 241c2dc79a8..b1e64798b70 100644 --- a/test/unittest/rtps/network/NetworkFactoryTests.cpp +++ b/test/unittest/rtps/network/NetworkFactoryTests.cpp @@ -27,8 +27,7 @@ #include #include -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; using namespace eprosima::fastdds::rtps; class NetworkTests : public ::testing::Test diff --git a/test/unittest/rtps/network/mock/MockTransport.cpp b/test/unittest/rtps/network/mock/MockTransport.cpp index 506b7137256..4bcb4cc94f1 100644 --- a/test/unittest/rtps/network/mock/MockTransport.cpp +++ b/test/unittest/rtps/network/mock/MockTransport.cpp @@ -48,7 +48,7 @@ MockTransport::~MockTransport() } bool MockTransport::init( - const fastrtps::rtps::PropertyPolicy* /*properties*/, + const fastdds::rtps::PropertyPolicy* /*properties*/, const uint32_t& /*max_msg_size_no_frag*/) { return true; @@ -138,12 +138,12 @@ LocatorList_t MockTransport::NormalizeLocator( } void MockTransport::select_locators( - fastrtps::rtps::LocatorSelector& selector) const + fastdds::rtps::LocatorSelector& selector) const { - fastrtps::ResourceLimitedVector& entries = selector.transport_starts(); + fastdds::ResourceLimitedVector& entries = selector.transport_starts(); for (size_t i = 0; i < entries.size(); ++i) { - fastrtps::rtps::LocatorSelectorEntry* entry = entries[i]; + fastdds::rtps::LocatorSelectorEntry* entry = entries[i]; if (entry->transport_should_process) { for (size_t j = 0; j < entry->unicast.size(); ++j) @@ -157,5 +157,5 @@ void MockTransport::select_locators( } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/test/unittest/rtps/network/mock/MockTransport.h b/test/unittest/rtps/network/mock/MockTransport.h index 358d45224f0..573194e61b7 100644 --- a/test/unittest/rtps/network/mock/MockTransport.h +++ b/test/unittest/rtps/network/mock/MockTransport.h @@ -27,10 +27,6 @@ namespace eprosima { namespace fastdds { namespace rtps { -using Locator_t = eprosima::fastrtps::rtps::Locator_t; -using LocatorList_t = eprosima::fastrtps::rtps::LocatorList_t; -using SenderResource = eprosima::fastrtps::rtps::SenderResource; - class MockTransportDescriptor; class MockSenderResource : public SenderResource @@ -66,7 +62,7 @@ class MockTransport : public fastdds::rtps::TransportInterface ~MockTransport(); bool init( - const fastrtps::rtps::PropertyPolicy* properties = nullptr, + const fastdds::rtps::PropertyPolicy* properties = nullptr, const uint32_t& max_msg_size_no_frag = 0) override; //API implementation @@ -112,7 +108,7 @@ class MockTransport : public fastdds::rtps::TransportInterface * @param [in, out] selector Locator selector. */ void select_locators( - fastrtps::rtps::LocatorSelector& selector) const override; + fastdds::rtps::LocatorSelector& selector) const override; bool is_local_locator( const Locator_t&) const override @@ -172,7 +168,7 @@ class MockTransport : public fastdds::rtps::TransportInterface bool configureInitialPeerLocator( Locator_t&, - const fastrtps::rtps::PortParameters&, + const fastdds::rtps::PortParameters&, uint32_t, LocatorList_t& ) const override { @@ -192,15 +188,15 @@ class MockTransport : public fastdds::rtps::TransportInterface } bool transform_remote_locator( - const fastrtps::rtps::Locator_t&, - fastrtps::rtps::Locator_t&) const override + const fastdds::rtps::Locator_t&, + fastdds::rtps::Locator_t&) const override { return true; } bool transform_remote_locator( - const fastrtps::rtps::Locator_t&, - fastrtps::rtps::Locator_t&, + const fastdds::rtps::Locator_t&, + fastdds::rtps::Locator_t&, bool, bool) const override { @@ -212,7 +208,7 @@ class MockTransport : public fastdds::rtps::TransportInterface { Locator_t destination; Locator_t origin; - std::vector data; + std::vector data; } MockMessage; std::vector mockMessagesToReceive; diff --git a/test/unittest/rtps/persistence/PersistenceTests.cpp b/test/unittest/rtps/persistence/PersistenceTests.cpp index 451ab75688a..aedcd603d4d 100644 --- a/test/unittest/rtps/persistence/PersistenceTests.cpp +++ b/test/unittest/rtps/persistence/PersistenceTests.cpp @@ -27,7 +27,7 @@ #include #include -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; class NoOpPayloadPool : public IPayloadPool { diff --git a/test/unittest/rtps/reader/StatefulReaderTests.cpp b/test/unittest/rtps/reader/StatefulReaderTests.cpp index 210f01cc80c..36ad71e9b12 100644 --- a/test/unittest/rtps/reader/StatefulReaderTests.cpp +++ b/test/unittest/rtps/reader/StatefulReaderTests.cpp @@ -56,9 +56,7 @@ namespace dds { const InstanceHandle_t HANDLE_NIL; } // namespace dds -} // namespace fastdds -namespace fastrtps { namespace rtps { /* Regression Test for improving gaps processing @@ -114,7 +112,7 @@ TEST(StatefulReaderTests, RTPSCorrectGAPProcessing) } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima int main( diff --git a/test/unittest/rtps/reader/WriterProxyAcknackTests.cpp b/test/unittest/rtps/reader/WriterProxyAcknackTests.cpp index 157625870cc..572e228e6d7 100644 --- a/test/unittest/rtps/reader/WriterProxyAcknackTests.cpp +++ b/test/unittest/rtps/reader/WriterProxyAcknackTests.cpp @@ -32,7 +32,7 @@ #include "../../common/operators.hpp" namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { TEST(WriterProxyAcknackTests, AcknackBackoff) @@ -81,7 +81,7 @@ TEST(WriterProxyAcknackTests, AcknackBackoff) } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima int main( diff --git a/test/unittest/rtps/reader/WriterProxyStopTest.cpp b/test/unittest/rtps/reader/WriterProxyStopTest.cpp index c1bcad78c6a..86836829823 100644 --- a/test/unittest/rtps/reader/WriterProxyStopTest.cpp +++ b/test/unittest/rtps/reader/WriterProxyStopTest.cpp @@ -28,8 +28,8 @@ namespace testing { namespace internal { -using namespace eprosima::fastrtps::rtps; -using namespace eprosima::fastrtps; +using namespace eprosima::fastdds::rtps; +using namespace eprosima::fastdds; class WriterProxyTest : public WriterProxy { @@ -39,7 +39,7 @@ class WriterProxyTest : public WriterProxy StatefulReader* reader, const RemoteLocatorsAllocationAttributes& loc_alloc, const ResourceLimitedContainerConfig& changes_allocation, - eprosima::fastrtps::rtps::ResourceEvent& service, + eprosima::fastdds::rtps::ResourceEvent& service, std::promise& promise) : WriterProxy(reader, loc_alloc, changes_allocation) , reader_(reader) @@ -84,7 +84,7 @@ class WriterProxyTest : public WriterProxy } // namespace testing namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { /** @@ -94,8 +94,8 @@ namespace rtps { TEST(WriterProxyTests, WriterProxyStop) { // Create actual events service - eprosima::fastrtps::rtps::ResourceEvent* service; - service = new eprosima::fastrtps::rtps::ResourceEvent(); + eprosima::fastdds::rtps::ResourceEvent* service; + service = new eprosima::fastdds::rtps::ResourceEvent(); service->init_thread(); // Synchronization primitives @@ -122,7 +122,7 @@ TEST(WriterProxyTests, WriterProxyStop) } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima int main( diff --git a/test/unittest/rtps/reader/WriterProxyTests.cpp b/test/unittest/rtps/reader/WriterProxyTests.cpp index 7e9aea92e94..f5434df3fc3 100644 --- a/test/unittest/rtps/reader/WriterProxyTests.cpp +++ b/test/unittest/rtps/reader/WriterProxyTests.cpp @@ -32,7 +32,7 @@ #include "../../common/operators.hpp" namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { TEST(WriterProxyTests, MissingChangesUpdate) @@ -687,7 +687,7 @@ TEST(WriterProxyTests, IrrelevantChangeSet) } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima int main( diff --git a/test/unittest/rtps/resources/timedevent/TimedEventTests.cpp b/test/unittest/rtps/resources/timedevent/TimedEventTests.cpp index 6c4c62506b6..680151e4402 100644 --- a/test/unittest/rtps/resources/timedevent/TimedEventTests.cpp +++ b/test/unittest/rtps/resources/timedevent/TimedEventTests.cpp @@ -27,7 +27,7 @@ class TimedEventEnvironment : public ::testing::Environment void SetUp() { - service_ = new eprosima::fastrtps::rtps::ResourceEvent(); + service_ = new eprosima::fastdds::rtps::ResourceEvent(); service_->init_thread(); } @@ -36,7 +36,7 @@ class TimedEventEnvironment : public ::testing::Environment delete service_; } - eprosima::fastrtps::rtps::ResourceEvent* service_; + eprosima::fastdds::rtps::ResourceEvent* service_; }; TimedEventEnvironment* const env = @@ -375,7 +375,7 @@ TEST(TimedEventMultithread, Event_FourAutoRestart) TEST(TimedEventMultithread, PendingRaceCheck) { - using TimedEvent = eprosima::fastrtps::rtps::TimedEvent; + using TimedEvent = eprosima::fastdds::rtps::TimedEvent; using TimeClock = std::chrono::high_resolution_clock; using TimePoint = std::chrono::time_point; @@ -454,7 +454,7 @@ TEST(TimedEventMultithread, PendingRaceCheck) */ TEST(TimedEvent, Event_UnregisterEventWithinCallbackOfAnotherEvent) { - using TimedEvent = eprosima::fastrtps::rtps::TimedEvent; + using TimedEvent = eprosima::fastdds::rtps::TimedEvent; constexpr auto expiration_ms = std::chrono::milliseconds(100); std::atomic_bool success(false); diff --git a/test/unittest/rtps/resources/timedevent/mock/MockEvent.cpp b/test/unittest/rtps/resources/timedevent/mock/MockEvent.cpp index f3fb6d6443b..70ba0d338c9 100644 --- a/test/unittest/rtps/resources/timedevent/mock/MockEvent.cpp +++ b/test/unittest/rtps/resources/timedevent/mock/MockEvent.cpp @@ -14,10 +14,10 @@ #include "MockEvent.h" -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; MockEvent::MockEvent( - eprosima::fastrtps::rtps::ResourceEvent& service, + ResourceEvent& service, double milliseconds, bool autorestart, std::function inner_callback) diff --git a/test/unittest/rtps/resources/timedevent/mock/MockEvent.h b/test/unittest/rtps/resources/timedevent/mock/MockEvent.h index 22b000fbcd4..77f3c500d40 100644 --- a/test/unittest/rtps/resources/timedevent/mock/MockEvent.h +++ b/test/unittest/rtps/resources/timedevent/mock/MockEvent.h @@ -28,14 +28,14 @@ class MockEvent public: MockEvent( - eprosima::fastrtps::rtps::ResourceEvent& service, + eprosima::fastdds::rtps::ResourceEvent& service, double milliseconds, bool autorestart, std::function inner_callback = {}); virtual ~MockEvent(); - eprosima::fastrtps::rtps::TimedEvent& event() + eprosima::fastdds::rtps::TimedEvent& event() { return event_; } @@ -58,7 +58,7 @@ class MockEvent std::condition_variable sem_cond_; bool autorestart_; std::function inner_callback_; - eprosima::fastrtps::rtps::TimedEvent event_; + eprosima::fastdds::rtps::TimedEvent event_; }; #endif // _TEST_RTPS_RESOURCES_TIMEDEVENT_MOCKEVENT_H_ diff --git a/test/unittest/rtps/security/SecurityTests.hpp b/test/unittest/rtps/security/SecurityTests.hpp index 2e15efdc839..d2e79594446 100644 --- a/test/unittest/rtps/security/SecurityTests.hpp +++ b/test/unittest/rtps/security/SecurityTests.hpp @@ -33,8 +33,8 @@ #include #include -using namespace eprosima::fastrtps::rtps; -using namespace eprosima::fastrtps::rtps::security; +using namespace eprosima::fastdds::rtps; +using namespace eprosima::fastdds::rtps::security; using namespace ::testing; class SecurityTest; diff --git a/test/unittest/rtps/writer/LivelinessManagerTests.cpp b/test/unittest/rtps/writer/LivelinessManagerTests.cpp index c484e694c0c..67305448ea6 100644 --- a/test/unittest/rtps/writer/LivelinessManagerTests.cpp +++ b/test/unittest/rtps/writer/LivelinessManagerTests.cpp @@ -37,8 +37,8 @@ class LivelinessManagerTests : public ::testing::Test { service_.init_thread(); - writer_losing_liveliness = eprosima::fastrtps::rtps::GUID_t(); - writer_recovering_liveliness = eprosima::fastrtps::rtps::GUID_t(); + writer_losing_liveliness = eprosima::fastdds::rtps::GUID_t(); + writer_recovering_liveliness = eprosima::fastdds::rtps::GUID_t(); num_writers_lost = 0; num_writers_recovered = 0; } @@ -51,14 +51,14 @@ class LivelinessManagerTests : public ::testing::Test { } - eprosima::fastrtps::rtps::ResourceEvent service_; + eprosima::fastdds::rtps::ResourceEvent service_; // Callback to test the liveliness manager void liveliness_changed( - eprosima::fastrtps::rtps::GUID_t guid, + eprosima::fastdds::rtps::GUID_t guid, const eprosima::fastdds::dds::LivelinessQosPolicyKind&, - const eprosima::fastrtps::Duration_t&, + const eprosima::fastdds::Duration_t&, int alive_change, int not_alive_change) { @@ -98,8 +98,8 @@ class LivelinessManagerTests : public ::testing::Test }); } - eprosima::fastrtps::rtps::GUID_t writer_losing_liveliness; - eprosima::fastrtps::rtps::GUID_t writer_recovering_liveliness; + eprosima::fastdds::rtps::GUID_t writer_losing_liveliness; + eprosima::fastdds::rtps::GUID_t writer_recovering_liveliness; unsigned int num_writers_lost; unsigned int num_writers_recovered; @@ -110,12 +110,12 @@ class LivelinessManagerTests : public ::testing::Test }; namespace eprosima { -namespace fastrtps { +namespace fastdds { -using eprosima::fastrtps::rtps::LivelinessData; -using eprosima::fastrtps::rtps::LivelinessManager; -using eprosima::fastrtps::rtps::GuidPrefix_t; -using eprosima::fastrtps::rtps::GUID_t; +using rtps::LivelinessData; +using rtps::LivelinessManager; +using rtps::GuidPrefix_t; +using rtps::GUID_t; TEST_F(LivelinessManagerTests, WriterCanAlwaysBeAdded) { @@ -513,7 +513,7 @@ TEST_F(LivelinessManagerTests, TimerOwnerRemoved) EXPECT_EQ(num_writers_lost, 1u); } -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima int main( diff --git a/test/unittest/rtps/writer/RTPSWriterTests.cpp b/test/unittest/rtps/writer/RTPSWriterTests.cpp index 391cd53033a..93db18a890c 100644 --- a/test/unittest/rtps/writer/RTPSWriterTests.cpp +++ b/test/unittest/rtps/writer/RTPSWriterTests.cpp @@ -23,7 +23,7 @@ namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { using namespace testing; @@ -174,7 +174,7 @@ TEST(RTPSWriterTests, WriterWithCustomPayloadPool_DoesNotInitializePool_WhenDyna } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima namespace eprosima { @@ -182,10 +182,10 @@ namespace fastcdr { template<> size_t calculate_serialized_size( eprosima::fastcdr::CdrSizeCalculator&, - const eprosima::fastrtps::rtps::TestDataType&, + const eprosima::fastdds::rtps::TestDataType&, size_t& current_alignment) { - size_t calculated_size {eprosima::fastrtps::rtps::TestDataType::data_size}; + size_t calculated_size {eprosima::fastdds::rtps::TestDataType::data_size}; current_alignment += calculated_size; return calculated_size; } diff --git a/test/unittest/rtps/writer/ReaderProxyTests.cpp b/test/unittest/rtps/writer/ReaderProxyTests.cpp index ee043032d4e..2731a3a87d4 100644 --- a/test/unittest/rtps/writer/ReaderProxyTests.cpp +++ b/test/unittest/rtps/writer/ReaderProxyTests.cpp @@ -19,9 +19,8 @@ #include #include -//using namespace eprosima::fastrtps::rtps; namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { TEST(ReaderProxyTests, find_change_test) @@ -415,7 +414,7 @@ TEST(ReaderProxyTests, acknack_count) } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima int main( diff --git a/test/unittest/security/accesscontrol/AccessControlTests.cpp b/test/unittest/security/accesscontrol/AccessControlTests.cpp index 780da7a05e7..8c232ff5af0 100644 --- a/test/unittest/security/accesscontrol/AccessControlTests.cpp +++ b/test/unittest/security/accesscontrol/AccessControlTests.cpp @@ -27,8 +27,8 @@ #include #include -using namespace eprosima::fastrtps::rtps; -using namespace eprosima::fastrtps::rtps::security; +using namespace eprosima::fastdds::rtps; +using namespace eprosima::fastdds::rtps::security; static const char* certs_path = nullptr; @@ -48,7 +48,7 @@ class AccessControlTest : public ::testing::Test AccessControlTest() { - static eprosima::fastrtps::rtps::security::OpenSSLInit openssl_init; + static eprosima::fastdds::rtps::security::OpenSSLInit openssl_init; } void fill_common_participant_security_attributes( diff --git a/test/unittest/security/accesscontrol/DistinguishedNameTests.cpp b/test/unittest/security/accesscontrol/DistinguishedNameTests.cpp index 489c4e74fd3..ff1df0e1bff 100644 --- a/test/unittest/security/accesscontrol/DistinguishedNameTests.cpp +++ b/test/unittest/security/accesscontrol/DistinguishedNameTests.cpp @@ -18,7 +18,7 @@ #include -using namespace eprosima::fastrtps::rtps::security; +using namespace eprosima::fastdds::rtps::security; namespace test { diff --git a/test/unittest/security/authentication/AuthenticationPluginTests.hpp b/test/unittest/security/authentication/AuthenticationPluginTests.hpp index 3ffa460cc4e..038e9cb8bfa 100644 --- a/test/unittest/security/authentication/AuthenticationPluginTests.hpp +++ b/test/unittest/security/authentication/AuthenticationPluginTests.hpp @@ -44,37 +44,37 @@ class AuthenticationPluginTest : public ::testing::Test AuthenticationPluginTest() { - static eprosima::fastrtps::rtps::security::OpenSSLInit openssl_init; + static eprosima::fastdds::rtps::security::OpenSSLInit openssl_init; } - static eprosima::fastrtps::rtps::PropertyPolicy get_valid_policy(); - static eprosima::fastrtps::rtps::PropertyPolicy get_wrong_policy(); - static eprosima::fastrtps::rtps::IdentityToken generate_remote_identity_token_ok( - const eprosima::fastrtps::rtps::security::IdentityHandle& local_identity_handle); + static eprosima::fastdds::rtps::PropertyPolicy get_valid_policy(); + static eprosima::fastdds::rtps::PropertyPolicy get_wrong_policy(); + static eprosima::fastdds::rtps::IdentityToken generate_remote_identity_token_ok( + const eprosima::fastdds::rtps::security::IdentityHandle& local_identity_handle); static void check_local_identity_handle( - const eprosima::fastrtps::rtps::security::IdentityHandle& handle); + const eprosima::fastdds::rtps::security::IdentityHandle& handle); static void check_remote_identity_handle( - const eprosima::fastrtps::rtps::security::IdentityHandle& handle); + const eprosima::fastdds::rtps::security::IdentityHandle& handle); static void check_handshake_request_message( - const eprosima::fastrtps::rtps::security::HandshakeHandle& handle, - const eprosima::fastrtps::rtps::security::HandshakeMessageToken& message); + const eprosima::fastdds::rtps::security::HandshakeHandle& handle, + const eprosima::fastdds::rtps::security::HandshakeMessageToken& message); static void check_handshake_reply_message( - const eprosima::fastrtps::rtps::security::HandshakeHandle& handle, - const eprosima::fastrtps::rtps::security::HandshakeMessageToken& message, - const eprosima::fastrtps::rtps::security::HandshakeMessageToken& request_message); + const eprosima::fastdds::rtps::security::HandshakeHandle& handle, + const eprosima::fastdds::rtps::security::HandshakeMessageToken& message, + const eprosima::fastdds::rtps::security::HandshakeMessageToken& request_message); static void check_handshake_final_message( - const eprosima::fastrtps::rtps::security::HandshakeHandle& handle, - const eprosima::fastrtps::rtps::security::HandshakeMessageToken& message, - const eprosima::fastrtps::rtps::security::HandshakeMessageToken& reply_message); + const eprosima::fastdds::rtps::security::HandshakeHandle& handle, + const eprosima::fastdds::rtps::security::HandshakeMessageToken& message, + const eprosima::fastdds::rtps::security::HandshakeMessageToken& reply_message); static void check_shared_secrets( - const eprosima::fastrtps::rtps::security::SecretHandle& sharedsecret1, - const eprosima::fastrtps::rtps::security::SecretHandle& sharedsecret2); + const eprosima::fastdds::rtps::security::SecretHandle& sharedsecret1, + const eprosima::fastdds::rtps::security::SecretHandle& sharedsecret2); - eprosima::fastrtps::rtps::security::PKIDH plugin; + eprosima::fastdds::rtps::security::PKIDH plugin; }; void fill_candidate_participant_key( - eprosima::fastrtps::rtps::GUID_t& candidate_participant_key) + eprosima::fastdds::rtps::GUID_t& candidate_participant_key) { candidate_participant_key.guidPrefix.value[0] = 1; candidate_participant_key.guidPrefix.value[1] = 2; @@ -96,14 +96,14 @@ void fill_candidate_participant_key( TEST_F(AuthenticationPluginTest, validate_local_identity_validation_ok) { - eprosima::fastrtps::rtps::security::IdentityHandle* local_identity_handle = nullptr; - eprosima::fastrtps::rtps::GUID_t adjusted_participant_key; + eprosima::fastdds::rtps::security::IdentityHandle* local_identity_handle = nullptr; + eprosima::fastdds::rtps::GUID_t adjusted_participant_key; uint32_t domain_id = 0; - eprosima::fastrtps::rtps::RTPSParticipantAttributes participant_attr; - eprosima::fastrtps::rtps::GUID_t candidate_participant_key; - eprosima::fastrtps::rtps::security::SecurityException exception; - eprosima::fastrtps::rtps::security::ValidationResult_t result = - eprosima::fastrtps::rtps::security::ValidationResult_t::VALIDATION_FAILED; + eprosima::fastdds::rtps::RTPSParticipantAttributes participant_attr; + eprosima::fastdds::rtps::GUID_t candidate_participant_key; + eprosima::fastdds::rtps::security::SecurityException exception; + eprosima::fastdds::rtps::security::ValidationResult_t result = + eprosima::fastdds::rtps::security::ValidationResult_t::VALIDATION_FAILED; fill_candidate_participant_key(candidate_participant_key); participant_attr.properties = AuthenticationPluginTest::get_valid_policy(); @@ -115,24 +115,24 @@ TEST_F(AuthenticationPluginTest, validate_local_identity_validation_ok) candidate_participant_key, exception); - ASSERT_TRUE(result == eprosima::fastrtps::rtps::security::ValidationResult_t::VALIDATION_OK); + ASSERT_TRUE(result == eprosima::fastdds::rtps::security::ValidationResult_t::VALIDATION_OK); ASSERT_TRUE(local_identity_handle != nullptr); AuthenticationPluginTest::check_local_identity_handle(*local_identity_handle); - ASSERT_TRUE(adjusted_participant_key != eprosima::fastrtps::rtps::GUID_t::unknown()); + ASSERT_TRUE(adjusted_participant_key != eprosima::fastdds::rtps::GUID_t::unknown()); ASSERT_TRUE(plugin.return_identity_handle(local_identity_handle, exception)); } TEST_F(AuthenticationPluginTest, validate_local_identity_wrong_validation) { - eprosima::fastrtps::rtps::security::IdentityHandle* local_identity_handle = nullptr; - eprosima::fastrtps::rtps::GUID_t adjusted_participant_key; + eprosima::fastdds::rtps::security::IdentityHandle* local_identity_handle = nullptr; + eprosima::fastdds::rtps::GUID_t adjusted_participant_key; uint32_t domain_id = 0; - eprosima::fastrtps::rtps::RTPSParticipantAttributes participant_attr; - eprosima::fastrtps::rtps::GUID_t candidate_participant_key; - eprosima::fastrtps::rtps::security::SecurityException exception; - eprosima::fastrtps::rtps::security::ValidationResult_t result = - eprosima::fastrtps::rtps::security::ValidationResult_t::VALIDATION_FAILED; + eprosima::fastdds::rtps::RTPSParticipantAttributes participant_attr; + eprosima::fastdds::rtps::GUID_t candidate_participant_key; + eprosima::fastdds::rtps::security::SecurityException exception; + eprosima::fastdds::rtps::security::ValidationResult_t result = + eprosima::fastdds::rtps::security::ValidationResult_t::VALIDATION_FAILED; fill_candidate_participant_key(candidate_participant_key); participant_attr.properties = get_wrong_policy(); @@ -144,22 +144,22 @@ TEST_F(AuthenticationPluginTest, validate_local_identity_wrong_validation) candidate_participant_key, exception); - ASSERT_TRUE(result == eprosima::fastrtps::rtps::security::ValidationResult_t::VALIDATION_FAILED); + ASSERT_TRUE(result == eprosima::fastdds::rtps::security::ValidationResult_t::VALIDATION_FAILED); ASSERT_TRUE(local_identity_handle == nullptr); - ASSERT_TRUE(adjusted_participant_key == eprosima::fastrtps::rtps::GUID_t::unknown()); + ASSERT_TRUE(adjusted_participant_key == eprosima::fastdds::rtps::GUID_t::unknown()); } TEST_F(AuthenticationPluginTest, handshake_process_ok) { - using namespace eprosima::fastrtps::rtps::security; + using namespace eprosima::fastdds::rtps::security; IdentityHandle* local_identity_handle1 = nullptr; - eprosima::fastrtps::rtps::GUID_t adjusted_participant_key1; - eprosima::fastrtps::rtps::GUID_t adjusted_participant_key2; + eprosima::fastdds::rtps::GUID_t adjusted_participant_key1; + eprosima::fastdds::rtps::GUID_t adjusted_participant_key2; uint32_t domain_id = 0; - eprosima::fastrtps::rtps::RTPSParticipantAttributes participant_attr; - eprosima::fastrtps::rtps::GUID_t candidate_participant_key1; - eprosima::fastrtps::rtps::GUID_t candidate_participant_key2; + eprosima::fastdds::rtps::RTPSParticipantAttributes participant_attr; + eprosima::fastdds::rtps::GUID_t candidate_participant_key1; + eprosima::fastdds::rtps::GUID_t candidate_participant_key2; SecurityException exception; ValidationResult_t result = ValidationResult_t::VALIDATION_FAILED; @@ -190,9 +190,9 @@ TEST_F(AuthenticationPluginTest, handshake_process_ok) AuthenticationPluginTest::check_local_identity_handle(*local_identity_handle2); IdentityHandle* remote_identity_handle1 = nullptr; - eprosima::fastrtps::rtps::IdentityToken remote_identity_token1 = generate_remote_identity_token_ok( + eprosima::fastdds::rtps::IdentityToken remote_identity_token1 = generate_remote_identity_token_ok( *local_identity_handle1); - eprosima::fastrtps::rtps::GUID_t remote_participant_key; + eprosima::fastdds::rtps::GUID_t remote_participant_key; result = plugin.validate_remote_identity(&remote_identity_handle1, *local_identity_handle1, @@ -204,7 +204,7 @@ TEST_F(AuthenticationPluginTest, handshake_process_ok) AuthenticationPluginTest::check_remote_identity_handle(*remote_identity_handle1); IdentityHandle* remote_identity_handle2 = nullptr; - eprosima::fastrtps::rtps::IdentityToken remote_identity_token2 = generate_remote_identity_token_ok( + eprosima::fastdds::rtps::IdentityToken remote_identity_token2 = generate_remote_identity_token_ok( *local_identity_handle2); result = plugin.validate_remote_identity(&remote_identity_handle2, @@ -218,11 +218,11 @@ TEST_F(AuthenticationPluginTest, handshake_process_ok) HandshakeHandle* handshake_handle = nullptr; HandshakeMessageToken* handshake_message = nullptr; - eprosima::fastrtps::rtps::ParticipantProxyData participant_data1(eprosima::fastrtps::rtps:: + eprosima::fastdds::rtps::ParticipantProxyData participant_data1(eprosima::fastdds::rtps:: c_default_RTPSParticipantAllocationAttributes); participant_data1.m_guid = adjusted_participant_key1; - eprosima::fastrtps::rtps::CDRMessage_t auxMsg(RTPSMESSAGE_DEFAULT_SIZE); - auxMsg.msg_endian = eprosima::fastrtps::rtps::BIGEND; + eprosima::fastdds::rtps::CDRMessage_t auxMsg(RTPSMESSAGE_DEFAULT_SIZE); + auxMsg.msg_endian = eprosima::fastdds::rtps::BIGEND; ASSERT_TRUE(participant_data1.writeToCDRMessage(&auxMsg, false)); result = plugin.begin_handshake_request(&handshake_handle, @@ -239,7 +239,7 @@ TEST_F(AuthenticationPluginTest, handshake_process_ok) HandshakeHandle* handshake_handle_reply = nullptr; HandshakeMessageToken* handshake_message_reply = nullptr; - eprosima::fastrtps::rtps::ParticipantProxyData participant_data2(eprosima::fastrtps::rtps:: + eprosima::fastdds::rtps::ParticipantProxyData participant_data2(eprosima::fastdds::rtps:: c_default_RTPSParticipantAllocationAttributes); participant_data2.m_guid = adjusted_participant_key2; diff --git a/test/unittest/security/authentication/BuiltinPKIDHTests.cpp b/test/unittest/security/authentication/BuiltinPKIDHTests.cpp index cde5952192d..ec7a4181286 100644 --- a/test/unittest/security/authentication/BuiltinPKIDHTests.cpp +++ b/test/unittest/security/authentication/BuiltinPKIDHTests.cpp @@ -32,8 +32,8 @@ #define IS_OPENSSL_1_1 0 #endif // if OPENSSL_VERSION_NUMBER >= 0x10100000L -using namespace eprosima::fastrtps::rtps; -using namespace eprosima::fastrtps::rtps::security; +using namespace eprosima::fastdds::rtps; +using namespace eprosima::fastdds::rtps::security; static const char* certs_path = nullptr; diff --git a/test/unittest/security/cryptography/CryptographyPluginTests.hpp b/test/unittest/security/cryptography/CryptographyPluginTests.hpp index 43b3a109cee..40319c916d5 100644 --- a/test/unittest/security/cryptography/CryptographyPluginTests.hpp +++ b/test/unittest/security/cryptography/CryptographyPluginTests.hpp @@ -34,18 +34,18 @@ class CryptographyPluginTest : public ::testing::Test protected: // Mock the handles to avoid cast issues - using SharedSecretHandle = eprosima::fastrtps::rtps::security::MockAuthenticationPlugin::SharedSecretHandle; - using PKIIdentityHandle = eprosima::fastrtps::rtps::security::MockAuthenticationPlugin::PKIIdentityHandle; + using SharedSecretHandle = eprosima::fastdds::rtps::security::MockAuthenticationPlugin::SharedSecretHandle; + using PKIIdentityHandle = eprosima::fastdds::rtps::security::MockAuthenticationPlugin::PKIIdentityHandle; using AccessPermissionsHandle = - eprosima::fastrtps::rtps::security::MockAccessControlPlugin::AccessPermissionsHandle; + eprosima::fastdds::rtps::security::MockAccessControlPlugin::AccessPermissionsHandle; virtual void SetUp() { - using namespace eprosima::fastrtps::rtps::security; + using namespace eprosima::fastdds::rtps::security; - eprosima::fastrtps::rtps::PropertyPolicy m_propertypolicy; + eprosima::fastdds::rtps::PropertyPolicy m_propertypolicy; - CryptoPlugin = new eprosima::fastrtps::rtps::security::AESGCMGMAC(); + CryptoPlugin = new eprosima::fastdds::rtps::security::AESGCMGMAC(); // Delegate SharedSecret creation to an actual implementation ON_CALL(auth_plugin, get_shared_secret) @@ -94,14 +94,14 @@ class CryptographyPluginTest : public ::testing::Test { } - eprosima::fastrtps::rtps::security::AESGCMGMAC* CryptoPlugin; - ::testing::NiceMock auth_plugin; - ::testing::NiceMock access_plugin; + eprosima::fastdds::rtps::security::AESGCMGMAC* CryptoPlugin; + ::testing::NiceMock auth_plugin; + ::testing::NiceMock access_plugin; }; TEST_F(CryptographyPluginTest, factory_CreateLocalParticipantHandle) { - using namespace eprosima::fastrtps::rtps::security; + using namespace eprosima::fastdds::rtps::security; SecurityException exception; @@ -111,7 +111,7 @@ TEST_F(CryptographyPluginTest, factory_CreateLocalParticipantHandle) AccessPermissionsHandle& perm_handle = AccessPermissionsHandle::narrow(*access_plugin.get_permissions_handle(exception)); - eprosima::fastrtps::rtps::PropertySeq prop_handle; + eprosima::fastdds::rtps::PropertySeq prop_handle; ParticipantSecurityAttributes part_sec_attr; part_sec_attr.is_rtps_protected = true; @@ -195,7 +195,7 @@ TEST_F(CryptographyPluginTest, factory_CreateLocalParticipantHandle) TEST_F(CryptographyPluginTest, factory_RegisterRemoteParticipant) { - using namespace eprosima::fastrtps::rtps::security; + using namespace eprosima::fastdds::rtps::security; SecurityException exception; @@ -205,7 +205,7 @@ TEST_F(CryptographyPluginTest, factory_RegisterRemoteParticipant) AccessPermissionsHandle& perm_handle = AccessPermissionsHandle::narrow(*access_plugin.get_permissions_handle(exception)); - eprosima::fastrtps::rtps::PropertySeq prop_handle; + eprosima::fastdds::rtps::PropertySeq prop_handle; ParticipantSecurityAttributes part_sec_attr; std::shared_ptr secret = @@ -289,7 +289,7 @@ TEST_F(CryptographyPluginTest, factory_RegisterRemoteParticipant) TEST_F(CryptographyPluginTest, exchange_CDRSerializenDeserialize){ - using namespace eprosima::fastrtps::rtps::security; + using namespace eprosima::fastdds::rtps::security; SecurityException exception; @@ -299,7 +299,7 @@ TEST_F(CryptographyPluginTest, exchange_CDRSerializenDeserialize){ AccessPermissionsHandle& perm_handle = AccessPermissionsHandle::narrow(*access_plugin.get_permissions_handle(exception)); - eprosima::fastrtps::rtps::PropertySeq prop_handle; + eprosima::fastdds::rtps::PropertySeq prop_handle; ParticipantSecurityAttributes part_sec_attr; part_sec_attr.is_rtps_protected = true; @@ -335,7 +335,7 @@ TEST_F(CryptographyPluginTest, exchange_CDRSerializenDeserialize){ TEST_F(CryptographyPluginTest, exchange_ParticipantCryptoTokens) { - using namespace eprosima::fastrtps::rtps::security; + using namespace eprosima::fastdds::rtps::security; SecurityException exception; @@ -345,7 +345,7 @@ TEST_F(CryptographyPluginTest, exchange_ParticipantCryptoTokens) AccessPermissionsHandle& perm_handle = AccessPermissionsHandle::narrow(*access_plugin.get_permissions_handle(exception)); - eprosima::fastrtps::rtps::PropertySeq prop_handle; + eprosima::fastdds::rtps::PropertySeq prop_handle; ParticipantSecurityAttributes part_sec_attr; std::shared_ptr secret = @@ -446,7 +446,7 @@ TEST_F(CryptographyPluginTest, exchange_ParticipantCryptoTokens) TEST_F(CryptographyPluginTest, transform_RTPSMessage) { - using namespace eprosima::fastrtps::rtps::security; + using namespace eprosima::fastdds::rtps::security; SecurityException exception; @@ -456,7 +456,7 @@ TEST_F(CryptographyPluginTest, transform_RTPSMessage) AccessPermissionsHandle& perm_handle = AccessPermissionsHandle::narrow(*access_plugin.get_permissions_handle(exception)); - eprosima::fastrtps::rtps::PropertySeq prop_handle; + eprosima::fastdds::rtps::PropertySeq prop_handle; ParticipantSecurityAttributes part_sec_attr; std::shared_ptr secret = @@ -523,9 +523,9 @@ TEST_F(CryptographyPluginTest, transform_RTPSMessage) ParticipantA_CryptoTokens, exception); //Perform sample message exchange - eprosima::fastrtps::rtps::CDRMessage_t plain_rtps_message(RTPSMESSAGE_DEFAULT_SIZE); - eprosima::fastrtps::rtps::CDRMessage_t encoded_rtps_message(RTPSMESSAGE_DEFAULT_SIZE); - eprosima::fastrtps::rtps::CDRMessage_t decoded_rtps_message(RTPSMESSAGE_DEFAULT_SIZE); + eprosima::fastdds::rtps::CDRMessage_t plain_rtps_message(RTPSMESSAGE_DEFAULT_SIZE); + eprosima::fastdds::rtps::CDRMessage_t encoded_rtps_message(RTPSMESSAGE_DEFAULT_SIZE); + eprosima::fastdds::rtps::CDRMessage_t decoded_rtps_message(RTPSMESSAGE_DEFAULT_SIZE); char message[] = "RPTSMessage"; //Length 11 memcpy(plain_rtps_message.buffer, message, 11); @@ -578,11 +578,11 @@ TEST_F(CryptographyPluginTest, transform_RTPSMessage) //Now lets do the same with 128GCM //Fill prop_handle with info about the new mode we want - eprosima::fastrtps::rtps::Property prop1; + eprosima::fastdds::rtps::Property prop1; prop1.name("dds.sec.crypto.keysize"); prop1.value("128"); prop_handle.push_back(prop1); - eprosima::fastrtps::rtps::Property prop2; + eprosima::fastdds::rtps::Property prop2; prop2.name("dds.sec.crypto.maxblockspersession"); prop2.value("16"); prop_handle.push_back(prop2); @@ -644,7 +644,7 @@ TEST_F(CryptographyPluginTest, transform_RTPSMessage) TEST_F(CryptographyPluginTest, factory_CreateLocalWriterHandle) { - using namespace eprosima::fastrtps::rtps::security; + using namespace eprosima::fastdds::rtps::security; SecurityException exception; @@ -654,7 +654,7 @@ TEST_F(CryptographyPluginTest, factory_CreateLocalWriterHandle) AccessPermissionsHandle& perm_handle = AccessPermissionsHandle::narrow(*access_plugin.get_permissions_handle(exception)); - eprosima::fastrtps::rtps::PropertySeq prop_handle; + eprosima::fastdds::rtps::PropertySeq prop_handle; ParticipantSecurityAttributes part_sec_attr; EndpointSecurityAttributes sec_attrs; @@ -722,7 +722,7 @@ TEST_F(CryptographyPluginTest, factory_CreateLocalWriterHandle) TEST_F(CryptographyPluginTest, factory_CreateLocalReaderHandle) { - using namespace eprosima::fastrtps::rtps::security; + using namespace eprosima::fastdds::rtps::security; SecurityException exception; @@ -732,7 +732,7 @@ TEST_F(CryptographyPluginTest, factory_CreateLocalReaderHandle) AccessPermissionsHandle& perm_handle = AccessPermissionsHandle::narrow(*access_plugin.get_permissions_handle(exception)); - eprosima::fastrtps::rtps::PropertySeq prop_handle; + eprosima::fastdds::rtps::PropertySeq prop_handle; ParticipantSecurityAttributes part_sec_attr; EndpointSecurityAttributes sec_attrs; @@ -800,7 +800,7 @@ TEST_F(CryptographyPluginTest, factory_CreateLocalReaderHandle) TEST_F(CryptographyPluginTest, factory_RegisterRemoteReaderWriter) { - using namespace eprosima::fastrtps::rtps::security; + using namespace eprosima::fastdds::rtps::security; SecurityException exception; @@ -810,7 +810,7 @@ TEST_F(CryptographyPluginTest, factory_RegisterRemoteReaderWriter) AccessPermissionsHandle& perm_handle = AccessPermissionsHandle::narrow(*access_plugin.get_permissions_handle(exception)); - eprosima::fastrtps::rtps::PropertySeq prop_handle; + eprosima::fastdds::rtps::PropertySeq prop_handle; ParticipantSecurityAttributes part_sec_attr; EndpointSecurityAttributes sec_attrs; @@ -903,7 +903,7 @@ TEST_F(CryptographyPluginTest, factory_RegisterRemoteReaderWriter) TEST_F(CryptographyPluginTest, exchange_ReaderWriterCryptoTokens) { - using namespace eprosima::fastrtps::rtps::security; + using namespace eprosima::fastdds::rtps::security; // Participant A owns Writer // Participant B owns Reader @@ -916,7 +916,7 @@ TEST_F(CryptographyPluginTest, exchange_ReaderWriterCryptoTokens) AccessPermissionsHandle& perm_handle = AccessPermissionsHandle::narrow(*access_plugin.get_permissions_handle(exception)); - eprosima::fastrtps::rtps::PropertySeq prop_handle; + eprosima::fastdds::rtps::PropertySeq prop_handle; ParticipantSecurityAttributes part_sec_attr; EndpointSecurityAttributes sec_attrs; @@ -1054,7 +1054,7 @@ TEST_F(CryptographyPluginTest, exchange_ReaderWriterCryptoTokens) TEST_F(CryptographyPluginTest, transform_SerializedPayload) { - using namespace eprosima::fastrtps::rtps::security; + using namespace eprosima::fastdds::rtps::security; // Participant A owns Writer // Participant B owns Reader @@ -1067,7 +1067,7 @@ TEST_F(CryptographyPluginTest, transform_SerializedPayload) AccessPermissionsHandle& perm_handle = AccessPermissionsHandle::narrow(*access_plugin.get_permissions_handle(exception)); - eprosima::fastrtps::rtps::PropertySeq prop_handle; + eprosima::fastdds::rtps::PropertySeq prop_handle; ParticipantSecurityAttributes part_sec_attr; EndpointSecurityAttributes sec_attrs; @@ -1169,10 +1169,10 @@ TEST_F(CryptographyPluginTest, transform_SerializedPayload) exception); //Perform sample message exchange - eprosima::fastrtps::rtps::SerializedPayload_t plain_payload(18); // Message will have 18 length. - eprosima::fastrtps::rtps::SerializedPayload_t encoded_payload(100); + eprosima::fastdds::rtps::SerializedPayload_t plain_payload(18); // Message will have 18 length. + eprosima::fastdds::rtps::SerializedPayload_t encoded_payload(100); // Message will have 18 length + cipher block size. - eprosima::fastrtps::rtps::SerializedPayload_t decoded_payload(18 + 32); + eprosima::fastdds::rtps::SerializedPayload_t decoded_payload(18 + 32); char message[] = "My goose is cooked"; //Length 18 memcpy(plain_payload.data, message, 18); @@ -1205,11 +1205,11 @@ TEST_F(CryptographyPluginTest, transform_SerializedPayload) CryptoPlugin->keyfactory()->unregister_participant(ParticipantB_remote, exception); //Lets do it with the 128 version - eprosima::fastrtps::rtps::Property prop1; + eprosima::fastdds::rtps::Property prop1; prop1.name("dds.sec.crypto.keysize"); prop1.value("128"); prop_handle.push_back(prop1); - eprosima::fastrtps::rtps::Property prop2; + eprosima::fastdds::rtps::Property prop2; prop2.name("dds.sec.crypto.maxblockspersession"); prop2.value("16"); prop_handle.push_back(prop2); @@ -1286,7 +1286,7 @@ TEST_F(CryptographyPluginTest, transform_SerializedPayload) TEST_F(CryptographyPluginTest, transform_Writer_Submesage) { - using namespace eprosima::fastrtps::rtps::security; + using namespace eprosima::fastdds::rtps::security; SecurityException exception; @@ -1296,7 +1296,7 @@ TEST_F(CryptographyPluginTest, transform_Writer_Submesage) AccessPermissionsHandle& perm_handle = AccessPermissionsHandle::narrow(*access_plugin.get_permissions_handle(exception)); - eprosima::fastrtps::rtps::PropertySeq prop_handle; + eprosima::fastdds::rtps::PropertySeq prop_handle; ParticipantSecurityAttributes part_sec_attr; EndpointSecurityAttributes sec_attrs; @@ -1431,11 +1431,11 @@ TEST_F(CryptographyPluginTest, transform_Writer_Submesage) CryptoPlugin->keyfactory()->unregister_participant(ParticipantB_remote, exception); //Test the GCM128 version - eprosima::fastrtps::rtps::Property prop1; + eprosima::fastdds::rtps::Property prop1; prop1.name("dds.sec.crypto.keysize"); prop1.value("128"); prop_handle.push_back(prop1); - eprosima::fastrtps::rtps::Property prop2; + eprosima::fastdds::rtps::Property prop2; prop2.name("dds.sec.crypto.maxblockspersession"); prop2.value("16"); prop_handle.push_back(prop2); @@ -1519,7 +1519,7 @@ TEST_F(CryptographyPluginTest, transform_Writer_Submesage) TEST_F(CryptographyPluginTest, transform_Reader_Submessage) { - using namespace eprosima::fastrtps::rtps::security; + using namespace eprosima::fastdds::rtps::security; SecurityException exception; @@ -1529,7 +1529,7 @@ TEST_F(CryptographyPluginTest, transform_Reader_Submessage) AccessPermissionsHandle& perm_handle = AccessPermissionsHandle::narrow(*access_plugin.get_permissions_handle(exception)); - eprosima::fastrtps::rtps::PropertySeq prop_handle; + eprosima::fastdds::rtps::PropertySeq prop_handle; ParticipantSecurityAttributes part_sec_attr; EndpointSecurityAttributes sec_attrs; @@ -1663,11 +1663,11 @@ TEST_F(CryptographyPluginTest, transform_Reader_Submessage) CryptoPlugin->keyfactory()->unregister_participant(ParticipantB_remote, exception); //Test the GCM128 version - eprosima::fastrtps::rtps::Property prop1; + eprosima::fastdds::rtps::Property prop1; prop1.name("dds.sec.crypto.keysize"); prop1.value("128"); prop_handle.push_back(prop1); - eprosima::fastrtps::rtps::Property prop2; + eprosima::fastdds::rtps::Property prop2; prop2.name("dds.sec.crypto.maxblockspersession"); prop2.value("16"); prop_handle.push_back(prop2); @@ -1752,7 +1752,7 @@ TEST_F(CryptographyPluginTest, transform_Reader_Submessage) TEST_F(CryptographyPluginTest, transform_preprocess_secure_submessage) { - using namespace eprosima::fastrtps::rtps::security; + using namespace eprosima::fastdds::rtps::security; SecurityException exception; @@ -1762,7 +1762,7 @@ TEST_F(CryptographyPluginTest, transform_preprocess_secure_submessage) AccessPermissionsHandle& perm_handle = AccessPermissionsHandle::narrow(*access_plugin.get_permissions_handle(exception)); - eprosima::fastrtps::rtps::PropertySeq prop_handle; + eprosima::fastdds::rtps::PropertySeq prop_handle; ParticipantSecurityAttributes part_sec_attr; EndpointSecurityAttributes sec_attrs; @@ -1880,9 +1880,9 @@ TEST_F(CryptographyPluginTest, transform_preprocess_secure_submessage) ASSERT_TRUE( P_B->Readers.size() == 1); //Perform sample message exchange - eprosima::fastrtps::rtps::CDRMessage_t plain_payload(RTPSMESSAGE_DEFAULT_SIZE); - eprosima::fastrtps::rtps::CDRMessage_t encoded_datareader_payload(RTPSMESSAGE_DEFAULT_SIZE); - eprosima::fastrtps::rtps::CDRMessage_t encoded_datawriter_payload(RTPSMESSAGE_DEFAULT_SIZE); + eprosima::fastdds::rtps::CDRMessage_t plain_payload(RTPSMESSAGE_DEFAULT_SIZE); + eprosima::fastdds::rtps::CDRMessage_t encoded_datareader_payload(RTPSMESSAGE_DEFAULT_SIZE); + eprosima::fastdds::rtps::CDRMessage_t encoded_datawriter_payload(RTPSMESSAGE_DEFAULT_SIZE); char message[] = "My goose is cooked"; //Length 18 memcpy(plain_payload.buffer, message, 18); diff --git a/test/unittest/security/cryptography/builtinAESGCMGMACTests.cpp b/test/unittest/security/cryptography/builtinAESGCMGMACTests.cpp index 18f7993577a..967cd0a138f 100644 --- a/test/unittest/security/cryptography/builtinAESGCMGMACTests.cpp +++ b/test/unittest/security/cryptography/builtinAESGCMGMACTests.cpp @@ -18,7 +18,7 @@ #include "security/OpenSSLInit.hpp" TEST_F(CryptographyPluginTest, mocktest){ - static eprosima::fastrtps::rtps::security::OpenSSLInit openssl_init; + static eprosima::fastdds::rtps::security::OpenSSLInit openssl_init; uint8_t mock = 7; ASSERT_TRUE(mock == 7); diff --git a/test/unittest/security/logging/LoggingPluginTests.hpp b/test/unittest/security/logging/LoggingPluginTests.hpp index d7ddb44a8ee..8161ee70d1e 100644 --- a/test/unittest/security/logging/LoggingPluginTests.hpp +++ b/test/unittest/security/logging/LoggingPluginTests.hpp @@ -29,7 +29,7 @@ class LoggingPluginTest : public ::testing::Test virtual void SetUp() { - plugin = new eprosima::fastrtps::rtps::security::LogTopic(); + plugin = new eprosima::fastdds::rtps::security::LogTopic(); ASSERT_NE(nullptr, plugin); } @@ -44,7 +44,7 @@ class LoggingPluginTest : public ::testing::Test LoggingPluginTest() = default; ~LoggingPluginTest() = default; - eprosima::fastrtps::rtps::security::Logging* plugin = nullptr; + eprosima::fastdds::rtps::security::Logging* plugin = nullptr; const std::string security_log_filename = "security_logs.log"; @@ -56,13 +56,13 @@ constexpr long LoggingPluginTest::NUM_LOG_LEVELS; TEST_F(LoggingPluginTest, DefaultBehavior) { - eprosima::fastrtps::rtps::security::SecurityException exception; + eprosima::fastdds::rtps::security::SecurityException exception; // Options not set EXPECT_FALSE(plugin->options_set()); - eprosima::fastrtps::rtps::security::LogOptions log_options; + eprosima::fastdds::rtps::security::LogOptions log_options; EXPECT_FALSE(plugin->get_log_options(log_options, exception)) << exception.what(); EXPECT_FALSE(plugin->enable_logging(exception)) << exception.what(); @@ -95,13 +95,13 @@ TEST_F(LoggingPluginTest, AsyncFileLogging) // First remove previous executions file std::remove(security_log_filename.c_str()); - eprosima::fastrtps::rtps::security::LogOptions log_options; + eprosima::fastdds::rtps::security::LogOptions log_options; log_options.distribute = false; log_options.log_file = security_log_filename; - log_options.log_level = eprosima::fastrtps::rtps::security::LoggingLevel::DEBUG_LEVEL; + log_options.log_level = eprosima::fastdds::rtps::security::LoggingLevel::DEBUG_LEVEL; - eprosima::fastrtps::rtps::security::SecurityException exception; + eprosima::fastdds::rtps::security::SecurityException exception; // plugin->set_domain_id(); // plugin->set_guid(); @@ -117,7 +117,7 @@ TEST_F(LoggingPluginTest, AsyncFileLogging) threads.emplace_back(new std::thread([this, i, &exception] { plugin->log( - static_cast(i), + static_cast(i), std::string("Report from thread ") + std::to_string(i), "Logging,fileloggingtest", exception); diff --git a/test/unittest/statistics/dds/StatisticsDomainParticipantMockTests/mock/statistics/fastdds/publisher/PublisherImpl.hpp b/test/unittest/statistics/dds/StatisticsDomainParticipantMockTests/mock/statistics/fastdds/publisher/PublisherImpl.hpp index 90cfd731f66..06f77abe4ef 100644 --- a/test/unittest/statistics/dds/StatisticsDomainParticipantMockTests/mock/statistics/fastdds/publisher/PublisherImpl.hpp +++ b/test/unittest/statistics/dds/StatisticsDomainParticipantMockTests/mock/statistics/fastdds/publisher/PublisherImpl.hpp @@ -66,7 +66,7 @@ class PublisherImpl : public efd::PublisherImpl const efd::TypeSupport& type, efd::Topic* topic, const efd::DataWriterQos& qos, - const eprosima::fastrtps::rtps::EntityId_t& entity_id) + const eprosima::fastdds::rtps::EntityId_t& entity_id) { return new DataWriterImpl(this, type, topic, qos, entity_id); } @@ -76,7 +76,7 @@ class PublisherImpl : public efd::PublisherImpl efd::Topic* topic, const efd::DataWriterQos& qos, efd::DataWriterListener* listener, - std::shared_ptr payload_pool) override + std::shared_ptr payload_pool) override { return new DataWriterImpl(this, type, topic, qos, listener, payload_pool, statistics_listener_); } diff --git a/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests.cpp b/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests.cpp index e5b5bc30bb7..5e17855eedb 100644 --- a/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests.cpp +++ b/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests.cpp @@ -43,13 +43,13 @@ class TopicDataTypeMock : public eprosima::fastdds::dds::TopicDataType bool serialize( void* /*data*/, - eprosima::fastrtps::rtps::SerializedPayload_t* /*payload*/) override + eprosima::fastdds::rtps::SerializedPayload_t* /*payload*/) override { return true; } bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* /*payload*/, + eprosima::fastdds::rtps::SerializedPayload_t* /*payload*/, void* /*data*/) override { return true; @@ -76,7 +76,7 @@ class TopicDataTypeMock : public eprosima::fastdds::dds::TopicDataType bool getKey( void* /*data*/, - eprosima::fastrtps::rtps::InstanceHandle_t* /*ihandle*/, + eprosima::fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool /*force_md5*/) override { return true; @@ -127,7 +127,7 @@ class DomainParticipantImplTest : public DomainParticipantImpl } bool monitoring_status( - fastrtps::rtps::GUID_t guid, + fastdds::rtps::GUID_t guid, statistics::MonitorServiceData& status) { return get_monitoring_status(guid, status); diff --git a/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests/mock/fastdds/publisher/DataWriterImpl.hpp b/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests/mock/fastdds/publisher/DataWriterImpl.hpp index 721bd2d51d2..36b4be651d3 100644 --- a/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests/mock/fastdds/publisher/DataWriterImpl.hpp +++ b/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests/mock/fastdds/publisher/DataWriterImpl.hpp @@ -45,7 +45,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class RTPSWriter; @@ -54,10 +54,6 @@ class TimedEvent; } // namespace rtps -} // namespace fastrtps - -namespace fastdds { - #ifdef FASTDDS_STATISTICS namespace statistics { namespace dds { @@ -75,7 +71,7 @@ class Publisher; class DataWriterImpl : protected rtps::IReaderDataFilter { using LoanInitializationKind = DataWriter::LoanInitializationKind; - using CacheChange_t = eprosima::fastrtps::rtps::CacheChange_t; + using CacheChange_t = eprosima::fastdds::rtps::CacheChange_t; class LoanCollection; protected: @@ -89,7 +85,7 @@ class DataWriterImpl : protected rtps::IReaderDataFilter DataWriterImpl() : history_(atts_, 500, - fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE, + fastdds::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE, [](const InstanceHandle_t&) { }) @@ -103,10 +99,10 @@ class DataWriterImpl : protected rtps::IReaderDataFilter Topic*, const DataWriterQos&, DataWriterListener* listener = nullptr, - std::shared_ptr payload_pool = nullptr) + std::shared_ptr payload_pool = nullptr) : history_(atts_, 500, - fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE, + fastdds::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE, [](const InstanceHandle_t&) { }) @@ -121,11 +117,11 @@ class DataWriterImpl : protected rtps::IReaderDataFilter TypeSupport, Topic*, const DataWriterQos&, - const fastrtps::rtps::EntityId_t&, + const fastdds::rtps::EntityId_t&, DataWriterListener* listener = nullptr) : history_(atts_, 500, - fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE, + fastdds::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE, [](const InstanceHandle_t&) { }) @@ -172,7 +168,7 @@ class DataWriterImpl : protected rtps::IReaderDataFilter bool write( void*, - fastrtps::rtps::WriteParams& ) + fastdds::rtps::WriteParams& ) { return true; } @@ -187,7 +183,7 @@ class DataWriterImpl : protected rtps::IReaderDataFilter ReturnCode_t write_w_timestamp( void*, const InstanceHandle_t&, - const fastrtps::Time_t& ) + const fastdds::Time_t& ) { return RETCODE_OK; } @@ -200,7 +196,7 @@ class DataWriterImpl : protected rtps::IReaderDataFilter InstanceHandle_t register_instance_w_timestamp( void*, - const fastrtps::Time_t& ) + const fastdds::Time_t& ) { return InstanceHandle_t(); } @@ -216,7 +212,7 @@ class DataWriterImpl : protected rtps::IReaderDataFilter ReturnCode_t unregister_instance_w_timestamp( void*, const InstanceHandle_t&, - const fastrtps::Time_t&, + const fastdds::Time_t&, bool = false) { return RETCODE_OK; @@ -226,11 +222,11 @@ class DataWriterImpl : protected rtps::IReaderDataFilter { static uint16_t entitiy_id_counter; entitiy_id_counter += 1; - guid_.entityId.value[2] = (fastrtps::rtps::octet)entitiy_id_counter; + guid_.entityId.value[2] = (fastdds::rtps::octet)entitiy_id_counter; guid_.entityId.value[3] = 0x2; } - const fastrtps::rtps::GUID_t& guid() const + const fastdds::rtps::GUID_t& guid() const { return guid_; @@ -238,7 +234,7 @@ class DataWriterImpl : protected rtps::IReaderDataFilter InstanceHandle_t get_instance_handle() const { - return fastrtps::rtps::InstanceHandle_t(); + return fastdds::rtps::InstanceHandle_t(); } TypeSupport get_type() const @@ -247,7 +243,7 @@ class DataWriterImpl : protected rtps::IReaderDataFilter } ReturnCode_t wait_for_acknowledgments( - const fastrtps::Duration_t& ) + const fastdds::Duration_t& ) { return RETCODE_OK; } @@ -255,7 +251,7 @@ class DataWriterImpl : protected rtps::IReaderDataFilter ReturnCode_t wait_for_acknowledgments( void*, const InstanceHandle_t&, - const fastrtps::Duration_t& ) + const fastdds::Duration_t& ) { return RETCODE_OK; } @@ -361,8 +357,8 @@ class DataWriterImpl : protected rtps::IReaderDataFilter } bool is_relevant( - const fastrtps::rtps::CacheChange_t&, - const fastrtps::rtps::GUID_t&) const override + const fastdds::rtps::CacheChange_t&, + const fastdds::rtps::GUID_t&) const override { return true; } @@ -422,10 +418,10 @@ class DataWriterImpl : protected rtps::IReaderDataFilter } //! Pointer to the associated Data Writer. - fastrtps::rtps::RTPSWriter* writer_ = nullptr; + fastdds::rtps::RTPSWriter* writer_ = nullptr; Topic* topic_ = nullptr; Publisher* pub_ = nullptr; - fastrtps::rtps::GUID_t guid_; + fastdds::rtps::GUID_t guid_; DataWriterQos qos_; DataWriter* user_datawriter_ = nullptr; @@ -435,7 +431,7 @@ class DataWriterImpl : protected rtps::IReaderDataFilter OfferedIncompatibleQosStatus offered_incompatible_qos_status_; std::chrono::duration> lifespan_duration_us_; DataWriterHistory history_; - fastrtps::TopicAttributes atts_; + fastdds::TopicAttributes atts_; }; diff --git a/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests/mock/statistics/fastdds/publisher/DataWriterImpl.hpp b/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests/mock/statistics/fastdds/publisher/DataWriterImpl.hpp index 7fb59c56b26..3b497f67c29 100644 --- a/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests/mock/statistics/fastdds/publisher/DataWriterImpl.hpp +++ b/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests/mock/statistics/fastdds/publisher/DataWriterImpl.hpp @@ -47,7 +47,7 @@ class DataWriterImpl : public efd::DataWriterImpl efd::TypeSupport type, efd::Topic* topic, const efd::DataWriterQos& qos, - const eprosima::fastrtps::rtps::EntityId_t& entity_id) + const eprosima::fastdds::rtps::EntityId_t& entity_id) : BaseType(p, type, topic, qos, entity_id, nullptr) { } @@ -58,7 +58,7 @@ class DataWriterImpl : public efd::DataWriterImpl efd::Topic* topic, const efd::DataWriterQos& qos, efd::DataWriterListener* listener, - std::shared_ptr payload_pool, + std::shared_ptr payload_pool, std::shared_ptr stat_listener) : BaseType(p, type, topic, qos, listener, payload_pool) , statistics_listener_(stat_listener) diff --git a/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests/mock/statistics/fastdds/publisher/PublisherImpl.hpp b/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests/mock/statistics/fastdds/publisher/PublisherImpl.hpp index 6b5f3e54759..a668c05b5ff 100644 --- a/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests/mock/statistics/fastdds/publisher/PublisherImpl.hpp +++ b/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests/mock/statistics/fastdds/publisher/PublisherImpl.hpp @@ -66,7 +66,7 @@ class PublisherImpl : public efd::PublisherImpl const efd::TypeSupport& type, efd::Topic* topic, const efd::DataWriterQos& qos, - const eprosima::fastrtps::rtps::EntityId_t& entity_id) + const eprosima::fastdds::rtps::EntityId_t& entity_id) { return new DataWriterImpl(this, type, topic, qos, entity_id); } @@ -76,7 +76,7 @@ class PublisherImpl : public efd::PublisherImpl efd::Topic* topic, const efd::DataWriterQos& qos, efd::DataWriterListener* listener, - std::shared_ptr payload_pool) override + std::shared_ptr payload_pool) override { return new DataWriterImpl(this, type, topic, qos, listener, payload_pool, statistics_listener_); } @@ -94,7 +94,7 @@ class PublisherImpl : public efd::PublisherImpl } bool insert_policy_violation( - const fastrtps::rtps::GUID_t& guid, + const fastdds::rtps::GUID_t& guid, const fastdds::dds::QosPolicyId_t& policy_id) { bool retcode = false; diff --git a/test/unittest/statistics/dds/StatisticsDomainParticipantTests.cpp b/test/unittest/statistics/dds/StatisticsDomainParticipantTests.cpp index eccbaf80977..bff5914b2d7 100644 --- a/test/unittest/statistics/dds/StatisticsDomainParticipantTests.cpp +++ b/test/unittest/statistics/dds/StatisticsDomainParticipantTests.cpp @@ -88,13 +88,13 @@ class TopicDataTypeMock : public eprosima::fastdds::dds::TopicDataType bool serialize( void* /*data*/, - fastrtps::rtps::SerializedPayload_t* /*payload*/) override + fastdds::rtps::SerializedPayload_t* /*payload*/) override { return true; } bool deserialize( - fastrtps::rtps::SerializedPayload_t* /*payload*/, + fastdds::rtps::SerializedPayload_t* /*payload*/, void* /*data*/) override { return true; @@ -121,7 +121,7 @@ class TopicDataTypeMock : public eprosima::fastdds::dds::TopicDataType bool getKey( void* /*data*/, - fastrtps::rtps::InstanceHandle_t* /*ihandle*/, + fastdds::rtps::InstanceHandle_t* /*ihandle*/, bool /*force_md5*/) override { return true; diff --git a/test/unittest/statistics/dds/StatisticsQosTests.cpp b/test/unittest/statistics/dds/StatisticsQosTests.cpp index aaad09d88ba..a1558b28c67 100644 --- a/test/unittest/statistics/dds/StatisticsQosTests.cpp +++ b/test/unittest/statistics/dds/StatisticsQosTests.cpp @@ -126,7 +126,7 @@ TEST(StatisticsQosTests, StatisticsDataWriterQosTest) { EXPECT_EQ(STATISTICS_DATAWRITER_QOS.reliability().kind, eprosima::fastdds::dds::RELIABLE_RELIABILITY_QOS); EXPECT_EQ(STATISTICS_DATAWRITER_QOS.durability().kind, eprosima::fastdds::dds::TRANSIENT_LOCAL_DURABILITY_QOS); - const std::string* pushMode_property = eprosima::fastrtps::rtps::PropertyPolicyHelper::find_property( + const std::string* pushMode_property = eprosima::fastdds::rtps::PropertyPolicyHelper::find_property( STATISTICS_DATAWRITER_QOS.properties(), "fastdds.push_mode"); ASSERT_NE(pushMode_property, nullptr); EXPECT_EQ(pushMode_property->compare("false"), 0); @@ -344,7 +344,7 @@ TEST_F(StatisticsFromXMLProfileTests, XMLConfigurationForStatisticsDataWritersQo // Expected QoS construction for Subscription_Throughput topic: efd::DataWriterQos qos4; qos4.reliability().kind = eprosima::fastdds::dds::ReliabilityQosPolicyKind::BEST_EFFORT_RELIABILITY_QOS; - eprosima::fastrtps::rtps::Property property; + eprosima::fastdds::rtps::Property property; property.name("partitions"); std::string partitions = "part1;part2"; property.value(std::move(partitions)); diff --git a/test/unittest/statistics/rtps/MonitorServiceTests.cpp b/test/unittest/statistics/rtps/MonitorServiceTests.cpp index 06b895ed3e4..fb1d34a6749 100644 --- a/test/unittest/statistics/rtps/MonitorServiceTests.cpp +++ b/test/unittest/statistics/rtps/MonitorServiceTests.cpp @@ -31,14 +31,14 @@ namespace rtps { struct MockStatusQueryable : public IStatusQueryable { MOCK_METHOD2(get_monitoring_status, bool ( - const fastrtps::rtps::GUID_t& guid, + const fastdds::rtps::GUID_t& guid, MonitorServiceData & status)); }; struct MockConnectionsQueryable : public IConnectionsQueryable { MOCK_METHOD2(get_entity_connections, bool( - const fastrtps::rtps::GUID_t& guid, + const fastdds::rtps::GUID_t& guid, ConnectionList & conns_list)); }; @@ -46,11 +46,11 @@ struct MockProxyQueryable : public IProxyQueryable { MOCK_METHOD1(get_all_local_proxies, bool( - std::vector& guids)); + std::vector& guids)); MOCK_METHOD2(get_serialized_proxy, bool( - const fastrtps::rtps::GUID_t& guid, - fastrtps::rtps::CDRMessage_t* msg)); + const fastdds::rtps::GUID_t& guid, + fastdds::rtps::CDRMessage_t* msg)); }; @@ -63,23 +63,23 @@ class MonitorServiceTests : public ::testing::Test : listener_(&monitor_srv_) , n_local_entities(5) , monitor_srv_( - fastrtps::rtps::GUID_t(), + fastdds::rtps::GUID_t(), &mock_proxy_q_, &mock_conns_q_, mock_status_q_, - [&](fastrtps::rtps::RTPSWriter**, - fastrtps::rtps::WriterAttributes&, - const std::shared_ptr&, - fastrtps::rtps::WriterHistory*, - fastrtps::rtps::WriterListener*, - const fastrtps::rtps::EntityId_t&, + [&](fastdds::rtps::RTPSWriter**, + fastdds::rtps::WriterAttributes&, + const std::shared_ptr&, + fastdds::rtps::WriterHistory*, + fastdds::rtps::WriterListener*, + const fastdds::rtps::EntityId_t&, bool)->bool { return true; }, [&]( - fastrtps::rtps::RTPSWriter*, - const fastrtps::TopicAttributes&, + fastdds::rtps::RTPSWriter*, + const fastdds::TopicAttributes&, const fastdds::dds::WriterQos&)->bool { return true; @@ -95,15 +95,15 @@ class MonitorServiceTests : public ::testing::Test mock_guids.reserve(n_local_entities); ON_CALL(mock_proxy_q_, get_all_local_proxies(::testing::_)).WillByDefault(testing::Invoke( - [this](std::vector& guids) + [this](std::vector& guids) { guids.reserve(n_local_entities); mock_guids.reserve(n_local_entities); for (size_t i = 1; i <= static_cast(n_local_entities); i++) { - fastrtps::rtps::GUID_t guid; - guid.entityId.value[3] = (fastrtps::rtps::octet)i; + fastdds::rtps::GUID_t guid; + guid.entityId.value[3] = (fastdds::rtps::octet)i; guids.push_back(guid); mock_guids.push_back(guid); } @@ -111,14 +111,14 @@ class MonitorServiceTests : public ::testing::Test })); ON_CALL(mock_proxy_q_, get_serialized_proxy(::testing::_, ::testing::_)).WillByDefault(testing::Invoke( - [](const fastrtps::rtps::GUID_t&, - fastrtps::rtps::CDRMessage_t*) + [](const fastdds::rtps::GUID_t&, + fastdds::rtps::CDRMessage_t*) { return true; })); ON_CALL(mock_conns_q_, get_entity_connections(::testing::_, ::testing::_)).WillByDefault(testing::Invoke( - [](const fastrtps::rtps::GUID_t&, + [](const fastdds::rtps::GUID_t&, ConnectionList&) { return true; @@ -145,9 +145,9 @@ class MonitorServiceTests : public ::testing::Test testing::NiceMock mock_proxy_q_; MonitorServiceListener listener_; int n_local_entities; - std::vector mock_guids; - fastrtps::rtps::ResourceEvent mock_event_resource_; - testing::NiceMock writer; + std::vector mock_guids; + fastdds::rtps::ResourceEvent mock_event_resource_; + testing::NiceMock writer; MonitorService monitor_srv_; }; diff --git a/test/unittest/statistics/rtps/RTPSStatisticsTests.cpp b/test/unittest/statistics/rtps/RTPSStatisticsTests.cpp index b033179bd49..627b8b5525e 100644 --- a/test/unittest/statistics/rtps/RTPSStatisticsTests.cpp +++ b/test/unittest/statistics/rtps/RTPSStatisticsTests.cpp @@ -56,12 +56,12 @@ namespace fastdds { namespace statistics { namespace rtps { -class RTPSParticipantMock : public fastrtps::rtps::RTPSParticipant +class RTPSParticipantMock : public fastdds::rtps::RTPSParticipant { public: - fastrtps::rtps::RTPSParticipantImpl* get_impl() + fastdds::rtps::RTPSParticipantImpl* get_impl() { return mp_impl; } @@ -178,7 +178,7 @@ class RTPSStatisticsTestsImpl TransportFilter&&) = delete; bool operator ()( - fastrtps::rtps::CDRMessage_t& msg) const noexcept + fastdds::rtps::CDRMessage_t& msg) const noexcept { try { @@ -193,37 +193,37 @@ class RTPSStatisticsTestsImpl }; - std::map filters_; + std::map filters_; protected: - fastrtps::rtps::WriterHistory* writer_history_ = nullptr; - fastrtps::rtps::ReaderHistory* reader_history_ = nullptr; + fastdds::rtps::WriterHistory* writer_history_ = nullptr; + fastdds::rtps::ReaderHistory* reader_history_ = nullptr; - fastrtps::rtps::RTPSParticipant* participant_ = nullptr; - fastrtps::rtps::RTPSWriter* writer_ = nullptr; - fastrtps::rtps::RTPSReader* reader_ = nullptr; + fastdds::rtps::RTPSParticipant* participant_ = nullptr; + fastdds::rtps::RTPSWriter* writer_ = nullptr; + fastdds::rtps::RTPSReader* reader_ = nullptr; // Getters and setters for the transport filter using filter = fastdds::rtps::test_UDPv4TransportDescriptor::filter; template void set_transport_filter( - fastrtps::rtps::SubmessageId id, + fastdds::rtps::SubmessageId id, F f) noexcept { filters_[id].external_filter_ = f; } void set_transport_filter( - fastrtps::rtps::SubmessageId id, + fastdds::rtps::SubmessageId id, std::nullptr_t) noexcept { filters_[id].external_filter_ = nullptr; } test_Descriptor::filter get_transport_filter( - fastrtps::rtps::SubmessageId id) noexcept + fastdds::rtps::SubmessageId id) noexcept { return filters_[id].external_filter_; } @@ -232,7 +232,7 @@ class RTPSStatisticsTestsImpl void create_participant() { - using namespace fastrtps::rtps; + using namespace fastdds::rtps; // create the participant RTPSParticipantAttributes p_attr; @@ -266,7 +266,7 @@ class RTPSStatisticsTestsImpl void remove_participant() { - using namespace fastrtps::rtps; + using namespace fastdds::rtps; // Remove the endpoints destroy_endpoints(); @@ -277,10 +277,10 @@ class RTPSStatisticsTestsImpl void create_reader( uint32_t payloadMaxSize, - fastrtps::rtps::ReliabilityKind_t reliability_qos = fastrtps::rtps::ReliabilityKind_t::RELIABLE, - fastrtps::rtps::DurabilityKind_t durability_qos = fastrtps::rtps::DurabilityKind_t::VOLATILE) + fastdds::rtps::ReliabilityKind_t reliability_qos = fastdds::rtps::ReliabilityKind_t::RELIABLE, + fastdds::rtps::DurabilityKind_t durability_qos = fastdds::rtps::DurabilityKind_t::VOLATILE) { - using namespace fastrtps::rtps; + using namespace fastdds::rtps; HistoryAttributes history_attributes; history_attributes.payloadMaxSize = payloadMaxSize; @@ -301,10 +301,10 @@ class RTPSStatisticsTestsImpl void create_writer( uint32_t payloadMaxSize, - fastrtps::rtps::ReliabilityKind_t reliability_qos = fastrtps::rtps::ReliabilityKind_t::RELIABLE, - fastrtps::rtps::DurabilityKind_t durability_qos = fastrtps::rtps::DurabilityKind_t::TRANSIENT_LOCAL) + fastdds::rtps::ReliabilityKind_t reliability_qos = fastdds::rtps::ReliabilityKind_t::RELIABLE, + fastdds::rtps::DurabilityKind_t durability_qos = fastdds::rtps::DurabilityKind_t::TRANSIENT_LOCAL) { - using namespace fastrtps::rtps; + using namespace fastdds::rtps; HistoryAttributes history_attributes; history_attributes.payloadMaxSize = payloadMaxSize; @@ -321,10 +321,10 @@ class RTPSStatisticsTestsImpl void create_lazy_writer( uint32_t payloadMaxSize, - fastrtps::rtps::ReliabilityKind_t reliability_qos = fastrtps::rtps::ReliabilityKind_t::RELIABLE, - fastrtps::rtps::DurabilityKind_t durability_qos = fastrtps::rtps::DurabilityKind_t::TRANSIENT_LOCAL) + fastdds::rtps::ReliabilityKind_t reliability_qos = fastdds::rtps::ReliabilityKind_t::RELIABLE, + fastdds::rtps::DurabilityKind_t durability_qos = fastdds::rtps::DurabilityKind_t::TRANSIENT_LOCAL) { - using namespace fastrtps::rtps; + using namespace fastdds::rtps; HistoryAttributes history_attributes; history_attributes.payloadMaxSize = payloadMaxSize; @@ -343,7 +343,7 @@ class RTPSStatisticsTestsImpl void create_endpoints( uint32_t payloadMaxSize, - fastrtps::rtps::ReliabilityKind_t reliability_qos = fastrtps::rtps::ReliabilityKind_t::RELIABLE) + fastdds::rtps::ReliabilityKind_t reliability_qos = fastdds::rtps::ReliabilityKind_t::RELIABLE) { create_reader(payloadMaxSize, reliability_qos); create_writer(payloadMaxSize, reliability_qos); @@ -354,8 +354,8 @@ class RTPSStatisticsTestsImpl fastcdr::string_255 data_type, fastcdr::string_255 topic_name) { - using namespace fastrtps; - using namespace fastrtps::rtps; + using namespace fastdds; + using namespace fastdds::rtps; TopicAttributes Tatt; Tatt.topicKind = key ? TopicKind_t::WITH_KEY : TopicKind_t::NO_KEY; @@ -382,7 +382,7 @@ class RTPSStatisticsTestsImpl void destroy_endpoints() { - using namespace fastrtps::rtps; + using namespace fastdds::rtps; if (nullptr != writer_ ) { @@ -404,7 +404,7 @@ class RTPSStatisticsTestsImpl void write_small_sample( uint32_t length) { - using namespace fastrtps::rtps; + using namespace fastdds::rtps; ASSERT_NE(nullptr, writer_); @@ -429,7 +429,7 @@ class RTPSStatisticsTestsImpl uint32_t length, uint16_t fragment_size) { - using namespace fastrtps::rtps; + using namespace fastdds::rtps; ASSERT_NE(nullptr, writer_); @@ -462,12 +462,12 @@ class RTPSStatisticsTests // Sets up the test fixture. void SetUp() override { - using namespace fastrtps; + using namespace fastdds; // Intraprocess must be disable in order to receive DATA callbacks LibrarySettings att; att.intraprocess_delivery = INTRAPROCESS_OFF; - fastrtps::rtps::RTPSDomain::set_library_settings(att); + fastdds::rtps::RTPSDomain::set_library_settings(att); create_participant(); } @@ -489,7 +489,7 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_listener_management) { // Check API add and remove interfaces using namespace std; - using namespace fastrtps::rtps; + using namespace fastdds::rtps; // Create the testing endpoints create_endpoints(255); @@ -587,8 +587,8 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_listener_management) TEST_F(RTPSStatisticsTests, statistics_rpts_listener_callbacks) { using namespace ::testing; - using namespace fastrtps; - using namespace fastrtps::rtps; + using namespace fastdds; + using namespace fastdds::rtps; using namespace std; std::atomic samples_filtered{0}; @@ -596,7 +596,7 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_listener_callbacks) // make sure some messages are lost to assure the RESENT_DATAS callback set_transport_filter( DATA, - [&samples_filtered](fastrtps::rtps::CDRMessage_t& msg)-> bool + [&samples_filtered](fastdds::rtps::CDRMessage_t& msg)-> bool { uint32_t old_pos = msg.pos; @@ -765,8 +765,8 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_listener_callbacks) TEST_F(RTPSStatisticsTests, statistics_rpts_listener_callbacks_fragmented) { using namespace ::testing; - using namespace fastrtps; - using namespace fastrtps::rtps; + using namespace fastdds; + using namespace fastdds::rtps; using namespace std; // payload size @@ -776,7 +776,7 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_listener_callbacks_fragmented) // make sure some messages are lost to assure the NACKFRAG callback set_transport_filter( DATA_FRAG, - [](fastrtps::rtps::CDRMessage_t& msg)-> bool + [](fastdds::rtps::CDRMessage_t& msg)-> bool { static uint32_t max_fragment = 0; static bool keep_filtering = true; @@ -784,7 +784,7 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_listener_callbacks_fragmented) uint32_t fragmentNum = 0; uint32_t old_pos = msg.pos; msg.pos += 20; - fastrtps::rtps::CDRMessage::readUInt32(&msg, &fragmentNum); + fastdds::rtps::CDRMessage::readUInt32(&msg, &fragmentNum); msg.pos = old_pos; // generate losses only on the first burst @@ -865,14 +865,14 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_listener_callbacks_fragmented) TEST_F(RTPSStatisticsTests, statistics_rpts_listener_callbacks_no_enabled_writers) { using namespace ::testing; - using namespace fastrtps; - using namespace fastrtps::rtps; + using namespace fastdds; + using namespace fastdds::rtps; using namespace std; // make sure some messages are lost to assure the RESENT_DATAS callback set_transport_filter( DATA, - [](fastrtps::rtps::CDRMessage_t& msg)-> bool + [](fastdds::rtps::CDRMessage_t& msg)-> bool { static unsigned int samples_filtered = 0; uint32_t old_pos = msg.pos; @@ -1015,8 +1015,8 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_listener_callbacks_no_enabled_writer TEST_F(RTPSStatisticsTests, statistics_rpts_listener_gap_callback) { using namespace ::testing; - using namespace fastrtps; - using namespace fastrtps::rtps; + using namespace fastdds; + using namespace fastdds::rtps; using namespace std; uint32_t enable_writers_mask = @@ -1096,8 +1096,8 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_listener_gap_callback) TEST_F(RTPSStatisticsTests, statistics_rpts_listener_discovery_callbacks) { using namespace ::testing; - using namespace fastrtps; - using namespace fastrtps::rtps; + using namespace fastdds; + using namespace fastdds::rtps; using namespace std; uint32_t enable_writers_mask = @@ -1162,8 +1162,8 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_listener_discovery_callbacks) TEST_F(RTPSStatisticsTests, statistics_rpts_avoid_empty_resent_callbacks) { using namespace ::testing; - using namespace fastrtps; - using namespace fastrtps::rtps; + using namespace fastdds; + using namespace fastdds::rtps; using namespace std; // The history must be cleared after the acknack is received @@ -1173,7 +1173,7 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_avoid_empty_resent_callbacks) // filter out all user DATAs set_transport_filter( DATA, - [](fastrtps::rtps::CDRMessage_t& msg)-> bool + [](fastdds::rtps::CDRMessage_t& msg)-> bool { uint32_t old_pos = msg.pos; @@ -1196,7 +1196,7 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_avoid_empty_resent_callbacks) set_transport_filter( ACKNACK, - [&acknack_sent](fastrtps::rtps::CDRMessage_t& msg)-> bool + [&acknack_sent](fastdds::rtps::CDRMessage_t& msg)-> bool { uint32_t old_pos = msg.pos; @@ -1279,8 +1279,8 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_avoid_empty_resent_callbacks) TEST_F(RTPSStatisticsTests, statistics_rpts_unordered_datagrams) { using namespace ::testing; - using namespace fastrtps; - using namespace fastrtps::rtps; + using namespace fastdds; + using namespace fastdds::rtps; using namespace std; using test_UDPv4Transport = eprosima::fastdds::rtps::test_UDPv4Transport; @@ -1313,7 +1313,7 @@ TEST_F(RTPSStatisticsTests, statistics_rpts_unordered_datagrams) test_UDPv4Transport::test_UDPv4Transport_DropLogLength = num_messages; set_transport_filter( DATA_FRAG, - [](fastrtps::rtps::CDRMessage_t& msg)-> bool + [](fastdds::rtps::CDRMessage_t& msg)-> bool { uint32_t old_pos = msg.pos; diff --git a/test/unittest/statistics/rtps/mock/Publisher/fastdds/publisher/DataWriterHistory.hpp b/test/unittest/statistics/rtps/mock/Publisher/fastdds/publisher/DataWriterHistory.hpp index ef28c734513..b9cbca05ac0 100644 --- a/test/unittest/statistics/rtps/mock/Publisher/fastdds/publisher/DataWriterHistory.hpp +++ b/test/unittest/statistics/rtps/mock/Publisher/fastdds/publisher/DataWriterHistory.hpp @@ -26,7 +26,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { class TopicAttributes; @@ -35,10 +35,7 @@ namespace rtps { class WriteParams; } // namespace rtps -} // namespace fastrtps - -namespace fastdds { namespace dds { class DomainParticipant; @@ -48,32 +45,32 @@ class DataWriterListener; class Topic; -static fastrtps::rtps::HistoryAttributes to_history_attributes( - const fastrtps::TopicAttributes&, +static fastdds::rtps::HistoryAttributes to_history_attributes( + const fastdds::TopicAttributes&, uint32_t, - fastrtps::rtps::MemoryManagementPolicy_t) + fastdds::rtps::MemoryManagementPolicy_t) { - return fastrtps::rtps::HistoryAttributes(); + return fastdds::rtps::HistoryAttributes(); } -class DataWriterHistory : public fastrtps::rtps::WriterHistory +class DataWriterHistory : public fastdds::rtps::WriterHistory { public: DataWriterHistory( - const fastrtps::TopicAttributes& topic_att, + const fastdds::TopicAttributes& topic_att, uint32_t payloadMaxSize, - fastrtps::rtps::MemoryManagementPolicy_t mempolicy, - std::function) + fastdds::rtps::MemoryManagementPolicy_t mempolicy, + std::function) : WriterHistory(to_history_attributes(topic_att, payloadMaxSize, mempolicy)) { } MOCK_METHOD4(add_pub_change, bool( - fastrtps::rtps::CacheChange_t*, - fastrtps::rtps::WriteParams&, - std::unique_lock&, + fastdds::rtps::CacheChange_t*, + fastdds::rtps::WriteParams&, + std::unique_lock&, const std::chrono::time_point&)); }; diff --git a/test/unittest/statistics/rtps/mock/StatisticsBase/statistics/rtps/StatisticsBase.hpp b/test/unittest/statistics/rtps/mock/StatisticsBase/statistics/rtps/StatisticsBase.hpp index 8f2b04b0f27..64da738da7c 100644 --- a/test/unittest/statistics/rtps/mock/StatisticsBase/statistics/rtps/StatisticsBase.hpp +++ b/test/unittest/statistics/rtps/mock/StatisticsBase/statistics/rtps/StatisticsBase.hpp @@ -36,27 +36,27 @@ namespace statistics { // auxiliary conversion functions detail::Locator_s to_statistics_type( - fastrtps::rtps::Locator_t locator) + fastdds::rtps::Locator_t locator) { return *reinterpret_cast(&locator); } -fastrtps::rtps::Locator_t to_fastdds_type( +fastdds::rtps::Locator_t to_fastdds_type( detail::Locator_s locator) { - return *reinterpret_cast(&locator); + return *reinterpret_cast(&locator); } detail::GUID_s to_statistics_type( - fastrtps::rtps::GUID_t guid) + fastdds::rtps::GUID_t guid) { return *reinterpret_cast(&guid); } -fastrtps::rtps::GUID_t to_fastdds_type( +fastdds::rtps::GUID_t to_fastdds_type( detail::GUID_s guid) { - return *reinterpret_cast(&guid); + return *reinterpret_cast(&guid); } #endif // FASTDDS_STATISTICS diff --git a/test/unittest/statistics/rtps/mock/StatisticsBase/statistics/rtps/monitor-service/MonitorService.hpp b/test/unittest/statistics/rtps/mock/StatisticsBase/statistics/rtps/monitor-service/MonitorService.hpp index ca6d5036af7..8ebf5374e2e 100644 --- a/test/unittest/statistics/rtps/mock/StatisticsBase/statistics/rtps/monitor-service/MonitorService.hpp +++ b/test/unittest/statistics/rtps/mock/StatisticsBase/statistics/rtps/monitor-service/MonitorService.hpp @@ -52,32 +52,32 @@ class MonitorService public: - using endpoint_creator_t = std::function&, - fastrtps::rtps::WriterHistory*, - fastrtps::rtps::WriterListener*, - const fastrtps::rtps::EntityId_t&, + using endpoint_creator_t = std::function&, + fastdds::rtps::WriterHistory*, + fastdds::rtps::WriterListener*, + const fastdds::rtps::EntityId_t&, bool)>; using endpoint_registrator_t = std::function; MonitorService( - const fastrtps::rtps::GUID_t& guid, + const fastdds::rtps::GUID_t& guid, IProxyQueryable* proxy_q, IConnectionsQueryable* conns_q, IStatusQueryable& status_q, endpoint_creator_t endpoint_creator, endpoint_registrator_t endpoint_registrator, - fastrtps::rtps::ResourceEvent& event_service); + fastdds::rtps::ResourceEvent& event_service); void set_writer( - fastrtps::rtps::RTPSWriter* writer) + fastdds::rtps::RTPSWriter* writer) { - status_writer_ = static_cast(writer); + status_writer_ = static_cast(writer); } ~MonitorService(); @@ -139,7 +139,7 @@ class MonitorService * @return True if the operation succeeds. */ bool remove_local_entity( - const fastrtps::rtps::EntityId_t& entity_id); + const fastdds::rtps::EntityId_t& entity_id); /** * @brief Adds a new entity status update to the queue @@ -154,7 +154,7 @@ class MonitorService * @return True if the operation succeeds. */ bool push_entity_update( - const fastrtps::rtps::EntityId_t& entity_id, + const fastdds::rtps::EntityId_t& entity_id, const uint32_t& status_id); private: @@ -166,7 +166,7 @@ class MonitorService * @return True if the operation succeeds. */ bool write_status( - const fastrtps::rtps::EntityId_t& entity_id, + const fastdds::rtps::EntityId_t& entity_id, const std::bitset& changed_statuses, const bool& entity_disposed); @@ -204,7 +204,7 @@ class MonitorService * @return true if the entity was correctly initialized */ bool initialize_entity( - const fastrtps::rtps::EntityId_t& entity_id); + const fastdds::rtps::EntityId_t& entity_id); /** * @brief Frees the Payload Pool @@ -218,7 +218,7 @@ class MonitorService std::atomic timer_active_; - const fastrtps::rtps::GUID_t local_participant_guid_; + const fastdds::rtps::GUID_t local_participant_guid_; IProxyQueryable* proxy_queryable_; @@ -231,23 +231,23 @@ class MonitorService //! status id that needs to be updated, alongside //! with a bool that prevents the entity_id from being //! inserted twice. - std::map, bool>> local_entities_; - std::unique_ptr event_; + std::unique_ptr event_; - std::vector changed_entities_; + std::vector changed_entities_; std::mutex mtx_; MonitorServiceListener* listener_; - fastrtps::rtps::StatefulWriter* status_writer_; + fastdds::rtps::StatefulWriter* status_writer_; - std::unique_ptr status_writer_history_; + std::unique_ptr status_writer_history_; - std::shared_ptr status_writer_payload_pool_; + std::shared_ptr status_writer_payload_pool_; endpoint_creator_t endpoint_creator_; diff --git a/test/unittest/transport/SharedMemTests.cpp b/test/unittest/transport/SharedMemTests.cpp index 3457ccefcd0..eb8c78b3371 100644 --- a/test/unittest/transport/SharedMemTests.cpp +++ b/test/unittest/transport/SharedMemTests.cpp @@ -34,8 +34,6 @@ #include #include -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; using namespace eprosima::fastdds; using namespace eprosima::fastdds::rtps; diff --git a/test/unittest/transport/TCPv4Tests.cpp b/test/unittest/transport/TCPv4Tests.cpp index 37bd6cbb068..7511395d987 100644 --- a/test/unittest/transport/TCPv4Tests.cpp +++ b/test/unittest/transport/TCPv4Tests.cpp @@ -35,15 +35,7 @@ #include using namespace eprosima::fastdds; -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; -using MockTCPv4Transport = eprosima::fastdds::rtps::MockTCPv4Transport; -using SendResourceList = eprosima::fastdds::rtps::SendResourceList; -using TCPChannelResourceBasic = eprosima::fastdds::rtps::TCPChannelResourceBasic; -using TCPHeader = eprosima::fastdds::rtps::TCPHeader; -using TCPv4Transport = eprosima::fastdds::rtps::TCPv4Transport; -using TCPv4TransportDescriptor = eprosima::fastdds::rtps::TCPv4TransportDescriptor; -using NetworkBuffer = eprosima::fastdds::rtps::NetworkBuffer; +using namespace eprosima::fastdds::rtps; #if defined(_WIN32) #define GET_PID _getpid @@ -86,8 +78,8 @@ class TCPv4Tests : public ::testing::Test void HELPER_SetDescriptorDefaults(); - eprosima::fastdds::rtps::TCPv4TransportDescriptor descriptor; - eprosima::fastdds::rtps::TCPv4TransportDescriptor descriptorOnlyOutput; + TCPv4TransportDescriptor descriptor; + TCPv4TransportDescriptor descriptorOnlyOutput; std::unique_ptr senderThread; std::unique_ptr receiverThread; }; @@ -189,7 +181,7 @@ TEST_F(TCPv4Tests, opening_and_closing_output_channel) genericOutputChannelLocator.kind = LOCATOR_KIND_TCPv4; genericOutputChannelLocator.port = g_output_port; // arbitrary IPLocator::setLogicalPort(genericOutputChannelLocator, g_output_port); - eprosima::fastdds::rtps::SendResourceList send_resource_list; + SendResourceList send_resource_list; // Then ASSERT_FALSE(transportUnderTest.is_output_channel_open_for(genericOutputChannelLocator)); @@ -216,7 +208,7 @@ TEST_F(TCPv4Tests, opening_and_closing_output_channel_with_listener) // acceptor (no channel resource is created until it receives a connection request). genericOutputChannelLocator.port = g_output_port + 1; IPLocator::setLogicalPort(genericOutputChannelLocator, g_output_port + 1); - eprosima::fastdds::rtps::SendResourceList send_resource_list; + SendResourceList send_resource_list; // Then ASSERT_FALSE(transportUnderTest.is_output_channel_open_for(genericOutputChannelLocator)); @@ -253,12 +245,12 @@ TEST_F(TCPv4Tests, send_and_receive_between_ports) eprosima::fastdds::dds::Log::SetVerbosity(eprosima::fastdds::dds::Log::Kind::Info); std::regex filter("RTCP(?!_SEQ)"); eprosima::fastdds::dds::Log::SetCategoryFilter(filter); - eprosima::fastdds::rtps::TCPv4TransportDescriptor recvDescriptor; + TCPv4TransportDescriptor recvDescriptor; recvDescriptor.add_listener_port(g_default_port); TCPv4Transport receiveTransportUnderTest(recvDescriptor); receiveTransportUnderTest.init(); - eprosima::fastdds::rtps::TCPv4TransportDescriptor sendDescriptor; + TCPv4TransportDescriptor sendDescriptor; TCPv4Transport sendTransportUnderTest(sendDescriptor); sendTransportUnderTest.init(); @@ -281,7 +273,7 @@ TEST_F(TCPv4Tests, send_and_receive_between_ports) MockMessageReceiver* msg_recv = dynamic_cast(receiver.CreateMessageReceiver()); ASSERT_TRUE(receiveTransportUnderTest.IsInputChannelOpen(inputLocator)); - eprosima::fastdds::rtps::SendResourceList send_resource_list; + SendResourceList send_resource_list; ASSERT_TRUE(sendTransportUnderTest.OpenOutputChannel(send_resource_list, outputLocator)); ASSERT_FALSE(send_resource_list.empty()); octet message[5] = { 'H', 'e', 'l', 'l', 'o' }; @@ -333,7 +325,7 @@ TEST_F(TCPv4Tests, send_is_rejected_if_buffer_size_is_bigger_to_size_specified_i genericOutputChannelLocator.kind = LOCATOR_KIND_TCPv4; genericOutputChannelLocator.port = g_output_port; IPLocator::setLogicalPort(genericOutputChannelLocator, 7400); - eprosima::fastdds::rtps::SendResourceList send_resource_list; + SendResourceList send_resource_list; transportUnderTest.OpenOutputChannel(send_resource_list, genericOutputChannelLocator); ASSERT_FALSE(send_resource_list.empty()); @@ -371,7 +363,7 @@ TEST_F(TCPv4Tests, RemoteToMainLocal_simply_strips_out_address_leaving_IP_ANY) ASSERT_EQ(mainLocalLocator.port, remote_locator.port); ASSERT_EQ(mainLocalLocator.kind, remote_locator.kind); - ASSERT_EQ(IPLocator::toIPv4string(mainLocalLocator), eprosima::fastdds::rtps::s_IPv4AddressAny); + ASSERT_EQ(IPLocator::toIPv4string(mainLocalLocator), s_IPv4AddressAny); } TEST_F(TCPv4Tests, match_if_port_AND_address_matches) @@ -403,7 +395,7 @@ TEST_F(TCPv4Tests, send_to_wrong_interface) outputChannelLocator.kind = LOCATOR_KIND_TCPv4; IPLocator::setLogicalPort(outputChannelLocator, 7400); IPLocator::setIPv4(outputChannelLocator, 127, 0, 0, 1); // Loopback - eprosima::fastdds::rtps::SendResourceList send_resource_list; + SendResourceList send_resource_list; ASSERT_TRUE(transportUnderTest.OpenOutputChannel(send_resource_list, outputChannelLocator)); ASSERT_FALSE(send_resource_list.empty()); @@ -437,7 +429,7 @@ TEST_F(TCPv4Tests, send_to_blocked_interface) outputChannelLocator.kind = LOCATOR_KIND_TCPv4; IPLocator::setLogicalPort(outputChannelLocator, 7400); IPLocator::setIPv4(outputChannelLocator, 127, 0, 0, 1); // Loopback - eprosima::fastdds::rtps::SendResourceList send_resource_list; + SendResourceList send_resource_list; ASSERT_TRUE(transportUnderTest.OpenOutputChannel(send_resource_list, outputChannelLocator)); ASSERT_FALSE(send_resource_list.empty()); @@ -482,13 +474,13 @@ TEST_F(TCPv4Tests, send_and_receive_between_allowed_interfaces_ports) eprosima::fastdds::dds::Log::SetVerbosity(eprosima::fastdds::dds::Log::Kind::Info); std::regex filter("RTCP(?!_SEQ)"); eprosima::fastdds::dds::Log::SetCategoryFilter(filter); - eprosima::fastdds::rtps::TCPv4TransportDescriptor recvDescriptor; + TCPv4TransportDescriptor recvDescriptor; recvDescriptor.interfaceWhiteList.emplace_back(IPLocator::toIPv4string(locator)); recvDescriptor.add_listener_port(g_default_port); TCPv4Transport receiveTransportUnderTest(recvDescriptor); receiveTransportUnderTest.init(); - eprosima::fastdds::rtps::TCPv4TransportDescriptor sendDescriptor; + TCPv4TransportDescriptor sendDescriptor; sendDescriptor.interfaceWhiteList.emplace_back(IPLocator::toIPv4string(locator)); TCPv4Transport sendTransportUnderTest(sendDescriptor); sendTransportUnderTest.init(); @@ -513,7 +505,7 @@ TEST_F(TCPv4Tests, send_and_receive_between_allowed_interfaces_ports) MockMessageReceiver* msg_recv = dynamic_cast(receiver.CreateMessageReceiver()); ASSERT_TRUE(receiveTransportUnderTest.IsInputChannelOpen(inputLocator)); - eprosima::fastdds::rtps::SendResourceList send_resource_list; + SendResourceList send_resource_list; ASSERT_TRUE(sendTransportUnderTest.OpenOutputChannel(send_resource_list, outputLocator)); ASSERT_FALSE(send_resource_list.empty()); octet message[5] = { 'H', 'e', 'l', 'l', 'o' }; @@ -591,7 +583,7 @@ TEST_F(TCPv4Tests, send_and_receive_between_allowed_interfaces_ports_by_name) eprosima::fastdds::dds::Log::SetVerbosity(eprosima::fastdds::dds::Log::Kind::Info); std::regex filter("RTCP(?!_SEQ)"); eprosima::fastdds::dds::Log::SetCategoryFilter(filter); - eprosima::fastdds::rtps::TCPv4TransportDescriptor recvDescriptor; + TCPv4TransportDescriptor recvDescriptor; std::cout << "Adding to whitelist: " << interfaces[0].dev << " " << interfaces[0].name << " " << interfaces[0].locator << std::endl; recvDescriptor.interfaceWhiteList.emplace_back(interfaces[0].dev); @@ -600,7 +592,7 @@ TEST_F(TCPv4Tests, send_and_receive_between_allowed_interfaces_ports_by_name) TCPv4Transport receiveTransportUnderTest(recvDescriptor); receiveTransportUnderTest.init(); - eprosima::fastdds::rtps::TCPv4TransportDescriptor sendDescriptor; + TCPv4TransportDescriptor sendDescriptor; sendDescriptor.interfaceWhiteList.emplace_back(interfaces[0].dev); TCPv4Transport sendTransportUnderTest(sendDescriptor); @@ -626,7 +618,7 @@ TEST_F(TCPv4Tests, send_and_receive_between_allowed_interfaces_ports_by_name) MockMessageReceiver* msg_recv = dynamic_cast(receiver.CreateMessageReceiver()); ASSERT_TRUE(receiveTransportUnderTest.IsInputChannelOpen(inputLocator)); - eprosima::fastdds::rtps::SendResourceList send_resource_list; + SendResourceList send_resource_list; ASSERT_TRUE(sendTransportUnderTest.OpenOutputChannel(send_resource_list, outputLocator)); ASSERT_FALSE(send_resource_list.empty()); octet message[5] = { 'H', 'e', 'l', 'l', 'o' }; @@ -724,7 +716,7 @@ TEST_F(TCPv4Tests, send_and_receive_between_secure_ports_client_verifies) using TLSOptions = TCPTransportDescriptor::TLSConfig::TLSOptions; using TLSVerifyMode = TCPTransportDescriptor::TLSConfig::TLSVerifyMode; - eprosima::fastdds::rtps::TCPv4TransportDescriptor recvDescriptor; + TCPv4TransportDescriptor recvDescriptor; recvDescriptor.add_listener_port(g_default_port); recvDescriptor.apply_security = true; recvDescriptor.tls_config.password = "fastddspwd"; @@ -739,7 +731,7 @@ TEST_F(TCPv4Tests, send_and_receive_between_secure_ports_client_verifies) TCPv4Transport receiveTransportUnderTest(recvDescriptor); receiveTransportUnderTest.init(); - eprosima::fastdds::rtps::TCPv4TransportDescriptor sendDescriptor; + TCPv4TransportDescriptor sendDescriptor; sendDescriptor.apply_security = true; sendDescriptor.tls_config.verify_file = "ca.crt"; sendDescriptor.tls_config.verify_mode = TLSVerifyMode::VERIFY_PEER; @@ -770,7 +762,7 @@ TEST_F(TCPv4Tests, send_and_receive_between_secure_ports_client_verifies) MockMessageReceiver* msg_recv = dynamic_cast(receiver.CreateMessageReceiver()); ASSERT_TRUE(receiveTransportUnderTest.IsInputChannelOpen(inputLocator)); - eprosima::fastdds::rtps::SendResourceList send_resource_list; + SendResourceList send_resource_list; ASSERT_TRUE(sendTransportUnderTest.OpenOutputChannel(send_resource_list, outputLocator)); ASSERT_FALSE(send_resource_list.empty()); octet message[5] = { 'H', 'e', 'l', 'l', 'o' }; @@ -826,7 +818,7 @@ TEST_F(TCPv4Tests, send_and_receive_between_secure_ports_server_verifies) using TLSVerifyMode = TCPTransportDescriptor::TLSConfig::TLSVerifyMode; using TLSHSRole = TCPTransportDescriptor::TLSConfig::TLSHandShakeRole; - eprosima::fastdds::rtps::TCPv4TransportDescriptor recvDescriptor; + TCPv4TransportDescriptor recvDescriptor; recvDescriptor.add_listener_port(g_default_port); recvDescriptor.apply_security = true; recvDescriptor.tls_config.handshake_role = TLSHSRole::CLIENT; @@ -839,7 +831,7 @@ TEST_F(TCPv4Tests, send_and_receive_between_secure_ports_server_verifies) TCPv4Transport receiveTransportUnderTest(recvDescriptor); receiveTransportUnderTest.init(); - eprosima::fastdds::rtps::TCPv4TransportDescriptor sendDescriptor; + TCPv4TransportDescriptor sendDescriptor; sendDescriptor.apply_security = true; sendDescriptor.tls_config.handshake_role = TLSHSRole::SERVER; sendDescriptor.tls_config.password = "fastddspwd"; @@ -874,7 +866,7 @@ TEST_F(TCPv4Tests, send_and_receive_between_secure_ports_server_verifies) MockMessageReceiver* msg_recv = dynamic_cast(receiver.CreateMessageReceiver()); ASSERT_TRUE(receiveTransportUnderTest.IsInputChannelOpen(inputLocator)); - eprosima::fastdds::rtps::SendResourceList send_resource_list; + SendResourceList send_resource_list; ASSERT_TRUE(sendTransportUnderTest.OpenOutputChannel(send_resource_list, outputLocator)); ASSERT_FALSE(send_resource_list.empty()); octet message[5] = { 'H', 'e', 'l', 'l', 'o' }; @@ -929,7 +921,7 @@ TEST_F(TCPv4Tests, send_and_receive_between_both_secure_ports) using TLSOptions = TCPTransportDescriptor::TLSConfig::TLSOptions; using TLSVerifyMode = TCPTransportDescriptor::TLSConfig::TLSVerifyMode; - eprosima::fastdds::rtps::TCPv4TransportDescriptor recvDescriptor; + TCPv4TransportDescriptor recvDescriptor; recvDescriptor.add_listener_port(g_default_port); recvDescriptor.apply_security = true; recvDescriptor.tls_config.password = "testkey"; @@ -946,7 +938,7 @@ TEST_F(TCPv4Tests, send_and_receive_between_both_secure_ports) TCPv4Transport receiveTransportUnderTest(recvDescriptor); receiveTransportUnderTest.init(); - eprosima::fastdds::rtps::TCPv4TransportDescriptor sendDescriptor; + TCPv4TransportDescriptor sendDescriptor; sendDescriptor.apply_security = true; sendDescriptor.tls_config.password = "testkey"; sendDescriptor.tls_config.cert_chain_file = "mainsubcert.pem"; @@ -981,7 +973,7 @@ TEST_F(TCPv4Tests, send_and_receive_between_both_secure_ports) MockMessageReceiver* msg_recv = dynamic_cast(receiver.CreateMessageReceiver()); ASSERT_TRUE(receiveTransportUnderTest.IsInputChannelOpen(inputLocator)); - eprosima::fastdds::rtps::SendResourceList send_resource_list; + SendResourceList send_resource_list; ASSERT_TRUE(sendTransportUnderTest.OpenOutputChannel(send_resource_list, outputLocator)); ASSERT_FALSE(send_resource_list.empty()); octet message[5] = { 'H', 'e', 'l', 'l', 'o' }; @@ -1036,7 +1028,7 @@ TEST_F(TCPv4Tests, send_and_receive_between_both_secure_ports_untrusted) using TLSOptions = TCPTransportDescriptor::TLSConfig::TLSOptions; using TLSVerifyMode = TCPTransportDescriptor::TLSConfig::TLSVerifyMode; - eprosima::fastdds::rtps::TCPv4TransportDescriptor recvDescriptor; + TCPv4TransportDescriptor recvDescriptor; recvDescriptor.add_listener_port(g_default_port); recvDescriptor.apply_security = true; recvDescriptor.tls_config.password = "testkey"; @@ -1053,7 +1045,7 @@ TEST_F(TCPv4Tests, send_and_receive_between_both_secure_ports_untrusted) TCPv4Transport receiveTransportUnderTest(recvDescriptor); receiveTransportUnderTest.init(); - eprosima::fastdds::rtps::TCPv4TransportDescriptor sendDescriptor; + TCPv4TransportDescriptor sendDescriptor; sendDescriptor.apply_security = true; sendDescriptor.tls_config.password = "testkey"; sendDescriptor.tls_config.cert_chain_file = "mainsubcert.pem"; @@ -1088,7 +1080,7 @@ TEST_F(TCPv4Tests, send_and_receive_between_both_secure_ports_untrusted) MockMessageReceiver* msg_recv = dynamic_cast(receiver.CreateMessageReceiver()); ASSERT_TRUE(receiveTransportUnderTest.IsInputChannelOpen(inputLocator)); - eprosima::fastdds::rtps::SendResourceList send_resource_list; + SendResourceList send_resource_list; ASSERT_TRUE(sendTransportUnderTest.OpenOutputChannel(send_resource_list, outputLocator)); ASSERT_FALSE(send_resource_list.empty()); octet message[5] = { 'H', 'e', 'l', 'l', 'o' }; @@ -1148,7 +1140,7 @@ TEST_F(TCPv4Tests, send_and_receive_between_secure_clients_1) using TLSOptions = TCPTransportDescriptor::TLSConfig::TLSOptions; using TLSHSRole = TCPTransportDescriptor::TLSConfig::TLSHandShakeRole; - eprosima::fastdds::rtps::TCPv4TransportDescriptor recvDescriptor; + TCPv4TransportDescriptor recvDescriptor; recvDescriptor.add_listener_port(g_default_port); recvDescriptor.apply_security = true; recvDescriptor.tls_config.handshake_role = TLSHSRole::CLIENT; @@ -1164,7 +1156,7 @@ TEST_F(TCPv4Tests, send_and_receive_between_secure_clients_1) TCPv4Transport receiveTransportUnderTest(recvDescriptor); receiveTransportUnderTest.init(); - eprosima::fastdds::rtps::TCPv4TransportDescriptor sendDescriptor; + TCPv4TransportDescriptor sendDescriptor; sendDescriptor.apply_security = true; sendDescriptor.tls_config.handshake_role = TLSHSRole::SERVER; sendDescriptor.tls_config.password = "testkey"; @@ -1199,7 +1191,7 @@ TEST_F(TCPv4Tests, send_and_receive_between_secure_clients_1) MockMessageReceiver* msg_recv = dynamic_cast(receiver.CreateMessageReceiver()); ASSERT_TRUE(receiveTransportUnderTest.IsInputChannelOpen(inputLocator)); - eprosima::fastdds::rtps::SendResourceList send_resource_list; + SendResourceList send_resource_list; ASSERT_TRUE(sendTransportUnderTest.OpenOutputChannel(send_resource_list, outputLocator)); ASSERT_FALSE(send_resource_list.empty()); octet message[5] = { 'H', 'e', 'l', 'l', 'o' }; @@ -1255,7 +1247,7 @@ TEST_F(TCPv4Tests, send_and_receive_between_secure_ports_untrusted_server) using TLSOptions = TCPTransportDescriptor::TLSConfig::TLSOptions; using TLSVerifyMode = TCPTransportDescriptor::TLSConfig::TLSVerifyMode; - eprosima::fastdds::rtps::TCPv4TransportDescriptor recvDescriptor; + TCPv4TransportDescriptor recvDescriptor; recvDescriptor.add_listener_port(g_default_port); recvDescriptor.apply_security = true; recvDescriptor.tls_config.password = "testkey"; @@ -1271,7 +1263,7 @@ TEST_F(TCPv4Tests, send_and_receive_between_secure_ports_untrusted_server) TCPv4Transport receiveTransportUnderTest(recvDescriptor); receiveTransportUnderTest.init(); - eprosima::fastdds::rtps::TCPv4TransportDescriptor sendDescriptor; + TCPv4TransportDescriptor sendDescriptor; sendDescriptor.apply_security = true; sendDescriptor.tls_config.verify_file = "ca.pem"; // This CA doesn't know about these certificates sendDescriptor.tls_config.verify_mode = TLSVerifyMode::VERIFY_PEER; @@ -1303,7 +1295,7 @@ TEST_F(TCPv4Tests, send_and_receive_between_secure_ports_untrusted_server) MockMessageReceiver* msg_recv = dynamic_cast(receiver.CreateMessageReceiver()); ASSERT_TRUE(receiveTransportUnderTest.IsInputChannelOpen(inputLocator)); - eprosima::fastdds::rtps::SendResourceList send_resource_list; + SendResourceList send_resource_list; ASSERT_TRUE(sendTransportUnderTest.OpenOutputChannel(send_resource_list, outputLocator)); ASSERT_FALSE(send_resource_list.empty()); octet message[5] = { 'H', 'e', 'l', 'l', 'o' }; @@ -1365,7 +1357,7 @@ TEST_F(TCPv4Tests, send_and_receive_between_both_secure_ports_with_sni) using TLSOptions = TCPTransportDescriptor::TLSConfig::TLSOptions; using TLSVerifyMode = TCPTransportDescriptor::TLSConfig::TLSVerifyMode; - eprosima::fastdds::rtps::TCPv4TransportDescriptor recvDescriptor; + TCPv4TransportDescriptor recvDescriptor; recvDescriptor.add_listener_port(g_default_port); recvDescriptor.apply_security = true; recvDescriptor.tls_config.password = "testkey"; @@ -1382,7 +1374,7 @@ TEST_F(TCPv4Tests, send_and_receive_between_both_secure_ports_with_sni) TCPv4Transport receiveTransportUnderTest(recvDescriptor); receiveTransportUnderTest.init(); - eprosima::fastdds::rtps::TCPv4TransportDescriptor sendDescriptor; + TCPv4TransportDescriptor sendDescriptor; sendDescriptor.apply_security = true; sendDescriptor.tls_config.password = "testkey"; sendDescriptor.tls_config.cert_chain_file = "mainsubcert.pem"; @@ -1418,7 +1410,7 @@ TEST_F(TCPv4Tests, send_and_receive_between_both_secure_ports_with_sni) MockMessageReceiver* msg_recv = dynamic_cast(receiver.CreateMessageReceiver()); ASSERT_TRUE(receiveTransportUnderTest.IsInputChannelOpen(inputLocator)); - eprosima::fastdds::rtps::SendResourceList send_resource_list; + SendResourceList send_resource_list; ASSERT_TRUE(sendTransportUnderTest.OpenOutputChannel(send_resource_list, outputLocator)); ASSERT_FALSE(send_resource_list.empty()); octet message[5] = { 'H', 'e', 'l', 'l', 'o' }; @@ -1478,7 +1470,7 @@ TEST_F(TCPv4Tests, secure_non_blocking_send) // Create a TCP Server transport using TLSOptions = TCPTransportDescriptor::TLSConfig::TLSOptions; using TLSVerifyMode = TCPTransportDescriptor::TLSConfig::TLSVerifyMode; - eprosima::fastdds::rtps::TCPv4TransportDescriptor senderDescriptor; + TCPv4TransportDescriptor senderDescriptor; senderDescriptor.add_listener_port(port); senderDescriptor.apply_security = true; senderDescriptor.non_blocking_send = true; @@ -1577,7 +1569,7 @@ TEST_F(TCPv4Tests, secure_non_blocking_send) auto sender_unbound_channel_resources = senderTransportUnderTest.get_unbound_channel_resources(); ASSERT_TRUE(sender_unbound_channel_resources.size() == 1u); auto sender_channel_resource = - std::static_pointer_cast( + std::static_pointer_cast( sender_unbound_channel_resources[0]); // Prepare the message @@ -1623,13 +1615,13 @@ TEST_F(TCPv4Tests, send_and_receive_between_allowed_localhost_interfaces_ports) eprosima::fastdds::dds::Log::SetVerbosity(eprosima::fastdds::dds::Log::Kind::Info); std::regex filter("RTCP(?!_SEQ)"); eprosima::fastdds::dds::Log::SetCategoryFilter(filter); - eprosima::fastdds::rtps::TCPv4TransportDescriptor recvDescriptor; + TCPv4TransportDescriptor recvDescriptor; recvDescriptor.interfaceWhiteList.emplace_back("127.0.0.1"); recvDescriptor.add_listener_port(g_default_port); TCPv4Transport receiveTransportUnderTest(recvDescriptor); receiveTransportUnderTest.init(); - eprosima::fastdds::rtps::TCPv4TransportDescriptor sendDescriptor; + TCPv4TransportDescriptor sendDescriptor; sendDescriptor.interfaceWhiteList.emplace_back("127.0.0.1"); TCPv4Transport sendTransportUnderTest(sendDescriptor); sendTransportUnderTest.init(); @@ -1654,7 +1646,7 @@ TEST_F(TCPv4Tests, send_and_receive_between_allowed_localhost_interfaces_ports) MockMessageReceiver* msg_recv = dynamic_cast(receiver.CreateMessageReceiver()); ASSERT_TRUE(receiveTransportUnderTest.IsInputChannelOpen(inputLocator)); - eprosima::fastdds::rtps::SendResourceList send_resource_list; + SendResourceList send_resource_list; ASSERT_TRUE(sendTransportUnderTest.OpenOutputChannel(send_resource_list, outputLocator)); ASSERT_FALSE(send_resource_list.empty()); octet message[5] = { 'H', 'e', 'l', 'l', 'o' }; @@ -1723,13 +1715,13 @@ TEST_F(TCPv4Tests, send_and_receive_between_blocked_interfaces_ports) eprosima::fastdds::dds::Log::SetVerbosity(eprosima::fastdds::dds::Log::Kind::Info); std::regex filter("RTCP(?!_SEQ)"); eprosima::fastdds::dds::Log::SetCategoryFilter(filter); - eprosima::fastdds::rtps::TCPv4TransportDescriptor recvDescriptor; + TCPv4TransportDescriptor recvDescriptor; recvDescriptor.interfaceWhiteList.emplace_back(IPLocator::toIPv4string(locator)); recvDescriptor.add_listener_port(g_default_port); TCPv4Transport receiveTransportUnderTest(recvDescriptor); receiveTransportUnderTest.init(); - eprosima::fastdds::rtps::TCPv4TransportDescriptor sendDescriptor; + TCPv4TransportDescriptor sendDescriptor; sendDescriptor.interfaceWhiteList.emplace_back(IPLocator::toIPv4string(locator)); TCPv4Transport sendTransportUnderTest(sendDescriptor); sendTransportUnderTest.init(); @@ -1754,7 +1746,7 @@ TEST_F(TCPv4Tests, send_and_receive_between_blocked_interfaces_ports) MockMessageReceiver* msg_recv = dynamic_cast(receiver.CreateMessageReceiver()); ASSERT_TRUE(receiveTransportUnderTest.IsInputChannelOpen(inputLocator)); - eprosima::fastdds::rtps::SendResourceList send_resource_list; + SendResourceList send_resource_list; ASSERT_TRUE(sendTransportUnderTest.OpenOutputChannel(send_resource_list, outputLocator)); ASSERT_FALSE(send_resource_list.empty()); octet message[5] = { 'H', 'e', 'l', 'l', 'o' }; @@ -1820,7 +1812,7 @@ TEST_F(TCPv4Tests, receive_unordered_data) "-RTCRTC", "-RTCRT", "-RTCR" }; - struct Receiver : public eprosima::fastdds::rtps::TransportReceiverInterface + struct Receiver : public TransportReceiverInterface { std::array num_received{ 0, 0, 0 }; @@ -1854,7 +1846,7 @@ TEST_F(TCPv4Tests, receive_unordered_data) Receiver receiver; - eprosima::fastdds::rtps::TCPv4TransportDescriptor test_descriptor = descriptor; + TCPv4TransportDescriptor test_descriptor = descriptor; test_descriptor.check_crc = false; TCPv4Transport uut(test_descriptor); ASSERT_TRUE(uut.init()) << "Failed to initialize transport. Port " << g_default_port << " may be in use"; @@ -1947,7 +1939,7 @@ TEST_F(TCPv4Tests, header_read_interrumption) std::regex filter("RTCP(?!_SEQ)"); eprosima::fastdds::dds::Log::SetCategoryFilter(filter); - eprosima::fastdds::rtps::TCPv4TransportDescriptor test_descriptor; + TCPv4TransportDescriptor test_descriptor; test_descriptor.add_listener_port(g_default_port); TCPv4Transport transportUnderTest(test_descriptor); transportUnderTest.init(); @@ -1958,8 +1950,8 @@ TEST_F(TCPv4Tests, header_read_interrumption) IPLocator::setIPv4(locator, 127, 0, 0, 1); IPLocator::setLogicalPort(locator, 7410); - std::weak_ptr rtcp_manager = - std::make_shared(&transportUnderTest); + std::weak_ptr rtcp_manager = + std::make_shared(&transportUnderTest); std::shared_ptr channel = std::make_shared(&transportUnderTest, locator, 32767); octet* buffer = {}; @@ -1989,7 +1981,7 @@ TEST_F(TCPv4Tests, header_read_interrumption) TEST_F(TCPv4Tests, autofill_port) { // Check normal port assignation - eprosima::fastdds::rtps::TCPv4TransportDescriptor test_descriptor; + TCPv4TransportDescriptor test_descriptor; test_descriptor.add_listener_port(g_default_port); TCPv4Transport transportUnderTest(test_descriptor); transportUnderTest.init(); @@ -1997,7 +1989,7 @@ TEST_F(TCPv4Tests, autofill_port) EXPECT_TRUE(transportUnderTest.configuration()->listening_ports[0] == g_default_port); // Check default port assignation - eprosima::fastdds::rtps::TCPv4TransportDescriptor test_descriptor_autofill; + TCPv4TransportDescriptor test_descriptor_autofill; test_descriptor_autofill.add_listener_port(0); TCPv4Transport transportUnderTest_autofill(test_descriptor_autofill); transportUnderTest_autofill.init(); @@ -2011,16 +2003,16 @@ TEST_F(TCPv4Tests, autofill_port) // process this lead to overwriting server's channel resources map elements. TEST_F(TCPv4Tests, client_announced_local_port_uniqueness) { - eprosima::fastdds::rtps::TCPv4TransportDescriptor recvDescriptor; + TCPv4TransportDescriptor recvDescriptor; recvDescriptor.add_listener_port(g_default_port); MockTCPv4Transport receiveTransportUnderTest(recvDescriptor); receiveTransportUnderTest.init(); - eprosima::fastdds::rtps::TCPv4TransportDescriptor sendDescriptor_1; + TCPv4TransportDescriptor sendDescriptor_1; TCPv4Transport sendTransportUnderTest_1(sendDescriptor_1); sendTransportUnderTest_1.init(); - eprosima::fastdds::rtps::TCPv4TransportDescriptor sendDescriptor_2; + TCPv4TransportDescriptor sendDescriptor_2; TCPv4Transport sendTransportUnderTest_2(sendDescriptor_2); sendTransportUnderTest_2.init(); @@ -2030,11 +2022,11 @@ TEST_F(TCPv4Tests, client_announced_local_port_uniqueness) outputLocator.port = g_default_port; IPLocator::setLogicalPort(outputLocator, 7410); - eprosima::fastdds::rtps::SendResourceList send_resource_list_1; + SendResourceList send_resource_list_1; ASSERT_TRUE(sendTransportUnderTest_1.OpenOutputChannel(send_resource_list_1, outputLocator)); ASSERT_FALSE(send_resource_list_1.empty()); - eprosima::fastdds::rtps::SendResourceList send_resource_list_2; + SendResourceList send_resource_list_2; ASSERT_TRUE(sendTransportUnderTest_2.OpenOutputChannel(send_resource_list_2, outputLocator)); ASSERT_FALSE(send_resource_list_2.empty()); @@ -2051,7 +2043,7 @@ TEST_F(TCPv4Tests, non_blocking_send) uint16_t port = g_default_port; uint32_t msg_size = 64ul * 1024ul; // Create a TCP Server transport - eprosima::fastdds::rtps::TCPv4TransportDescriptor senderDescriptor; + TCPv4TransportDescriptor senderDescriptor; senderDescriptor.add_listener_port(port); senderDescriptor.non_blocking_send = true; senderDescriptor.sendBufferSize = msg_size; @@ -2106,7 +2098,7 @@ TEST_F(TCPv4Tests, non_blocking_send) auto sender_unbound_channel_resources = senderTransportUnderTest.get_unbound_channel_resources(); ASSERT_TRUE(sender_unbound_channel_resources.size() == 1u); auto sender_channel_resource = - std::static_pointer_cast( + std::static_pointer_cast( sender_unbound_channel_resources[0]); // Prepare the message @@ -2150,13 +2142,13 @@ TEST_F(TCPv4Tests, reconnect_after_open_port_failure) eprosima::fastdds::dds::Log::SetVerbosity(eprosima::fastdds::dds::Log::Warning); uint16_t port = g_default_port; // Create a TCP Server transport - eprosima::fastdds::rtps::TCPv4TransportDescriptor serverDescriptor; + TCPv4TransportDescriptor serverDescriptor; serverDescriptor.add_listener_port(port); std::unique_ptr serverTransportUnderTest(new TCPv4Transport(serverDescriptor)); serverTransportUnderTest->init(); // Create a TCP Client transport - eprosima::fastdds::rtps::TCPv4TransportDescriptor clientDescriptor; + TCPv4TransportDescriptor clientDescriptor; std::unique_ptr clientTransportUnderTest(new MockTCPv4Transport(clientDescriptor)); clientTransportUnderTest->init(); @@ -2167,7 +2159,7 @@ TEST_F(TCPv4Tests, reconnect_after_open_port_failure) // Connect client to server EXPECT_TRUE(serverTransportUnderTest->OpenInputChannel(initialPeerLocator, nullptr, 0x00FF)); - eprosima::fastdds::rtps::SendResourceList client_resource_list; + SendResourceList client_resource_list; ASSERT_TRUE(clientTransportUnderTest->OpenOutputChannel(client_resource_list, initialPeerLocator)); ASSERT_FALSE(client_resource_list.empty()); std::this_thread::sleep_for(std::chrono::milliseconds(300)); @@ -2245,7 +2237,7 @@ TEST_F(TCPv4Tests, opening_output_channel_with_same_locator_as_local_listening_p IPLocator::setIPv4(lowerOutputChannelLocator, 1, 1, 1, 1); IPLocator::setIPv4(higherOutputChannelLocator, 255, 255, 255, 255); - eprosima::fastdds::rtps::SendResourceList send_resource_list; + SendResourceList send_resource_list; // If the remote address is lower than the local one, no channel must be created but it must be added to the send_resource_list ASSERT_TRUE(transportUnderTest.OpenOutputChannel(send_resource_list, lowerOutputChannelLocator)); @@ -2272,7 +2264,7 @@ TEST_F(TCPv4Tests, remove_from_send_resource_list) for (const std::string& test_case : test_cases) { - eprosima::fastdds::rtps::TCPv4TransportDescriptor send_descriptor; + TCPv4TransportDescriptor send_descriptor; MockTCPv4Transport send_transport_under_test(send_descriptor); send_transport_under_test.init(); @@ -2299,7 +2291,7 @@ TEST_F(TCPv4Tests, remove_from_send_resource_list) initial_peer_list.push_back(initial_peer_locator); - eprosima::fastdds::rtps::SendResourceList send_resource_list; + SendResourceList send_resource_list; ASSERT_TRUE(send_transport_under_test.OpenOutputChannel(send_resource_list, discovery_locator)); ASSERT_TRUE(send_transport_under_test.OpenOutputChannel(send_resource_list, initial_peer_locator)); ASSERT_EQ(send_resource_list.size(), 2u); @@ -2356,7 +2348,7 @@ TEST_F(TCPv4Tests, add_logical_port_on_send_resource_creation) // TCP Client { uint16_t port = 12345; - eprosima::fastdds::rtps::TCPv4TransportDescriptor clientDescriptor; + TCPv4TransportDescriptor clientDescriptor; std::unique_ptr clientTransportUnderTest(new MockTCPv4Transport(clientDescriptor)); clientTransportUnderTest->init(); @@ -2366,7 +2358,7 @@ TEST_F(TCPv4Tests, add_logical_port_on_send_resource_creation) IPLocator::setLogicalPort(initialPeerLocator, 7410); // OpenOutputChannel - eprosima::fastdds::rtps::SendResourceList client_resource_list; + SendResourceList client_resource_list; ASSERT_TRUE(clientTransportUnderTest->OpenOutputChannel(client_resource_list, initialPeerLocator)); IPLocator::setLogicalPort(initialPeerLocator, 7411); ASSERT_TRUE(clientTransportUnderTest->OpenOutputChannel(client_resource_list, initialPeerLocator)); @@ -2386,7 +2378,7 @@ TEST_F(TCPv4Tests, add_logical_port_on_send_resource_creation) // Discovered participant physical port has to have a lower value than the listening port to behave as a server uint16_t participantPhysicalLocator = 12344; // Create a TCP Server transport - eprosima::fastdds::rtps::TCPv4TransportDescriptor serverDescriptor; + TCPv4TransportDescriptor serverDescriptor; serverDescriptor.add_listener_port(port); std::unique_ptr serverTransportUnderTest(new MockTCPv4Transport(serverDescriptor)); serverTransportUnderTest->init(); @@ -2398,7 +2390,7 @@ TEST_F(TCPv4Tests, add_logical_port_on_send_resource_creation) IPLocator::setLogicalPort(discoveredParticipantLocator, 7410); // OpenOutputChannel - eprosima::fastdds::rtps::SendResourceList server_resource_list; + SendResourceList server_resource_list; ASSERT_TRUE(serverTransportUnderTest->OpenOutputChannel(server_resource_list, discoveredParticipantLocator)); IPLocator::setLogicalPort(discoveredParticipantLocator, 7411); ASSERT_TRUE(serverTransportUnderTest->OpenOutputChannel(server_resource_list, discoveredParticipantLocator)); @@ -2421,7 +2413,7 @@ TEST_F(TCPv4Tests, add_logical_port_on_send_resource_creation) // Discovered participant physical port has to have a larger value than the listening port to behave as a client uint16_t participantPhysicalLocator = 12346; // Create a TCP Client transport - eprosima::fastdds::rtps::TCPv4TransportDescriptor clientDescriptor; + TCPv4TransportDescriptor clientDescriptor; clientDescriptor.add_listener_port(port); std::unique_ptr clientTransportUnderTest(new MockTCPv4Transport(clientDescriptor)); clientTransportUnderTest->init(); @@ -2433,7 +2425,7 @@ TEST_F(TCPv4Tests, add_logical_port_on_send_resource_creation) IPLocator::setLogicalPort(discoveredParticipantLocator, 7410); // OpenOutputChannel - eprosima::fastdds::rtps::SendResourceList client_resource_list; + SendResourceList client_resource_list; ASSERT_TRUE(clientTransportUnderTest->OpenOutputChannel(client_resource_list, discoveredParticipantLocator)); IPLocator::setLogicalPort(discoveredParticipantLocator, 7411); ASSERT_TRUE(clientTransportUnderTest->OpenOutputChannel(client_resource_list, discoveredParticipantLocator)); diff --git a/test/unittest/transport/TCPv6Tests.cpp b/test/unittest/transport/TCPv6Tests.cpp index 6817382a9f9..494b97814bf 100644 --- a/test/unittest/transport/TCPv6Tests.cpp +++ b/test/unittest/transport/TCPv6Tests.cpp @@ -33,11 +33,8 @@ #include "mock/MockTCPv6Transport.h" #include -using namespace eprosima::fastrtps::rtps; -using namespace eprosima::fastrtps; -using TCPv6Transport = eprosima::fastdds::rtps::TCPv6Transport; -using TCPv6TransportDescriptor = eprosima::fastdds::rtps::TCPv6TransportDescriptor; -using NetworkBuffer = eprosima::fastdds::rtps::NetworkBuffer; +using namespace eprosima::fastdds::rtps; +using namespace eprosima::fastdds; #if defined(_WIN32) #define GET_PID _getpid @@ -83,7 +80,7 @@ class TCPv6Tests : public ::testing::Test void HELPER_SetDescriptorDefaults(); - eprosima::fastdds::rtps::TCPv6TransportDescriptor descriptor; + TCPv6TransportDescriptor descriptor; std::unique_ptr senderThread; std::unique_ptr receiverThread; }; @@ -237,7 +234,7 @@ TEST_F(TCPv6Tests, opening_and_closing_input_channel) RTPSParticipantAttributes p_attr{}; NetworkFactory factory{p_attr}; - factory.RegisterTransport(descriptor); + factory.RegisterTransport(descriptor); std::vector> receivers; factory.BuildReceiverResources(multicastFilterLocator, receivers, 0x8FFF); ReceiverResource* receiver = receivers.back().get(); @@ -256,7 +253,7 @@ TEST_F(TCPv6Tests, opening_and_closing_input_channel) TEST_F(TCPv6Tests, autofill_port) { // Check normal port assignation - eprosima::fastdds::rtps::TCPv6TransportDescriptor test_descriptor; + TCPv6TransportDescriptor test_descriptor; test_descriptor.add_listener_port(g_default_port); TCPv6Transport transportUnderTest(test_descriptor); transportUnderTest.init(); @@ -264,7 +261,7 @@ TEST_F(TCPv6Tests, autofill_port) EXPECT_TRUE(transportUnderTest.configuration()->listening_ports[0] == g_default_port); // Check default port assignation - eprosima::fastdds::rtps::TCPv6TransportDescriptor test_descriptor_autofill; + TCPv6TransportDescriptor test_descriptor_autofill; test_descriptor_autofill.add_listener_port(0); TCPv6Transport transportUnderTest_autofill(test_descriptor_autofill); transportUnderTest_autofill.init(); @@ -342,16 +339,16 @@ TEST_F(TCPv6Tests, check_TCPv6_interface_whitelist_initialization) // process this lead to overwriting server's channel resources map elements. TEST_F(TCPv6Tests, client_announced_local_port_uniqueness) { - eprosima::fastdds::rtps::TCPv6TransportDescriptor recvDescriptor; + TCPv6TransportDescriptor recvDescriptor; recvDescriptor.add_listener_port(g_default_port); MockTCPv6Transport receiveTransportUnderTest(recvDescriptor); receiveTransportUnderTest.init(); - eprosima::fastdds::rtps::TCPv6TransportDescriptor sendDescriptor_1; + TCPv6TransportDescriptor sendDescriptor_1; TCPv6Transport sendTransportUnderTest_1(sendDescriptor_1); sendTransportUnderTest_1.init(); - eprosima::fastdds::rtps::TCPv6TransportDescriptor sendDescriptor_2; + TCPv6TransportDescriptor sendDescriptor_2; TCPv6Transport sendTransportUnderTest_2(sendDescriptor_2); sendTransportUnderTest_2.init(); @@ -361,11 +358,11 @@ TEST_F(TCPv6Tests, client_announced_local_port_uniqueness) outputLocator.port = g_default_port; IPLocator::setLogicalPort(outputLocator, 7610); - eprosima::fastdds::rtps::SendResourceList send_resource_list_1; + SendResourceList send_resource_list_1; ASSERT_TRUE(sendTransportUnderTest_1.OpenOutputChannel(send_resource_list_1, outputLocator)); ASSERT_FALSE(send_resource_list_1.empty()); - eprosima::fastdds::rtps::SendResourceList send_resource_list_2; + SendResourceList send_resource_list_2; ASSERT_TRUE(sendTransportUnderTest_2.OpenOutputChannel(send_resource_list_2, outputLocator)); ASSERT_FALSE(send_resource_list_2.empty()); @@ -382,7 +379,7 @@ TEST_F(TCPv6Tests, non_blocking_send) uint16_t port = g_default_port; uint32_t msg_size = 64ul * 1024ul; // Create a TCP Server transport - eprosima::fastdds::rtps::TCPv6TransportDescriptor senderDescriptor; + TCPv6TransportDescriptor senderDescriptor; senderDescriptor.add_listener_port(port); senderDescriptor.non_blocking_send = true; senderDescriptor.sendBufferSize = msg_size; @@ -480,13 +477,13 @@ TEST_F(TCPv6Tests, reconnect_after_open_port_failure) eprosima::fastdds::dds::Log::SetVerbosity(eprosima::fastdds::dds::Log::Warning); uint16_t port = g_default_port; // Create a TCP Server transport - eprosima::fastdds::rtps::TCPv6TransportDescriptor serverDescriptor; + TCPv6TransportDescriptor serverDescriptor; serverDescriptor.add_listener_port(port); std::unique_ptr serverTransportUnderTest(new TCPv6Transport(serverDescriptor)); serverTransportUnderTest->init(); // Create a TCP Client transport - eprosima::fastdds::rtps::TCPv6TransportDescriptor clientDescriptor; + TCPv6TransportDescriptor clientDescriptor; std::unique_ptr clientTransportUnderTest(new MockTCPv6Transport(clientDescriptor)); clientTransportUnderTest->init(); @@ -497,7 +494,7 @@ TEST_F(TCPv6Tests, reconnect_after_open_port_failure) // Connect client to server EXPECT_TRUE(serverTransportUnderTest->OpenInputChannel(initialPeerLocator, nullptr, 0x00FF)); - eprosima::fastdds::rtps::SendResourceList client_resource_list; + SendResourceList client_resource_list; ASSERT_TRUE(clientTransportUnderTest->OpenOutputChannel(client_resource_list, initialPeerLocator)); ASSERT_FALSE(client_resource_list.empty()); std::this_thread::sleep_for(std::chrono::milliseconds(300)); @@ -574,7 +571,7 @@ TEST_F(TCPv6Tests, opening_output_channel_with_same_locator_as_local_listening_p IPLocator::setIPv6(lowerOutputChannelLocator, "::"); IPLocator::setIPv6(higherOutputChannelLocator, "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"); - eprosima::fastdds::rtps::SendResourceList send_resource_list; + SendResourceList send_resource_list; // If the remote address is lower than the local one, no channel must be created but it must be added to the send_resource_list ASSERT_TRUE(transportUnderTest.OpenOutputChannel(send_resource_list, lowerOutputChannelLocator)); @@ -590,7 +587,7 @@ TEST_F(TCPv6Tests, opening_output_channel_with_same_locator_as_local_listening_p // from the channel_resources_map. TEST_F(TCPv6Tests, remove_from_send_resource_list) { - eprosima::fastdds::rtps::TCPv6TransportDescriptor send_descriptor; + TCPv6TransportDescriptor send_descriptor; MockTCPv6Transport send_transport_under_test(send_descriptor); send_transport_under_test.init(); @@ -605,7 +602,7 @@ TEST_F(TCPv6Tests, remove_from_send_resource_list) LocatorList_t initial_peer_list; initial_peer_list.push_back(output_locator_2); - eprosima::fastdds::rtps::SendResourceList send_resource_list; + SendResourceList send_resource_list; ASSERT_TRUE(send_transport_under_test.OpenOutputChannel(send_resource_list, output_locator_1)); ASSERT_TRUE(send_transport_under_test.OpenOutputChannel(send_resource_list, output_locator_2)); ASSERT_EQ(send_resource_list.size(), 2u); @@ -650,7 +647,7 @@ TEST_F(TCPv6Tests, add_logical_port_on_send_resource_creation) // TCP Client { uint16_t port = 12345; - eprosima::fastdds::rtps::TCPv6TransportDescriptor clientDescriptor; + TCPv6TransportDescriptor clientDescriptor; std::unique_ptr clientTransportUnderTest(new MockTCPv6Transport(clientDescriptor)); clientTransportUnderTest->init(); @@ -660,7 +657,7 @@ TEST_F(TCPv6Tests, add_logical_port_on_send_resource_creation) IPLocator::setLogicalPort(initialPeerLocator, 7410); // OpenOutputChannel - eprosima::fastdds::rtps::SendResourceList client_resource_list; + SendResourceList client_resource_list; ASSERT_TRUE(clientTransportUnderTest->OpenOutputChannel(client_resource_list, initialPeerLocator)); IPLocator::setLogicalPort(initialPeerLocator, 7411); ASSERT_TRUE(clientTransportUnderTest->OpenOutputChannel(client_resource_list, initialPeerLocator)); @@ -680,7 +677,7 @@ TEST_F(TCPv6Tests, add_logical_port_on_send_resource_creation) // Discovered participant physical port has to have a lower value than the listening port to behave as a server uint16_t participantPhysicalLocator = 12344; // Create a TCP Server transport - eprosima::fastdds::rtps::TCPv6TransportDescriptor serverDescriptor; + TCPv6TransportDescriptor serverDescriptor; serverDescriptor.add_listener_port(port); std::unique_ptr serverTransportUnderTest(new MockTCPv6Transport(serverDescriptor)); serverTransportUnderTest->init(); @@ -691,7 +688,7 @@ TEST_F(TCPv6Tests, add_logical_port_on_send_resource_creation) IPLocator::setLogicalPort(discoveredParticipantLocator, 7410); // OpenOutputChannel - eprosima::fastdds::rtps::SendResourceList server_resource_list; + SendResourceList server_resource_list; ASSERT_TRUE(serverTransportUnderTest->OpenOutputChannel(server_resource_list, discoveredParticipantLocator)); IPLocator::setLogicalPort(discoveredParticipantLocator, 7411); ASSERT_TRUE(serverTransportUnderTest->OpenOutputChannel(server_resource_list, discoveredParticipantLocator)); @@ -714,7 +711,7 @@ TEST_F(TCPv6Tests, add_logical_port_on_send_resource_creation) // Discovered participant physical port has to have a larger value than the listening port to behave as a client uint16_t participantPhysicalLocator = 12346; // Create a TCP Client transport - eprosima::fastdds::rtps::TCPv6TransportDescriptor clientDescriptor; + TCPv6TransportDescriptor clientDescriptor; clientDescriptor.add_listener_port(port); std::unique_ptr clientTransportUnderTest(new MockTCPv6Transport(clientDescriptor)); clientTransportUnderTest->init(); @@ -725,7 +722,7 @@ TEST_F(TCPv6Tests, add_logical_port_on_send_resource_creation) IPLocator::setLogicalPort(discoveredParticipantLocator, 7410); // OpenOutputChannel - eprosima::fastdds::rtps::SendResourceList client_resource_list; + SendResourceList client_resource_list; ASSERT_TRUE(clientTransportUnderTest->OpenOutputChannel(client_resource_list, discoveredParticipantLocator)); IPLocator::setLogicalPort(discoveredParticipantLocator, 7411); ASSERT_TRUE(clientTransportUnderTest->OpenOutputChannel(client_resource_list, discoveredParticipantLocator)); diff --git a/test/unittest/transport/UDPv4Tests.cpp b/test/unittest/transport/UDPv4Tests.cpp index 88c924750d9..6edb1966677 100644 --- a/test/unittest/transport/UDPv4Tests.cpp +++ b/test/unittest/transport/UDPv4Tests.cpp @@ -30,11 +30,7 @@ #include using namespace eprosima::fastdds; -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; -using UDPv4Transport = eprosima::fastdds::rtps::UDPv4Transport; -using UDPv4TransportDescriptor = eprosima::fastdds::rtps::UDPv4TransportDescriptor; -using SendResourceList = eprosima::fastdds::rtps::SendResourceList; +using namespace eprosima::fastdds::rtps; #if defined(_WIN32) #define GET_PID _getpid diff --git a/test/unittest/transport/UDPv6Tests.cpp b/test/unittest/transport/UDPv6Tests.cpp index acb696f3876..692c912a3f5 100644 --- a/test/unittest/transport/UDPv6Tests.cpp +++ b/test/unittest/transport/UDPv6Tests.cpp @@ -29,11 +29,7 @@ #include using namespace eprosima::fastdds; -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; -using UDPv6Transport = eprosima::fastdds::rtps::UDPv6Transport; -using UDPv6TransportDescriptor = eprosima::fastdds::rtps::UDPv6TransportDescriptor; -using SendResourceList = eprosima::fastdds::rtps::SendResourceList; +using namespace eprosima::fastdds::rtps; #if defined(_WIN32) #define GET_PID _getpid diff --git a/test/unittest/transport/mock/MockReceiverResource.cpp b/test/unittest/transport/mock/MockReceiverResource.cpp index d22d4d7126d..26aa58aff64 100644 --- a/test/unittest/transport/mock/MockReceiverResource.cpp +++ b/test/unittest/transport/mock/MockReceiverResource.cpp @@ -15,7 +15,7 @@ #include "MockReceiverResource.h" namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { MockReceiverResource::MockReceiverResource( @@ -96,5 +96,5 @@ void MockMessageReceiver::processCDRMsg( } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/test/unittest/transport/mock/MockReceiverResource.h b/test/unittest/transport/mock/MockReceiverResource.h index 9e2f4843e24..77260abb35c 100644 --- a/test/unittest/transport/mock/MockReceiverResource.h +++ b/test/unittest/transport/mock/MockReceiverResource.h @@ -21,7 +21,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class MockMessageReceiver; @@ -67,7 +67,7 @@ class MockMessageReceiver : public MessageReceiver }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif //MOCK_RECEIVER_STUFF_H diff --git a/test/unittest/transport/mock/MockTCPChannelResource.cpp b/test/unittest/transport/mock/MockTCPChannelResource.cpp index 7eef964f4b9..322556364b1 100644 --- a/test/unittest/transport/mock/MockTCPChannelResource.cpp +++ b/test/unittest/transport/mock/MockTCPChannelResource.cpp @@ -15,7 +15,7 @@ #include "MockTCPChannelResource.h" namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { MockTCPChannelResource::MockTCPChannelResource( @@ -112,5 +112,5 @@ void MockTCPChannelResource::shutdown( } } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima diff --git a/test/unittest/transport/mock/MockTCPChannelResource.h b/test/unittest/transport/mock/MockTCPChannelResource.h index 87b69e73d68..73f986d3a99 100644 --- a/test/unittest/transport/mock/MockTCPChannelResource.h +++ b/test/unittest/transport/mock/MockTCPChannelResource.h @@ -21,7 +21,7 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { class MockTCPChannelResource; @@ -86,7 +86,7 @@ class MockTCPChannelResource : public TCPChannelResource }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif //MOCK_TCP_CHANNEL_RESOURCE_H diff --git a/test/unittest/transport/mock/MockTCPv4Transport.h b/test/unittest/transport/mock/MockTCPv4Transport.h index f8d176f4f5c..16ec4b4d63b 100644 --- a/test/unittest/transport/mock/MockTCPv4Transport.h +++ b/test/unittest/transport/mock/MockTCPv4Transport.h @@ -25,14 +25,12 @@ namespace eprosima { namespace fastdds { namespace rtps { -using Locator_t = eprosima::fastrtps::rtps::Locator_t; - class MockTCPv4Transport : public TCPv4Transport { public: MockTCPv4Transport( - const eprosima::fastdds::rtps::TCPv4TransportDescriptor& descriptor) + const TCPv4TransportDescriptor& descriptor) : TCPv4Transport(descriptor) { } @@ -58,7 +56,7 @@ class MockTCPv4Transport : public TCPv4Transport } bool send( - const fastrtps::rtps::octet* send_buffer, + const fastdds::rtps::octet* send_buffer, uint32_t send_buffer_size, const Locator_t& send_resource_locator, const Locator_t& remote_locator) @@ -77,7 +75,7 @@ class MockTCPv4Transport : public TCPv4Transport }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif //MOCK_TRANSPORT_TCP4_STUFF_H diff --git a/test/unittest/transport/mock/MockTCPv6Transport.h b/test/unittest/transport/mock/MockTCPv6Transport.h index 765f705b08e..6fde61c9115 100644 --- a/test/unittest/transport/mock/MockTCPv6Transport.h +++ b/test/unittest/transport/mock/MockTCPv6Transport.h @@ -21,13 +21,9 @@ #include namespace eprosima { -namespace fastrtps { +namespace fastdds { namespace rtps { -using TCPv6Transport = eprosima::fastdds::rtps::TCPv6Transport; -using TCPChannelResource = eprosima::fastdds::rtps::TCPChannelResource; -using TCPChannelResourceBasic = eprosima::fastdds::rtps::TCPChannelResourceBasic; - class MockTCPv6Transport : public TCPv6Transport { public: @@ -59,9 +55,9 @@ class MockTCPv6Transport : public TCPv6Transport } bool send( - const fastrtps::rtps::octet* send_buffer, + const fastdds::rtps::octet* send_buffer, uint32_t send_buffer_size, - const fastrtps::rtps::Locator_t& send_resource_locator, + const fastdds::rtps::Locator_t& send_resource_locator, const Locator_t& remote_locator) { eprosima::fastdds::rtps::NetworkBuffer buffers(send_buffer, send_buffer_size); @@ -78,7 +74,7 @@ class MockTCPv6Transport : public TCPv6Transport }; } // namespace rtps -} // namespace fastrtps +} // namespace fastdds } // namespace eprosima #endif //MOCK_TRANSPORT_TCP6_STUFF_H diff --git a/test/unittest/utils/BitmapRangeTests.cpp b/test/unittest/utils/BitmapRangeTests.cpp index 2c649a339f8..d63bcf2f79b 100644 --- a/test/unittest/utils/BitmapRangeTests.cpp +++ b/test/unittest/utils/BitmapRangeTests.cpp @@ -22,7 +22,7 @@ using namespace std; using ValueType = uint32_t; -using TestType = eprosima::fastrtps::BitmapRange; +using TestType = eprosima::fastdds::BitmapRange; template struct BitmapRangeExposer : T diff --git a/test/unittest/utils/FixedSizeQueueTests.cpp b/test/unittest/utils/FixedSizeQueueTests.cpp index debf430f9bd..cf840007240 100644 --- a/test/unittest/utils/FixedSizeQueueTests.cpp +++ b/test/unittest/utils/FixedSizeQueueTests.cpp @@ -15,7 +15,7 @@ #include #include -using namespace eprosima::fastrtps; +using namespace eprosima::fastdds; constexpr size_t CAPACITY = 32; diff --git a/test/unittest/utils/LocatorTests.cpp b/test/unittest/utils/LocatorTests.cpp index 08d126628d0..a37ab7f1cde 100644 --- a/test/unittest/utils/LocatorTests.cpp +++ b/test/unittest/utils/LocatorTests.cpp @@ -23,7 +23,7 @@ #include #include -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; // Checks whether the address of two locators are equal byte to byte static bool address_match( @@ -1602,7 +1602,7 @@ TEST(LocatorTests, LocatorList_deserialization) */ TEST(RemoteLocatorsTests, add_unicast_locator_repetead) { - eprosima::fastrtps::rtps::RemoteLocatorList rll; + eprosima::fastdds::rtps::RemoteLocatorList rll; Locator_t locator_1; Locator_t locator_2; Locator_t locator_3; @@ -1626,7 +1626,7 @@ TEST(RemoteLocatorsTests, add_unicast_locator_repetead) */ TEST(RemoteLocatorsTests, add_multicast_locator_repetead) { - eprosima::fastrtps::rtps::RemoteLocatorList rll; + eprosima::fastdds::rtps::RemoteLocatorList rll; Locator_t locator_1, locator_2, locator_3; ASSERT_EQ(rll.multicast.size(), 0u); @@ -1648,7 +1648,7 @@ TEST(RemoteLocatorsTests, add_multicast_locator_repetead) */ TEST(RemoteLocatorsTests, RemoteLocator_serialization) { - eprosima::fastrtps::rtps::RemoteLocatorList rll; + eprosima::fastdds::rtps::RemoteLocatorList rll; Locator_t locator; std::string serialized; std::stringstream serialized_ss; @@ -1684,7 +1684,7 @@ TEST(RemoteLocatorsTests, RemoteLocator_serialization) ASSERT_EQ(serialized_ss.str(), str_result); // Check unicast List - eprosima::fastrtps::rtps::RemoteLocatorList rll_2; + eprosima::fastdds::rtps::RemoteLocatorList rll_2; IPLocator::createLocator(LOCATOR_KIND_UDPv4, "1.2.3.4", 3, locator); rll_2.add_unicast_locator(locator); IPLocator::createLocator(LOCATOR_KIND_UDPv4, "04.03.02.01", 4, locator); @@ -1698,7 +1698,7 @@ TEST(RemoteLocatorsTests, RemoteLocator_serialization) */ TEST(RemoteLocatorsTests, RemoteLocator_deserialization) { - eprosima::fastrtps::rtps::RemoteLocatorList rll; + eprosima::fastdds::rtps::RemoteLocatorList rll; Locator_t locator; std::string serialized; std::stringstream serialized_ss; @@ -1743,8 +1743,8 @@ TEST(RemoteLocatorsTests, RemoteLocator_deserialization) TEST(LocatorListComparisonTests, locatorList_comparison) { Locator_t locator; - eprosima::fastrtps::ResourceLimitedVector locator_list_1; - eprosima::fastrtps::ResourceLimitedVector locator_list_2; + eprosima::fastdds::ResourceLimitedVector locator_list_1; + eprosima::fastdds::ResourceLimitedVector locator_list_2; IPLocator::createLocator(LOCATOR_KIND_TCPv4, "1.2.3.4", 1, locator); locator_list_1.push_back(locator); diff --git a/test/unittest/utils/ResourceLimitedVectorTests.cpp b/test/unittest/utils/ResourceLimitedVectorTests.cpp index 5772fdc4f2a..377fe08558f 100644 --- a/test/unittest/utils/ResourceLimitedVectorTests.cpp +++ b/test/unittest/utils/ResourceLimitedVectorTests.cpp @@ -15,7 +15,7 @@ #include #include -using namespace eprosima::fastrtps; +using namespace eprosima::fastdds; // Power of two has been chosen to allow for ASSERT_EQ on capacity, as // some implementations of std::vector would enforce power of two capacities diff --git a/test/unittest/xmlparser/XMLElementParserTests.cpp b/test/unittest/xmlparser/XMLElementParserTests.cpp index 3c788db09b7..e5c09f7523a 100644 --- a/test/unittest/xmlparser/XMLElementParserTests.cpp +++ b/test/unittest/xmlparser/XMLElementParserTests.cpp @@ -40,21 +40,20 @@ using namespace eprosima::fastdds::dds; using namespace eprosima::fastdds::rtps; -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; using namespace eprosima::testing; -using eprosima::fastrtps::xmlparser::BaseNode; -using eprosima::fastrtps::xmlparser::DataNode; -using eprosima::fastrtps::xmlparser::NodeType; -using eprosima::fastrtps::xmlparser::XMLP_ret; -using eprosima::fastrtps::xmlparser::XMLParser; -using eprosima::fastrtps::xmlparser::up_participant_t; -using eprosima::fastrtps::xmlparser::up_node_participant_t; -using eprosima::fastrtps::xmlparser::node_participant_t; -using eprosima::fastrtps::xmlparser::sp_transport_t; +using xmlparser::BaseNode; +using xmlparser::DataNode; +using xmlparser::NodeType; +using xmlparser::XMLP_ret; +using xmlparser::XMLParser; +using xmlparser::up_participant_t; +using xmlparser::up_node_participant_t; +using xmlparser::node_participant_t; +using xmlparser::sp_transport_t; -using eprosima::fastrtps::xmlparser::XMLProfileManager; +using xmlparser::XMLProfileManager; class XMLParserTests : public ::testing::Test { @@ -1772,7 +1771,7 @@ TEST_F(XMLParserTests, getXMLWriterReaderUnsupportedQosPolicies) TEST_F(XMLParserTests, ParticipantAllocationAttributesDataLimits) { uint8_t ident = 1; - eprosima::fastrtps::rtps::RTPSParticipantAllocationAttributes allocation; + eprosima::fastdds::rtps::RTPSParticipantAllocationAttributes allocation; tinyxml2::XMLDocument xml_doc; tinyxml2::XMLElement* titleElement; @@ -1811,7 +1810,7 @@ TEST_F(XMLParserTests, ParticipantAllocationAttributesDataLimits) TEST_F(XMLParserTests, getXMLDiscoverySettingsStaticEDP) { uint8_t ident = 1; - eprosima::fastrtps::rtps::DiscoverySettings settings; + eprosima::fastdds::rtps::DiscoverySettings settings; tinyxml2::XMLDocument xml_doc; tinyxml2::XMLElement* titleElement; @@ -3473,11 +3472,11 @@ TEST_F(XMLParserTests, getXMLRemoteLocatorsAllocationAttributes_NegativeClauses) * 1. null input * 2. empty input * 3. invalid input - * 2. Check XMLEnum with arg DiscoveryProtocol_t + * 2. Check XMLEnum with arg DiscoveryProtocol * 1. null input * 2. empty input * 3. invalid input - * 3. Check XMLEnum with arg ParticipantFilteringFlags_t + * 3. Check XMLEnum with arg ParticipantFilteringFlags * 1. null input * 2. empty input * 3. invalid input @@ -3519,7 +3518,7 @@ TEST_F(XMLParserTests, getXMLEnum_NegativeClauses) // DiscoveryProtocol Enum { - DiscoveryProtocol_t e; + DiscoveryProtocol e; const char* enum_p = "\ \ @@ -3544,9 +3543,9 @@ TEST_F(XMLParserTests, getXMLEnum_NegativeClauses) EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParserTest::getXMLEnum_wrapper(titleElement, &e, ident)); } - // ParticipantFilteringFlags_t Enum + // ParticipantFilteringFlags Enum { - ParticipantFilteringFlags_t e; + ParticipantFilteringFlags e; const char* enum_p = "\ %s\ @@ -3574,13 +3573,13 @@ TEST_F(XMLParserTests, getXMLEnum_NegativeClauses) * This test checks the positive cases in the xml child element of * 1. Check XMLEnum with arg IntraprocessDeliveryType * 1. INTRAPROCESS_OFF - * 2. Check XMLEnum with arg DiscoveryProtocol_t + * 2. Check XMLEnum with arg DiscoveryProtocol * 1. NONE * 2. CLIENT * 3. SERVER * 4. BACKUP * 5. SUPER_CLIENT - * 3. Check XMLEnum with arg ParticipantFilteringFlags_t + * 3. Check XMLEnum with arg ParticipantFilteringFlags * 1. FILTER_DIFFERENT_PROCESS */ TEST_F(XMLParserTests, getXMLEnum_positive) @@ -3623,7 +3622,7 @@ TEST_F(XMLParserTests, getXMLEnum_positive) // DiscoveryProtocol Enum { - DiscoveryProtocol_t e; + DiscoveryProtocol e; const char* enum_p = "\ %s\ @@ -3634,40 +3633,40 @@ TEST_F(XMLParserTests, getXMLEnum_positive) ASSERT_EQ(tinyxml2::XMLError::XML_SUCCESS, xml_doc.Parse(xml)); titleElement = xml_doc.RootElement(); EXPECT_EQ(XMLP_ret::XML_OK, XMLParserTest::getXMLEnum_wrapper(titleElement, &e, ident)); - EXPECT_EQ(DiscoveryProtocol_t::NONE, e); + EXPECT_EQ(DiscoveryProtocol::NONE, e); // CLIENT case snprintf(xml, xml_len, enum_p, "CLIENT"); ASSERT_EQ(tinyxml2::XMLError::XML_SUCCESS, xml_doc.Parse(xml)); titleElement = xml_doc.RootElement(); EXPECT_EQ(XMLP_ret::XML_OK, XMLParserTest::getXMLEnum_wrapper(titleElement, &e, ident)); - EXPECT_EQ(DiscoveryProtocol_t::CLIENT, e); + EXPECT_EQ(DiscoveryProtocol::CLIENT, e); // SERVER case snprintf(xml, xml_len, enum_p, "SERVER"); ASSERT_EQ(tinyxml2::XMLError::XML_SUCCESS, xml_doc.Parse(xml)); titleElement = xml_doc.RootElement(); EXPECT_EQ(XMLP_ret::XML_OK, XMLParserTest::getXMLEnum_wrapper(titleElement, &e, ident)); - EXPECT_EQ(DiscoveryProtocol_t::SERVER, e); + EXPECT_EQ(DiscoveryProtocol::SERVER, e); // BACKUP case snprintf(xml, xml_len, enum_p, "BACKUP"); ASSERT_EQ(tinyxml2::XMLError::XML_SUCCESS, xml_doc.Parse(xml)); titleElement = xml_doc.RootElement(); EXPECT_EQ(XMLP_ret::XML_OK, XMLParserTest::getXMLEnum_wrapper(titleElement, &e, ident)); - EXPECT_EQ(DiscoveryProtocol_t::BACKUP, e); + EXPECT_EQ(DiscoveryProtocol::BACKUP, e); // SUPER_CLIENT case snprintf(xml, xml_len, enum_p, "SUPER_CLIENT"); ASSERT_EQ(tinyxml2::XMLError::XML_SUCCESS, xml_doc.Parse(xml)); titleElement = xml_doc.RootElement(); EXPECT_EQ(XMLP_ret::XML_OK, XMLParserTest::getXMLEnum_wrapper(titleElement, &e, ident)); - EXPECT_EQ(DiscoveryProtocol_t::SUPER_CLIENT, e); + EXPECT_EQ(DiscoveryProtocol::SUPER_CLIENT, e); } - // ParticipantFilteringFlags_t Enum + // ParticipantFilteringFlags Enum { - ParticipantFilteringFlags_t e(ParticipantFilteringFlags_t::NO_FILTER); + ParticipantFilteringFlags e(ParticipantFilteringFlags::NO_FILTER); const char* enum_p = "\ FILTER_DIFFERENT_PROCESS\ @@ -3677,7 +3676,7 @@ TEST_F(XMLParserTests, getXMLEnum_positive) ASSERT_EQ(tinyxml2::XMLError::XML_SUCCESS, xml_doc.Parse(enum_p)); titleElement = xml_doc.RootElement(); EXPECT_EQ(XMLP_ret::XML_OK, XMLParserTest::getXMLEnum_wrapper(titleElement, &e, ident)); - EXPECT_EQ(ParticipantFilteringFlags_t::FILTER_DIFFERENT_PROCESS, e); + EXPECT_EQ(ParticipantFilteringFlags::FILTER_DIFFERENT_PROCESS, e); } } diff --git a/test/unittest/xmlparser/XMLEndpointParserTests.cpp b/test/unittest/xmlparser/XMLEndpointParserTests.cpp index bcc68126fc9..8de9dc72d41 100644 --- a/test/unittest/xmlparser/XMLEndpointParserTests.cpp +++ b/test/unittest/xmlparser/XMLEndpointParserTests.cpp @@ -31,15 +31,15 @@ #include "../logging/mock/MockConsumer.h" -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; using namespace ::testing; -using eprosima::fastrtps::xmlparser::XMLP_ret; -using eprosima::fastrtps::xmlparser::XMLEndpointParser; -using eprosima::fastrtps::xmlparser::StaticRTPSParticipantInfo; -using eprosima::fastrtps::rtps::ReaderProxyData; -using eprosima::fastrtps::rtps::WriterProxyData; +using eprosima::fastdds::xmlparser::XMLP_ret; +using eprosima::fastdds::xmlparser::XMLEndpointParser; +using eprosima::fastdds::xmlparser::StaticRTPSParticipantInfo; +using eprosima::fastdds::rtps::ReaderProxyData; +using eprosima::fastdds::rtps::WriterProxyData; using eprosima::fastdds::dds::Log; using eprosima::fastdds::dds::LogConsumer; diff --git a/test/unittest/xmlparser/XMLLoadFileTests.cpp b/test/unittest/xmlparser/XMLLoadFileTests.cpp index 557170d7710..aa2af73a8db 100644 --- a/test/unittest/xmlparser/XMLLoadFileTests.cpp +++ b/test/unittest/xmlparser/XMLLoadFileTests.cpp @@ -29,7 +29,7 @@ #include using namespace eprosima::fastdds::dds; -using namespace eprosima::fastrtps; +using namespace eprosima::fastdds; using namespace ::testing; class XMLLoadFileTests : public ::testing::Test diff --git a/test/unittest/xmlparser/XMLParserTests.cpp b/test/unittest/xmlparser/XMLParserTests.cpp index 396a0b37c5a..f61b68a5c91 100644 --- a/test/unittest/xmlparser/XMLParserTests.cpp +++ b/test/unittest/xmlparser/XMLParserTests.cpp @@ -44,15 +44,15 @@ #include "../logging/mock/MockConsumer.h" #include "wrapper/XMLParserTest.hpp" -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds; +using namespace eprosima::fastdds::rtps; using namespace ::testing; -using eprosima::fastrtps::xmlparser::BaseNode; -using eprosima::fastrtps::xmlparser::DataNode; -using eprosima::fastrtps::xmlparser::NodeType; -using eprosima::fastrtps::xmlparser::XMLP_ret; -using eprosima::fastrtps::xmlparser::XMLParser; +using eprosima::fastdds::xmlparser::BaseNode; +using eprosima::fastdds::xmlparser::DataNode; +using eprosima::fastdds::xmlparser::NodeType; +using eprosima::fastdds::xmlparser::XMLP_ret; +using eprosima::fastdds::xmlparser::XMLParser; using eprosima::fastdds::dds::Log; using eprosima::fastdds::dds::LogConsumer; @@ -496,7 +496,7 @@ TEST_F(XMLParserTests, Data) locator.port = 1979; EXPECT_EQ(rtps_atts.sendSocketBufferSize, 32u); EXPECT_EQ(rtps_atts.listenSocketBufferSize, 1000u); - EXPECT_EQ(builtin.discovery_config.discoveryProtocol, eprosima::fastrtps::rtps::DiscoveryProtocol::SIMPLE); + EXPECT_EQ(builtin.discovery_config.discoveryProtocol, eprosima::fastdds::rtps::DiscoveryProtocol::SIMPLE); EXPECT_EQ(builtin.use_WriterLivelinessProtocol, false); EXPECT_EQ(builtin.discovery_config.use_SIMPLE_EndpointDiscoveryProtocol, true); EXPECT_EQ(builtin.discovery_config.use_STATIC_EndpointDiscoveryProtocol, false); @@ -590,7 +590,7 @@ TEST_F(XMLParserTests, DataDeprecated) locator.port = 1979; EXPECT_EQ(rtps_atts.sendSocketBufferSize, 32u); EXPECT_EQ(rtps_atts.listenSocketBufferSize, 1000u); - EXPECT_EQ(builtin.discovery_config.discoveryProtocol, eprosima::fastrtps::rtps::DiscoveryProtocol::SIMPLE); + EXPECT_EQ(builtin.discovery_config.discoveryProtocol, eprosima::fastdds::rtps::DiscoveryProtocol::SIMPLE); EXPECT_EQ(builtin.use_WriterLivelinessProtocol, false); EXPECT_EQ(builtin.discovery_config.use_SIMPLE_EndpointDiscoveryProtocol, true); EXPECT_EQ(builtin.discovery_config.use_STATIC_EndpointDiscoveryProtocol, false); @@ -684,7 +684,7 @@ TEST_F(XMLParserTests, DataBuffer) locator.port = 1979; EXPECT_EQ(rtps_atts.sendSocketBufferSize, 32u); EXPECT_EQ(rtps_atts.listenSocketBufferSize, 1000u); - EXPECT_EQ(builtin.discovery_config.discoveryProtocol, eprosima::fastrtps::rtps::DiscoveryProtocol::SIMPLE); + EXPECT_EQ(builtin.discovery_config.discoveryProtocol, eprosima::fastdds::rtps::DiscoveryProtocol::SIMPLE); EXPECT_EQ(builtin.use_WriterLivelinessProtocol, false); EXPECT_EQ(builtin.discovery_config.use_SIMPLE_EndpointDiscoveryProtocol, true); EXPECT_EQ(builtin.discovery_config.use_STATIC_EndpointDiscoveryProtocol, false); @@ -778,7 +778,7 @@ TEST_F(XMLParserTests, DataBufferDeprecated) locator.port = 1979; EXPECT_EQ(rtps_atts.sendSocketBufferSize, 32u); EXPECT_EQ(rtps_atts.listenSocketBufferSize, 1000u); - EXPECT_EQ(builtin.discovery_config.discoveryProtocol, eprosima::fastrtps::rtps::DiscoveryProtocol::SIMPLE); + EXPECT_EQ(builtin.discovery_config.discoveryProtocol, eprosima::fastdds::rtps::DiscoveryProtocol::SIMPLE); EXPECT_EQ(builtin.use_WriterLivelinessProtocol, false); EXPECT_EQ(builtin.discovery_config.use_SIMPLE_EndpointDiscoveryProtocol, true); EXPECT_EQ(builtin.discovery_config.use_STATIC_EndpointDiscoveryProtocol, false); diff --git a/test/unittest/xmlparser/XMLParserTests.hpp b/test/unittest/xmlparser/XMLParserTests.hpp index 7e3be090639..8a07987ab4d 100644 --- a/test/unittest/xmlparser/XMLParserTests.hpp +++ b/test/unittest/xmlparser/XMLParserTests.hpp @@ -22,9 +22,8 @@ #include "../logging/mock/MockConsumer.h" using namespace eprosima::fastdds; -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; -using namespace eprosima::fastrtps::xmlparser; +using namespace eprosima::fastdds::rtps; +using namespace eprosima::fastdds::xmlparser; using namespace ::testing; diff --git a/test/unittest/xmlparser/XMLProfileParserTests.cpp b/test/unittest/xmlparser/XMLProfileParserTests.cpp index 765f0f0c431..56a448202d1 100644 --- a/test/unittest/xmlparser/XMLProfileParserTests.cpp +++ b/test/unittest/xmlparser/XMLProfileParserTests.cpp @@ -43,8 +43,7 @@ #include "../common/env_var_utils.hpp" using namespace eprosima::fastdds; -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; +using namespace eprosima::fastdds::rtps; using namespace eprosima::testing; using namespace ::testing; @@ -520,10 +519,10 @@ TEST_P(XMLProfileParserTests, XMLParserParticipant) EXPECT_TRUE(rtps_atts.ignore_non_matching_locators); EXPECT_EQ(rtps_atts.sendSocketBufferSize, 32u); EXPECT_EQ(rtps_atts.listenSocketBufferSize, 1000u); - EXPECT_EQ(builtin.discovery_config.discoveryProtocol, eprosima::fastrtps::rtps::DiscoveryProtocol::SIMPLE); + EXPECT_EQ(builtin.discovery_config.discoveryProtocol, eprosima::fastdds::rtps::DiscoveryProtocol::SIMPLE); EXPECT_EQ(builtin.discovery_config.ignoreParticipantFlags, - eprosima::fastrtps::rtps::ParticipantFilteringFlags_t::FILTER_SAME_PROCESS | - eprosima::fastrtps::rtps::ParticipantFilteringFlags_t::FILTER_DIFFERENT_HOST); + eprosima::fastdds::rtps::ParticipantFilteringFlags::FILTER_SAME_PROCESS | + eprosima::fastdds::rtps::ParticipantFilteringFlags::FILTER_DIFFERENT_HOST); EXPECT_EQ(builtin.use_WriterLivelinessProtocol, false); EXPECT_EQ(builtin.discovery_config.use_SIMPLE_EndpointDiscoveryProtocol, true); EXPECT_EQ(builtin.discovery_config.use_STATIC_EndpointDiscoveryProtocol, false); @@ -620,10 +619,10 @@ TEST_F(XMLProfileParserBasicTests, XMLParserParticipantDeprecated) EXPECT_TRUE(rtps_atts.ignore_non_matching_locators); EXPECT_EQ(rtps_atts.sendSocketBufferSize, 32u); EXPECT_EQ(rtps_atts.listenSocketBufferSize, 1000u); - EXPECT_EQ(builtin.discovery_config.discoveryProtocol, eprosima::fastrtps::rtps::DiscoveryProtocol::SIMPLE); + EXPECT_EQ(builtin.discovery_config.discoveryProtocol, eprosima::fastdds::rtps::DiscoveryProtocol::SIMPLE); EXPECT_EQ(builtin.discovery_config.ignoreParticipantFlags, - eprosima::fastrtps::rtps::ParticipantFilteringFlags_t::FILTER_SAME_PROCESS | - eprosima::fastrtps::rtps::ParticipantFilteringFlags_t::FILTER_DIFFERENT_HOST); + eprosima::fastdds::rtps::ParticipantFilteringFlags::FILTER_SAME_PROCESS | + eprosima::fastdds::rtps::ParticipantFilteringFlags::FILTER_DIFFERENT_HOST); EXPECT_EQ(builtin.use_WriterLivelinessProtocol, false); EXPECT_EQ(builtin.discovery_config.use_SIMPLE_EndpointDiscoveryProtocol, true); EXPECT_EQ(builtin.discovery_config.use_STATIC_EndpointDiscoveryProtocol, false); @@ -703,10 +702,10 @@ TEST_P(XMLProfileParserTests, XMLParserDefaultParticipantProfile) EXPECT_TRUE(rtps_atts.ignore_non_matching_locators); EXPECT_EQ(rtps_atts.sendSocketBufferSize, 32u); EXPECT_EQ(rtps_atts.listenSocketBufferSize, 1000u); - EXPECT_EQ(builtin.discovery_config.discoveryProtocol, eprosima::fastrtps::rtps::DiscoveryProtocol::SIMPLE); + EXPECT_EQ(builtin.discovery_config.discoveryProtocol, eprosima::fastdds::rtps::DiscoveryProtocol::SIMPLE); EXPECT_EQ(builtin.discovery_config.ignoreParticipantFlags, - eprosima::fastrtps::rtps::ParticipantFilteringFlags_t::FILTER_SAME_PROCESS | - eprosima::fastrtps::rtps::ParticipantFilteringFlags_t::FILTER_DIFFERENT_HOST); + eprosima::fastdds::rtps::ParticipantFilteringFlags::FILTER_SAME_PROCESS | + eprosima::fastdds::rtps::ParticipantFilteringFlags::FILTER_DIFFERENT_HOST); EXPECT_EQ(builtin.use_WriterLivelinessProtocol, false); EXPECT_EQ(builtin.discovery_config.use_SIMPLE_EndpointDiscoveryProtocol, true); EXPECT_EQ(builtin.discovery_config.use_STATIC_EndpointDiscoveryProtocol, false); @@ -786,10 +785,10 @@ TEST_F(XMLProfileParserBasicTests, XMLParserDefaultParticipantProfileDeprecated) EXPECT_TRUE(rtps_atts.ignore_non_matching_locators); EXPECT_EQ(rtps_atts.sendSocketBufferSize, 32u); EXPECT_EQ(rtps_atts.listenSocketBufferSize, 1000u); - EXPECT_EQ(builtin.discovery_config.discoveryProtocol, eprosima::fastrtps::rtps::DiscoveryProtocol::SIMPLE); + EXPECT_EQ(builtin.discovery_config.discoveryProtocol, eprosima::fastdds::rtps::DiscoveryProtocol::SIMPLE); EXPECT_EQ(builtin.discovery_config.ignoreParticipantFlags, - eprosima::fastrtps::rtps::ParticipantFilteringFlags_t::FILTER_SAME_PROCESS | - eprosima::fastrtps::rtps::ParticipantFilteringFlags_t::FILTER_DIFFERENT_HOST); + eprosima::fastdds::rtps::ParticipantFilteringFlags::FILTER_SAME_PROCESS | + eprosima::fastdds::rtps::ParticipantFilteringFlags::FILTER_DIFFERENT_HOST); EXPECT_EQ(builtin.use_WriterLivelinessProtocol, false); EXPECT_EQ(builtin.discovery_config.use_SIMPLE_EndpointDiscoveryProtocol, true); EXPECT_EQ(builtin.discovery_config.use_STATIC_EndpointDiscoveryProtocol, false); @@ -1587,9 +1586,9 @@ TEST_F(XMLProfileParserBasicTests, log_register_stdouterr) EXPECT_CALL(*log_mock, ClearConsumers()).Times(1); EXPECT_CALL(*log_mock, RegisterConsumer(IsStdoutErrConsumer())).Times(1); - eprosima::fastrtps::xmlparser::XMLP_ret ret = + eprosima::fastdds::xmlparser::XMLP_ret ret = xmlparser::XMLProfileManager::loadXMLFile("log_stdouterr_profile.xml"); - ASSERT_EQ(eprosima::fastrtps::xmlparser::XMLP_ret::XML_OK, ret); + ASSERT_EQ(eprosima::fastdds::xmlparser::XMLP_ret::XML_OK, ret); } /* @@ -1606,9 +1605,9 @@ TEST_F(XMLProfileParserBasicTests, log_register_stdouterr_wrong_property_name) EXPECT_CALL(*log_mock, ClearConsumers()).Times(1); EXPECT_CALL(*log_mock, RegisterConsumer(IsStdoutErrConsumer())).Times(1); - eprosima::fastrtps::xmlparser::XMLP_ret ret = xmlparser::XMLProfileManager::loadXMLFile( + eprosima::fastdds::xmlparser::XMLP_ret ret = xmlparser::XMLProfileManager::loadXMLFile( "log_stdouterr_wrong_property_name_profile_invalid.xml"); - ASSERT_EQ(eprosima::fastrtps::xmlparser::XMLP_ret::XML_ERROR, ret); + ASSERT_EQ(eprosima::fastdds::xmlparser::XMLP_ret::XML_ERROR, ret); } /* @@ -1625,9 +1624,9 @@ TEST_F(XMLProfileParserBasicTests, log_register_stdouterr_wrong_property_value) EXPECT_CALL(*log_mock, ClearConsumers()).Times(1); EXPECT_CALL(*log_mock, RegisterConsumer(IsStdoutErrConsumer())).Times(1); - eprosima::fastrtps::xmlparser::XMLP_ret ret = xmlparser::XMLProfileManager::loadXMLFile( + eprosima::fastdds::xmlparser::XMLP_ret ret = xmlparser::XMLProfileManager::loadXMLFile( "log_stdouterr_wrong_property_value_profile_invalid.xml"); - ASSERT_EQ(eprosima::fastrtps::xmlparser::XMLP_ret::XML_ERROR, ret); + ASSERT_EQ(eprosima::fastdds::xmlparser::XMLP_ret::XML_ERROR, ret); } /* @@ -1647,9 +1646,9 @@ TEST_F(XMLProfileParserBasicTests, log_register_stdouterr_two_thresholds) EXPECT_CALL(*log_mock, ClearConsumers()).Times(1); EXPECT_CALL(*log_mock, RegisterConsumer(IsStdoutErrConsumer())).Times(1); - eprosima::fastrtps::xmlparser::XMLP_ret ret = xmlparser::XMLProfileManager::loadXMLFile( + eprosima::fastdds::xmlparser::XMLP_ret ret = xmlparser::XMLProfileManager::loadXMLFile( "log_stdouterr_two_thresholds_profile.xml"); - ASSERT_EQ(eprosima::fastrtps::xmlparser::XMLP_ret::XML_ERROR, ret); + ASSERT_EQ(eprosima::fastdds::xmlparser::XMLP_ret::XML_ERROR, ret); } TEST_F(XMLProfileParserBasicTests, file_and_default) diff --git a/test/unittest/xmlparser/XMLTreeTests.cpp b/test/unittest/xmlparser/XMLTreeTests.cpp index 2bdcd23f13a..a0dbdcb318b 100644 --- a/test/unittest/xmlparser/XMLTreeTests.cpp +++ b/test/unittest/xmlparser/XMLTreeTests.cpp @@ -19,7 +19,7 @@ #include -using namespace eprosima::fastrtps::xmlparser; +using namespace eprosima::fastdds::xmlparser; using namespace ::testing; diff --git a/test/unittest/xmlparser/wrapper/XMLParserTest.hpp b/test/unittest/xmlparser/wrapper/XMLParserTest.hpp index 327e7eb01a9..46b8499b72b 100644 --- a/test/unittest/xmlparser/wrapper/XMLParserTest.hpp +++ b/test/unittest/xmlparser/wrapper/XMLParserTest.hpp @@ -21,17 +21,16 @@ using namespace eprosima::fastdds; using namespace eprosima::fastdds::dds; -using namespace eprosima::fastrtps; -using namespace eprosima::fastrtps::rtps; - -using eprosima::fastrtps::xmlparser::XMLP_ret; -using eprosima::fastrtps::xmlparser::XMLParser; -using eprosima::fastrtps::xmlparser::DataNode; -using eprosima::fastrtps::xmlparser::BaseNode; -using eprosima::fastrtps::xmlparser::sp_transport_t; -using eprosima::fastrtps::xmlparser::up_participant_t; -using eprosima::fastrtps::xmlparser::up_node_participant_t; -using eprosima::fastrtps::xmlparser::node_participant_t; +using namespace eprosima::fastdds::rtps; + +using eprosima::fastdds::xmlparser::XMLP_ret; +using eprosima::fastdds::xmlparser::XMLParser; +using eprosima::fastdds::xmlparser::DataNode; +using eprosima::fastdds::xmlparser::BaseNode; +using eprosima::fastdds::xmlparser::sp_transport_t; +using eprosima::fastdds::xmlparser::up_participant_t; +using eprosima::fastdds::xmlparser::up_node_participant_t; +using eprosima::fastdds::xmlparser::node_participant_t; // Class to test protected methods class XMLParserTest : public XMLParser @@ -416,7 +415,7 @@ class XMLParserTest : public XMLParser static XMLP_ret getXMLEnum_wrapper( tinyxml2::XMLElement* elem, - DiscoveryProtocol_t* e, + DiscoveryProtocol* e, uint8_t ident) { return getXMLEnum(elem, e, ident); @@ -424,7 +423,7 @@ class XMLParserTest : public XMLParser static XMLP_ret getXMLEnum_wrapper( tinyxml2::XMLElement* elem, - ParticipantFilteringFlags_t* e, + ParticipantFilteringFlags* e, uint8_t ident) { return getXMLEnum(elem, e, ident); @@ -466,7 +465,7 @@ class XMLParserTest : public XMLParser static XMLP_ret parseXMLCommonTCPTransportData_wrapper( tinyxml2::XMLElement* p_root, - eprosima::fastrtps::xmlparser::sp_transport_t p_transport) + eprosima::fastdds::xmlparser::sp_transport_t p_transport) { return parseXMLCommonTCPTransportData(p_root, p_transport); } @@ -491,7 +490,7 @@ class XMLParserTest : public XMLParser static XMLP_ret parseXML_wrapper( tinyxml2::XMLDocument& xmlDoc, - eprosima::fastrtps::xmlparser::up_base_node_t& root) + eprosima::fastdds::xmlparser::up_base_node_t& root) { return parseXML(xmlDoc, root); } @@ -505,7 +504,7 @@ class XMLParserTest : public XMLParser static XMLP_ret parse_tls_config_wrapper( tinyxml2::XMLElement* p_root, - eprosima::fastrtps::xmlparser::sp_transport_t tcp_transport) + eprosima::fastdds::xmlparser::sp_transport_t tcp_transport) { return parse_tls_config(p_root, tcp_transport); } diff --git a/tools/fds/server.cpp b/tools/fds/server.cpp index 251aab948f5..ddb11b6d91e 100644 --- a/tools/fds/server.cpp +++ b/tools/fds/server.cpp @@ -56,9 +56,9 @@ int fastdds_discovery_server( char* argv[]) { // Convenience aliases - using Locator = fastrtps::rtps::Locator_t; - using DiscoveryProtocol = fastrtps::rtps::DiscoveryProtocol_t; - using IPLocator = fastrtps::rtps::IPLocator; + using Locator = fastdds::rtps::Locator_t; + using DiscoveryProtocol = fastdds::rtps::DiscoveryProtocol; + using IPLocator = fastdds::rtps::IPLocator; // Skip program name argv[0] if present argc -= (argc > 0); @@ -172,7 +172,7 @@ int fastdds_discovery_server( if (nullptr == pOp) { - fastrtps::rtps::GuidPrefix_t prefix_cero; + fastdds::rtps::GuidPrefix_t prefix_cero; if (participantQos.wire_protocol().prefix == prefix_cero) { std::cout << "Server id is mandatory if not defined in the XML file: use -i or --server-id option." << @@ -180,9 +180,9 @@ int fastdds_discovery_server( return 1; } else if (!(participantQos.wire_protocol().builtin.discovery_config.discoveryProtocol == - eprosima::fastrtps::rtps::DiscoveryProtocol::SERVER || + eprosima::fastdds::rtps::DiscoveryProtocol::SERVER || participantQos.wire_protocol().builtin.discovery_config.discoveryProtocol == - eprosima::fastrtps::rtps::DiscoveryProtocol::BACKUP)) + eprosima::fastdds::rtps::DiscoveryProtocol::BACKUP)) { std::cout << "The provided configuration is not valid. Participant must be either SERVER or BACKUP. " << std::endl; @@ -542,7 +542,7 @@ int fastdds_discovery_server( } } - fastrtps::rtps::GuidPrefix_t guid_prefix = participantQos.wire_protocol().prefix; + fastdds::rtps::GuidPrefix_t guid_prefix = participantQos.wire_protocol().prefix; // Create the server int return_value = 0; diff --git a/versions.md b/versions.md index 42bd14fc5a7..0081785bf15 100644 --- a/versions.md +++ b/versions.md @@ -57,6 +57,7 @@ Forthcoming * New Gather-send method is now used by default, avoiding an extra copy during the creation of the RTPS message. * New attribute in `SendBuffersAllocationAttributes` to configure allocation of `NetworkBuffer` vector. * `SenderResource` and Transport APIs now receive a collection of `NetworkBuffer` on their `send` method. +* Migrate fastrtps namespace to fastdds Version 2.14.0 -------------- @@ -93,7 +94,7 @@ Version 2.12.0 - Data type source code generated with Fast DDS-Gen v2 should be regenerated using Fast DDS-Gen v3. - **API break**. Changed a `MEMBER_INVALID` identifier from a `#define` to a `constexpr`. Although this is not a new major version, using a `#define` is a bad conduct which was decided to be changed. - Note that new `constexpr` is inside namespace `eprosima::fastrtps::types`. + Note that new `constexpr` is inside namespace `eprosima::fastdds::types`. Version 2.11.0 -------------- @@ -186,7 +187,7 @@ Version 2.6.0 * Allow modifying the remote server locator in runtime. * Add physical information in DATA[p] using properties * Extension of `DISCOVERY_TOPIC` to include physical information about the discovered entity (ABI break) -* Added methods getting `fastrtps::Time_t` as parameters instead of `fastrtps::rtps::Time_t` (API extension, API +* Added methods getting `fastdds::Time_t` as parameters instead of `fastdds::rtps::Time_t` (API extension, API deprecations). * Changed signature of eprosima::fastdds::dds::DataWriter::dispose_w_timestamp (ABI break). * Added method getting `std::vector&` instead of `std::vector&` (API extension, API @@ -227,7 +228,7 @@ Version 2.3.0 * Added support for unique network flows * Added reception_timestamp to `eprosima::fastdds::dds::SampleInfo` (ABI break) * Added `eprosima::fastdds::dds::DataReader::get_unread_count` (ABI break) -* Refactor `eprosima::fastrtps::type::ReturnCode_t`. Now the constant global objects are no longer available (ABI break) +* Refactor `eprosima::fastdds::type::ReturnCode_t`. Now the constant global objects are no longer available (ABI break) * Performance tests refactored to use DDS-PIM high-level API Version 2.2.0 @@ -320,16 +321,16 @@ Version 2.0.0 This release has the following **API breaks**: * eClock API, which was deprecated on v1.9.1, has been removed -* `eprosima::fastrtps::rtps::RTPSDomain::createParticipant` methods now have an additional first argument `domain_id` -* Data member `domainId` has been removed from `eprosima::fastrtps::rtps::RTPSParticipantAttributes` and added to - `eprosima::fastrtps::ParticipantAttributes` +* `eprosima::fastdds::rtps::RTPSDomain::createParticipant` methods now have an additional first argument `domain_id` +* Data member `domainId` has been removed from `eprosima::fastdds::rtps::RTPSParticipantAttributes` and added to + `eprosima::fastdds::ParticipantAttributes` Users should also be aware of the following **deprecation announcement**: -* All classes inside the namespace `eprosima::fastrtps` should be considered deprecated. +* All classes inside the namespace `eprosima::fastdds` should be considered deprecated. Equivalent functionality is offered through namespace `eprosima::fastdds`. -* Namespaces beneath `eprosima::fastrtps` are not included in this deprecation, i.e. - `eprosima::fastrtps::rtps` can still be used) +* Namespaces beneath `eprosima::fastdds` are not included in this deprecation, i.e. + `eprosima::fastdds::rtps` can still be used) This release adds the following **features**: