Skip to content

Commit 8fcc61f

Browse files
cferreiragonzmergify[bot]
authored andcommitted
Add export to 'create_listener' (#153)
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com> (cherry picked from commit 4fde39f) # Conflicts: # ddspipe_participants/include/ddspipe_participants/participant/dynamic_types/DynTypesParticipant.hpp
1 parent edde48f commit 8fcc61f

2 files changed

Lines changed: 7 additions & 8 deletions

File tree

ddspipe_participants/include/ddspipe_participants/participant/dynamic_types/DynTypesParticipant.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,6 @@ class DynTypesParticipant : public rtps::SimpleParticipant
9898
const eprosima::fastrtps::string_255 type_name,
9999
const eprosima::fastrtps::types::TypeInformation& type_information) override;
100100

101-
//! Type Object Reader getter
102-
inline std::shared_ptr<InternalReader> type_object_reader() const
103-
{
104-
return type_object_reader_;
105-
}
106-
107101
protected:
108102

109103
void internal_notify_type_object_(
@@ -116,9 +110,15 @@ class DynTypesParticipant : public rtps::SimpleParticipant
116110

117111
protected:
118112

113+
<<<<<<< HEAD
119114
void initialize_internal_dds_participant_();
120115

121116
eprosima::fastdds::dds::DomainParticipant* dds_participant_;
117+
=======
118+
//! Override method from \c CommonParticipant to create the internal RTPS participant listener
119+
DDSPIPE_PARTICIPANTS_DllAPI
120+
std::unique_ptr<fastdds::rtps::RTPSParticipantListener> create_listener_() override;
121+
>>>>>>> 4fde39f (Add export to 'create_listener' (#153))
122122

123123
//! Type Object Internal Reader
124124
std::shared_ptr<InternalReader> type_object_reader_;

ddspipe_participants/src/cpp/participant/dynamic_types/DynTypesParticipant.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,7 @@ std::shared_ptr<IReader> DynTypesParticipant::create_reader(
8787
// If type object topic, return the internal reader for type objects
8888
if (is_type_object_topic(topic))
8989
{
90-
return static_cast<DynTypesParticipant::DynTypesRtpsListener*>(rtps_participant_listener_.get())->
91-
type_object_reader();
90+
return type_object_reader_;
9291
}
9392

9493
// If not type object, use the parent method

0 commit comments

Comments
 (0)