Skip to content

Commit 72b790f

Browse files
LuciaEchevarria99LuciaEchevarria99
committed
Apply suggested changes
Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>
1 parent e15ac04 commit 72b790f

41 files changed

Lines changed: 267 additions & 1081 deletions

Some content is hidden

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

‎ddspipe_core/include/ddspipe_core/types/dds/Guid.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#pragma once
1616

17-
#include <fastrtps/rtps/common/Guid.h>
17+
#include <fastdds/rtps/common/Guid.h>
1818

1919
#include <ddspipe_core/library/library_dll.h>
2020
#include <ddspipe_core/types/dds/GuidPrefix.hpp>

‎ddspipe_core/include/ddspipe_core/types/topic/dds/DdsTopic.hpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ struct DdsTopic : public DistributedTopic
8181
const std::string& type_name,
8282
utils::Formatter& error_msg) noexcept;
8383

84+
void set_type_ids(
85+
const fastdds::dds::xtypes::TypeIdentifierPair& _type_ids) noexcept;
86+
8487
/////////////////////////
8588
// VARIABLES
8689
/////////////////////////

‎ddspipe_core/src/cpp/types/logging/LogEntryPubSubTypes.cxx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,7 @@ bool LogEntryPubSubType::getKey(
221221

222222
void LogEntryPubSubType::register_type_object_representation()
223223
{
224-
eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
225-
register_LogEntry_type_identifier(type_ids);
224+
register_LogEntry_type_identifier(type_identifiers_);
226225
}
227226

228227

‎ddspipe_core/src/cpp/types/logging/LogEntryTypeObjectSupport.cxx‎

Lines changed: 72 additions & 255 deletions
Large diffs are not rendered by default.

‎ddspipe_core/src/cpp/types/monitoring/status/MonitoringStatusPubSubTypes.cxx‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,7 @@ bool MonitoringErrorStatusPubSubType::getKey(
221221

222222
void MonitoringErrorStatusPubSubType::register_type_object_representation()
223223
{
224-
eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
225-
register_MonitoringErrorStatus_type_identifier(type_ids);
224+
register_MonitoringErrorStatus_type_identifier(type_identifiers_);
226225
}
227226

228227
MonitoringStatusPubSubType::MonitoringStatusPubSubType()
@@ -415,8 +414,7 @@ bool MonitoringStatusPubSubType::getKey(
415414

416415
void MonitoringStatusPubSubType::register_type_object_representation()
417416
{
418-
eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
419-
register_MonitoringStatus_type_identifier(type_ids);
417+
register_MonitoringStatus_type_identifier(type_identifiers_);
420418
}
421419

422420

‎ddspipe_core/src/cpp/types/monitoring/status/MonitoringStatusTypeObjectSupport.cxx‎

Lines changed: 16 additions & 168 deletions
Large diffs are not rendered by default.

‎ddspipe_core/src/cpp/types/monitoring/topics/MonitoringTopicsPubSubTypes.cxx‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,7 @@ bool DdsTopicDataPubSubType::getKey(
221221

222222
void DdsTopicDataPubSubType::register_type_object_representation()
223223
{
224-
eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
225-
register_DdsTopicData_type_identifier(type_ids);
224+
register_DdsTopicData_type_identifier(type_identifiers_);
226225
}
227226

228227
DdsTopicPubSubType::DdsTopicPubSubType()
@@ -415,8 +414,7 @@ bool DdsTopicPubSubType::getKey(
415414

416415
void DdsTopicPubSubType::register_type_object_representation()
417416
{
418-
eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
419-
register_DdsTopic_type_identifier(type_ids);
417+
register_DdsTopic_type_identifier(type_identifiers_);
420418
}
421419

422420
MonitoringTopicsPubSubType::MonitoringTopicsPubSubType()
@@ -609,8 +607,7 @@ bool MonitoringTopicsPubSubType::getKey(
609607

610608
void MonitoringTopicsPubSubType::register_type_object_representation()
611609
{
612-
eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
613-
register_MonitoringTopics_type_identifier(type_ids);
610+
register_MonitoringTopics_type_identifier(type_identifiers_);
614611
}
615612

616613

‎ddspipe_core/src/cpp/types/monitoring/topics/MonitoringTopicsTypeObjectSupport.cxx‎

Lines changed: 52 additions & 542 deletions
Large diffs are not rendered by default.

‎ddspipe_core/src/cpp/types/topic/dds/DdsTopic.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,12 @@ bool DdsTopic::is_valid_dds_topic(
111111
return true;
112112
}
113113

114+
void DdsTopic::set_type_ids(
115+
const fastdds::dds::xtypes::TypeIdentifierPair& _type_ids) noexcept
116+
{
117+
type_ids = _type_ids;
118+
}
119+
114120
/////////////////////////
115121
// OPERATORS
116122
/////////////////////////

‎ddspipe_core/test/unittest/types/endpoint/GuidTest.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <cpp_utils/testing/gtest_aux.hpp>
1616
#include <gtest/gtest.h>
1717

18-
#include <fastrtps/rtps/common/Guid.h>
18+
#include <fastdds/rtps/common/Guid.h>
1919
#include <fastdds/rtps/common/EntityId_t.hpp>
2020

2121
#include <ddspipe_core/types/dds/Guid.hpp>

0 commit comments

Comments
 (0)