Skip to content

Commit 5fd266e

Browse files
elianalfEduPonz
authored andcommitted
Refs #21129: Migrate fastrtps namespace to fastdds
Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
1 parent 5aebc95 commit 5fd266e

4 files changed

Lines changed: 9 additions & 9 deletions

File tree

src/main/java/com/eprosima/fastdds/idl/templates/DDSPubSubTypeHeader.stg

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,18 +113,18 @@ public:
113113

114114
eProsima_user_DllExport bool serialize(
115115
void* data,
116-
eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
116+
eprosima::fastdds::rtps::SerializedPayload_t* payload) override
117117
{
118118
return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
119119
}
120120

121121
eProsima_user_DllExport bool serialize(
122122
void* data,
123-
eprosima::fastrtps::rtps::SerializedPayload_t* payload,
123+
eprosima::fastdds::rtps::SerializedPayload_t* payload,
124124
eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
125125

126126
eProsima_user_DllExport bool deserialize(
127-
eprosima::fastrtps::rtps::SerializedPayload_t* payload,
127+
eprosima::fastdds::rtps::SerializedPayload_t* payload,
128128
void* data) override;
129129

130130
eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
@@ -139,7 +139,7 @@ public:
139139

140140
eProsima_user_DllExport bool getKey(
141141
void* data,
142-
eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
142+
eprosima::fastdds::rtps::InstanceHandle_t* ihandle,
143143
bool force_md5 = false) override;
144144

145145
eProsima_user_DllExport void* createData() override;

src/main/java/com/eprosima/fastdds/idl/templates/DDSPubSubTypeSource.stg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ $if (ctx.generateTypeObjectSupport)$
2929
#include "$ctx.filename$TypeObjectSupport.hpp"
3030
$endif$
3131

32-
using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t;
33-
using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t;
32+
using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t;
33+
using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t;
3434
using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t;
3535

3636
$definitions; separator="\n"$

src/main/java/com/eprosima/fastdds/idl/templates/JNISource.stg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ $ctx.directIncludeDependencies : {include | #include "$include$PubSubJNII.h"}; s
3333
#include <fastcdr/FastBuffer.h>
3434
#include <fastcdr/Cdr.h>
3535

36-
using namespace eprosima::fastrtps;
37-
using namespace eprosima::fastrtps::rtps;
36+
using namespace eprosima::fastdds;
37+
using namespace eprosima::fastdds::rtps;
3838

3939
#ifndef JNIEXPORT
4040
#define JNIEXPORT

src/main/java/com/eprosima/fastdds/idl/templates/SerializationTestSource.stg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ TEST_P($struct.formatedCppTypename$Test, encoding)
4949
<< (true == test_empty_external ? " with an empty external" : "")
5050
<< " using encoding " << (eprosima::fastdds::dds::DataRepresentationId_t::XCDR_DATA_REPRESENTATION == cdr_version ? "XCDRv1" : "XCDRv2") <<
5151
" ========================================" << std::endl;
52-
using eprosima::fastrtps::rtps::SerializedPayload_t;
52+
using eprosima::fastdds::rtps::SerializedPayload_t;
5353

5454
$struct.name$PubSubType $struct.name$_type_support;
5555
$struct.name$ $struct.name$_serialization_topic;

0 commit comments

Comments
 (0)