Skip to content

Commit 79ccbe0

Browse files
committed
Refs #23919. Apply suggestions
Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
1 parent 9bcdb4b commit 79ccbe0

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

src/cpp/rtps/writer/ReaderProxy.cpp

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,10 @@ void ReaderProxy::add_change(
227227
const ChangeForReader_t& change,
228228
bool is_relevant)
229229
{
230-
assert(change.getSequenceNumber() > changes_low_mark_);
230+
SequenceNumber_t seq_num {change.getSequenceNumber()};
231+
assert(seq_num > changes_low_mark_);
231232
assert(changes_for_reader_.empty() ? true :
232-
change.getSequenceNumber() > changes_for_reader_.back().getSequenceNumber());
233+
seq_num > changes_for_reader_.back().getSequenceNumber());
233234

234235
// Irrelevant changes are not added to the collection
235236
if (!is_relevant)
@@ -240,26 +241,26 @@ void ReaderProxy::add_change(
240241
{
241242
if (SequenceNumber_t::unknown() == first_irrelevant_removed_)
242243
{
243-
first_irrelevant_removed_ = change.getSequenceNumber();
244-
last_irrelevant_removed_ = change.getSequenceNumber();
244+
first_irrelevant_removed_ = seq_num;
245+
last_irrelevant_removed_ = seq_num;
245246
}
246-
else if (change.getSequenceNumber() == last_irrelevant_removed_ + 1)
247+
else if (seq_num == last_irrelevant_removed_ + 1)
247248
{
248-
last_irrelevant_removed_ = change.getSequenceNumber();
249+
last_irrelevant_removed_ = seq_num;
249250
}
250251
}
251252
}
252-
else if (changes_low_mark_ + 1 == change.getSequenceNumber())
253+
else if (changes_low_mark_ + 1 == seq_num)
253254
{
254-
changes_low_mark_ = change.getSequenceNumber();
255+
changes_low_mark_ = seq_num;
255256
}
256257
return;
257258
}
258259

259260
if (changes_for_reader_.push_back(change) == nullptr)
260261
{
261262
// This should never happen
262-
EPROSIMA_LOG_ERROR(RTPS_READER_PROXY, "Error adding change " << change.getSequenceNumber()
263+
EPROSIMA_LOG_ERROR(RTPS_READER_PROXY, "Error adding change " << seq_num
263264
<< " to reader proxy " << guid());
264265
eprosima::fastdds::dds::Log::Flush();
265266
assert(false);

src/cpp/rtps/writer/ReaderProxy.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -341,22 +341,22 @@ class ReaderProxy
341341
* Get the highest fully acknowledged sequence number.
342342
* @return the highest fully acknowledged sequence number.
343343
*/
344-
SequenceNumber_t changes_low_mark() const
344+
inline SequenceNumber_t changes_low_mark() const
345345
{
346346
return changes_low_mark_;
347347
}
348348

349-
SequenceNumber_t first_irrelevant_removed() const
349+
inline SequenceNumber_t first_irrelevant_removed() const
350350
{
351351
return first_irrelevant_removed_;
352352
}
353353

354-
SequenceNumber_t last_irrelevant_removed() const
354+
inline SequenceNumber_t last_irrelevant_removed() const
355355
{
356356
return last_irrelevant_removed_;
357357
}
358358

359-
void reset_irrelevant_removed()
359+
inline void reset_irrelevant_removed()
360360
{
361361
first_irrelevant_removed_ = SequenceNumber_t::unknown();
362362
last_irrelevant_removed_ = SequenceNumber_t::unknown();

test/dds/xtypes/TypeLookupServiceSubscriber.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ bool TypeLookupServiceSubscriber::setup_subscriber(
106106
//CREATE THE TOPIC
107107
std::ostringstream topic_name;
108108
topic_name << type_name << "_" << asio::ip::host_name() << "_" << domain_id_;
109+
std::cout << "Creating topic for type: " << type_name << " with name " << topic_name.str() << std::endl;
109110
Topic* topic = participant_->create_topic(topic_name.str(), new_type.type_sup_.get_type_name(), TOPIC_QOS_DEFAULT);
110111
if (topic == nullptr)
111112
{

0 commit comments

Comments
 (0)