Skip to content

Commit 78d51f1

Browse files
committed
Refs #21711: Apply Ricardo's rev
Signed-off-by: Mario Dominguez <[email protected]>
1 parent f969ca9 commit 78d51f1

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

include/fastdds/dds/publisher/DataWriter.hpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -536,12 +536,13 @@ class DataWriter : public DomainEntity
536536
*/
537537
RTPS_DllAPI ReturnCode_t get_matched_subscriptions(
538538
std::vector<InstanceHandle_t>& subscription_handles) const;
539-
/**
540-
* @note User is responsible for the memory deallocation of the returned vector.
541-
*/
539+
542540
#ifndef DOXYGEN_SHOULD_SKIP_THIS
543541
FASTDDS_DEPRECATED_UNTIL(3, "eprosima::fastdds::dds:DataWriter::get_matched_subscriptions()",
544542
"In favor of version using std::vector<fastrtps::rtps::InstanceHandle_t>.")
543+
/**
544+
* @note User is responsible for the memory deallocation of the returned vector.
545+
*/
545546
RTPS_DllAPI ReturnCode_t get_matched_subscriptions(
546547
std::vector<InstanceHandle_t*>& subscription_handles) const;
547548
#endif // DOXYGEN_SHOULD_SKIP_THIS

src/cpp/fastdds/publisher/DataWriterImpl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2262,7 +2262,7 @@ ReturnCode_t DataWriterImpl::get_matched_subscriptions(
22622262
{
22632263
for (const GUID_t& guid : matched_reader_guids)
22642264
{
2265-
subscription_handles.push_back(InstanceHandle_t(guid));
2265+
subscription_handles.emplace_back(InstanceHandle_t(guid));
22662266
}
22672267
ret = ReturnCode_t::RETCODE_OK;
22682268
}

src/cpp/fastdds/subscriber/DataReaderImpl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1232,7 +1232,7 @@ ReturnCode_t DataReaderImpl::get_matched_publications(
12321232
{
12331233
for (const GUID_t& guid : matched_writers_guids)
12341234
{
1235-
publication_handles.push_back(InstanceHandle_t(guid));
1235+
publication_handles.emplace_back(InstanceHandle_t(guid));
12361236
}
12371237
ret = ReturnCode_t::RETCODE_OK;
12381238
}

test/mock/rtps/RTPSReader/fastdds/rtps/reader/RTPSReader.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ class RTPSReader : public Endpoint
180180
virtual bool matched_writers_guids(
181181
std::vector<GUID_t>&) const
182182
{
183-
return true;
183+
return false;
184184
}
185185

186186
virtual bool isInCleanState()

0 commit comments

Comments
 (0)