Skip to content

Commit 332db84

Browse files
elianalfelianalf
authored
Migrate fastrtps namespace to fastdds (#4898)
* Refs #21129: Migrate namespace fastrtps to fastdds Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #21129: Remove unnecessary using and nested namespaces Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #21129: Remove unused header Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #21129: Update version.md Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #21129: Uncrustify Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #21129: fix errors after reader refactor Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #21129: Uncrustify Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #21129: Fix compilation error Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #21129: Remove DiscoveryProtocol_t typedef Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #21129: Move variable declaration to remove warnings Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #21129: Remove typedef ParticipantFilteringFlags_t Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #21129: Remove typedef PDPFactory Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #21129: fix compilation issue Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #21129: Apply suggestions Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #21129: Apply suggestions Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #21129: solve compilation error after rebase Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #21129: Uncrustify Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #21129: Add missing code lost in the rebase Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> --------- Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
1 parent 22338f3 commit 332db84

970 files changed

Lines changed: 10684 additions & 10855 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎examples/cpp/configuration/CLIParser.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ class CLIParser
4545
int32_t max_samples = 5000;
4646
int32_t max_instances = 10;
4747
int32_t max_samples_per_instance = 400;
48-
uint32_t deadline = fastrtps::Duration_t::INFINITE_SECONDS;
49-
uint32_t lifespan = fastrtps::Duration_t::INFINITE_SECONDS;
50-
uint32_t liveliness_lease = fastrtps::Duration_t::INFINITE_SECONDS;
51-
uint32_t liveliness_assert = fastrtps::Duration_t::INFINITE_SECONDS - 1;
48+
uint32_t deadline = fastdds::Duration_t::INFINITE_SECONDS;
49+
uint32_t lifespan = fastdds::Duration_t::INFINITE_SECONDS;
50+
uint32_t liveliness_lease = fastdds::Duration_t::INFINITE_SECONDS;
51+
uint32_t liveliness_assert = fastdds::Duration_t::INFINITE_SECONDS - 1;
5252
std::string partitions = "";
5353
std::string profile_participant = "";
5454
std::string topic_name = "configuration_topic";
@@ -76,7 +76,7 @@ class CLIParser
7676
struct publisher_config : public entity_config
7777
{
7878
uint16_t wait = 0;
79-
uint32_t ack_keep_duration = fastrtps::Duration_t::INFINITE_SECONDS;
79+
uint32_t ack_keep_duration = fastdds::Duration_t::INFINITE_SECONDS;
8080
uint32_t interval = 100;
8181
uint32_t msg_size = 10;
8282
uint32_t ownership_strength = 0;

‎examples/cpp/configuration/ConfigurationPubSubTypes.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
#include "ConfigurationCdrAux.hpp"
2828
#include "ConfigurationTypeObjectSupport.hpp"
2929

30-
using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t;
31-
using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t;
30+
using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t;
31+
using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t;
3232
using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t;
3333

3434
ConfigurationPubSubType::ConfigurationPubSubType()

‎examples/cpp/configuration/ConfigurationPubSubTypes.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,18 @@ class ConfigurationPubSubType : public eprosima::fastdds::dds::TopicDataType
5454

5555
eProsima_user_DllExport bool serialize(
5656
void* data,
57-
eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
57+
eprosima::fastdds::rtps::SerializedPayload_t* payload) override
5858
{
5959
return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
6060
}
6161

6262
eProsima_user_DllExport bool serialize(
6363
void* data,
64-
eprosima::fastrtps::rtps::SerializedPayload_t* payload,
64+
eprosima::fastdds::rtps::SerializedPayload_t* payload,
6565
eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
6666

6767
eProsima_user_DllExport bool deserialize(
68-
eprosima::fastrtps::rtps::SerializedPayload_t* payload,
68+
eprosima::fastdds::rtps::SerializedPayload_t* payload,
6969
void* data) override;
7070

7171
eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
@@ -80,7 +80,7 @@ class ConfigurationPubSubType : public eprosima::fastdds::dds::TopicDataType
8080

8181
eProsima_user_DllExport bool getKey(
8282
void* data,
83-
eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
83+
eprosima::fastdds::rtps::InstanceHandle_t* ihandle,
8484
bool force_md5 = false) override;
8585

8686
eProsima_user_DllExport void* createData() override;

‎examples/cpp/configuration/PublisherApp.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,15 +139,15 @@ PublisherApp::PublisherApp(
139139
"DataWriter initialization failed: ownership strength is only valid with exclusive ownership");
140140
}
141141
writer_qos.ownership_strength().value = config.ownership_strength;
142-
writer_qos.deadline().period = eprosima::fastrtps::Duration_t(config.deadline * 1e-3);
142+
writer_qos.deadline().period = eprosima::fastdds::Duration_t(config.deadline * 1e-3);
143143
writer_qos.reliable_writer_qos().disable_positive_acks.enabled = config.disable_positive_ack;
144-
writer_qos.reliable_writer_qos().disable_positive_acks.duration = eprosima::fastrtps::Duration_t(
144+
writer_qos.reliable_writer_qos().disable_positive_acks.duration = eprosima::fastdds::Duration_t(
145145
config.ack_keep_duration * 1e-3);
146-
writer_qos.lifespan().duration = eprosima::fastrtps::Duration_t(config.lifespan * 1e-3);
146+
writer_qos.lifespan().duration = eprosima::fastdds::Duration_t(config.lifespan * 1e-3);
147147
writer_qos.liveliness().kind = config.liveliness;
148-
writer_qos.liveliness().lease_duration = eprosima::fastrtps::Duration_t(
148+
writer_qos.liveliness().lease_duration = eprosima::fastdds::Duration_t(
149149
config.liveliness_lease * 1e-3);
150-
writer_qos.liveliness().announcement_period = eprosima::fastrtps::Duration_t(
150+
writer_qos.liveliness().announcement_period = eprosima::fastdds::Duration_t(
151151
config.liveliness_assert * 1e-3);
152152
writer_ = publisher_->create_datawriter(topic_, writer_qos, this, StatusMask::all());
153153
}

‎examples/cpp/configuration/SubscriberApp.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,13 @@ SubscriberApp::SubscriberApp(
125125
reader_qos.resource_limits().max_instances = config.max_instances;
126126
reader_qos.resource_limits().max_samples_per_instance = config.max_samples_per_instance;
127127
reader_qos.ownership().kind = config.ownership;
128-
reader_qos.deadline().period = eprosima::fastrtps::Duration_t(config.deadline * 1e-3);
128+
reader_qos.deadline().period = eprosima::fastdds::Duration_t(config.deadline * 1e-3);
129129
reader_qos.reliable_reader_qos().disable_positive_ACKs.enabled = config.disable_positive_ack;
130-
reader_qos.lifespan().duration = eprosima::fastrtps::Duration_t(config.lifespan * 1e-3);
130+
reader_qos.lifespan().duration = eprosima::fastdds::Duration_t(config.lifespan * 1e-3);
131131
reader_qos.liveliness().kind = config.liveliness;
132-
reader_qos.liveliness().lease_duration = eprosima::fastrtps::Duration_t(
132+
reader_qos.liveliness().lease_duration = eprosima::fastdds::Duration_t(
133133
config.liveliness_lease * 1e-3);
134-
reader_qos.liveliness().announcement_period = eprosima::fastrtps::Duration_t(
134+
reader_qos.liveliness().announcement_period = eprosima::fastdds::Duration_t(
135135
config.liveliness_assert * 1e-3);
136136
reader_ = subscriber_->create_datareader(topic_, reader_qos, this, StatusMask::all());
137137
}

‎examples/cpp/content_filter/HelloWorldPubSubTypes.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
#include "HelloWorldCdrAux.hpp"
2828
#include "HelloWorldTypeObjectSupport.hpp"
2929

30-
using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t;
31-
using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t;
30+
using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t;
31+
using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t;
3232
using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t;
3333

3434
HelloWorldPubSubType::HelloWorldPubSubType()

‎examples/cpp/content_filter/HelloWorldPubSubTypes.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,18 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
5454

5555
eProsima_user_DllExport bool serialize(
5656
void* data,
57-
eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
57+
eprosima::fastdds::rtps::SerializedPayload_t* payload) override
5858
{
5959
return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
6060
}
6161

6262
eProsima_user_DllExport bool serialize(
6363
void* data,
64-
eprosima::fastrtps::rtps::SerializedPayload_t* payload,
64+
eprosima::fastdds::rtps::SerializedPayload_t* payload,
6565
eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
6666

6767
eProsima_user_DllExport bool deserialize(
68-
eprosima::fastrtps::rtps::SerializedPayload_t* payload,
68+
eprosima::fastdds::rtps::SerializedPayload_t* payload,
6969
void* data) override;
7070

7171
eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
@@ -80,7 +80,7 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
8080

8181
eProsima_user_DllExport bool getKey(
8282
void* data,
83-
eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
83+
eprosima::fastdds::rtps::InstanceHandle_t* ihandle,
8484
bool force_md5 = false) override;
8585

8686
eProsima_user_DllExport void* createData() override;

‎examples/cpp/custom_payload_pool/CustomPayloadPool.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@
2626
#include <fastdds/rtps/history/IPayloadPool.h>
2727
#include <fastdds/rtps/common/SerializedPayload.h>
2828

29-
class CustomPayloadPool : public eprosima::fastrtps::rtps::IPayloadPool
29+
class CustomPayloadPool : public eprosima::fastdds::rtps::IPayloadPool
3030
{
3131
public:
3232

3333
~CustomPayloadPool() = default;
3434

3535
bool get_payload(
3636
unsigned int size,
37-
eprosima::fastrtps::rtps::SerializedPayload_t& payload)
37+
eprosima::fastdds::rtps::SerializedPayload_t& payload)
3838
{
3939
// Reserve new memory for the payload buffer
4040
unsigned char* payload_buff = new unsigned char[size];
@@ -51,8 +51,8 @@ class CustomPayloadPool : public eprosima::fastrtps::rtps::IPayloadPool
5151
}
5252

5353
bool get_payload(
54-
const eprosima::fastrtps::rtps::SerializedPayload_t& data,
55-
eprosima::fastrtps::rtps::SerializedPayload_t& payload)
54+
const eprosima::fastdds::rtps::SerializedPayload_t& data,
55+
eprosima::fastdds::rtps::SerializedPayload_t& payload)
5656
{
5757
// Reserve new memory for the payload buffer
5858
unsigned char* payload_buff = new unsigned char[data.length];
@@ -72,7 +72,7 @@ class CustomPayloadPool : public eprosima::fastrtps::rtps::IPayloadPool
7272
}
7373

7474
bool release_payload(
75-
eprosima::fastrtps::rtps::SerializedPayload_t& payload)
75+
eprosima::fastdds::rtps::SerializedPayload_t& payload)
7676
{
7777
// Ensure precondition
7878
if (this != payload.payload_owner)

‎examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
#include "HelloWorldCdrAux.hpp"
2828
#include "HelloWorldTypeObjectSupport.hpp"
2929

30-
using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t;
31-
using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t;
30+
using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t;
31+
using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t;
3232
using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t;
3333

3434
HelloWorldPubSubType::HelloWorldPubSubType()

‎examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,18 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
5454

5555
eProsima_user_DllExport bool serialize(
5656
void* data,
57-
eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
57+
eprosima::fastdds::rtps::SerializedPayload_t* payload) override
5858
{
5959
return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
6060
}
6161

6262
eProsima_user_DllExport bool serialize(
6363
void* data,
64-
eprosima::fastrtps::rtps::SerializedPayload_t* payload,
64+
eprosima::fastdds::rtps::SerializedPayload_t* payload,
6565
eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
6666

6767
eProsima_user_DllExport bool deserialize(
68-
eprosima::fastrtps::rtps::SerializedPayload_t* payload,
68+
eprosima::fastdds::rtps::SerializedPayload_t* payload,
6969
void* data) override;
7070

7171
eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
@@ -80,7 +80,7 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
8080

8181
eProsima_user_DllExport bool getKey(
8282
void* data,
83-
eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
83+
eprosima::fastdds::rtps::InstanceHandle_t* ihandle,
8484
bool force_md5 = false) override;
8585

8686
eProsima_user_DllExport void* createData() override;

0 commit comments

Comments
 (0)