Skip to content

Commit

Permalink
Refs #21044. Fix warning on mac and failed tests.
Browse files Browse the repository at this point in the history
Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
  • Loading branch information
richiware committed May 31, 2024
1 parent ef57049 commit 5951850
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -292,11 +292,11 @@ bool EDP::newLocalWriterProxyData(

bool EDP::updatedLocalReader(
RTPSReader* reader,
const TopicAttributes& att,
const TopicAttributes&,
const fastdds::dds::ReaderQos& rqos,
const fastdds::rtps::ContentFilterProperty* content_filter)
{
auto init_fun = [this, reader, &rqos, &att, content_filter](
auto init_fun = [this, reader, &rqos, content_filter](
ReaderProxyData* rdata,
bool updating,
const ParticipantProxyData& participant_data)
Expand Down Expand Up @@ -366,10 +366,10 @@ bool EDP::updatedLocalReader(

bool EDP::updatedLocalWriter(
RTPSWriter* writer,
const TopicAttributes& att,
const TopicAttributes&,
const fastdds::dds::WriterQos& wqos)
{
auto init_fun = [this, writer, &wqos, &att](
auto init_fun = [this, writer, &wqos](
WriterProxyData* wdata,
bool updating,
const ParticipantProxyData& participant_data)
Expand Down
8 changes: 8 additions & 0 deletions src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -523,43 +523,51 @@ bool DomainParticipantImpl::register_statistics_type_and_topic(
if (HISTORY_LATENCY_TOPIC == topic_name)
{
efd::TypeSupport history_latency_type(new WriterReaderDataPubSubType);
history_latency_type->register_type_object_representation();
return_code = find_or_create_topic_and_type(topic, topic_name, history_latency_type);
}
else if (NETWORK_LATENCY_TOPIC == topic_name)
{
efd::TypeSupport network_latency_type(new Locator2LocatorDataPubSubType);
network_latency_type->register_type_object_representation();
return_code = find_or_create_topic_and_type(topic, topic_name, network_latency_type);
}
else if (PUBLICATION_THROUGHPUT_TOPIC == topic_name || SUBSCRIPTION_THROUGHPUT_TOPIC == topic_name)
{
efd::TypeSupport throughput_type(new EntityDataPubSubType);
throughput_type->register_type_object_representation();
return_code = find_or_create_topic_and_type(topic, topic_name, throughput_type);
}
else if (RTPS_SENT_TOPIC == topic_name || RTPS_LOST_TOPIC == topic_name)
{
efd::TypeSupport rtps_traffic_type(new Entity2LocatorTrafficPubSubType);
rtps_traffic_type->register_type_object_representation();
return_code = find_or_create_topic_and_type(topic, topic_name, rtps_traffic_type);
}
else if (RESENT_DATAS_TOPIC == topic_name || HEARTBEAT_COUNT_TOPIC == topic_name ||
ACKNACK_COUNT_TOPIC == topic_name || NACKFRAG_COUNT_TOPIC == topic_name || GAP_COUNT_TOPIC == topic_name ||
DATA_COUNT_TOPIC == topic_name || PDP_PACKETS_TOPIC == topic_name || EDP_PACKETS_TOPIC == topic_name)
{
efd::TypeSupport count_type(new EntityCountPubSubType);
count_type->register_type_object_representation();
return_code = find_or_create_topic_and_type(topic, topic_name, count_type);
}
else if (DISCOVERY_TOPIC == topic_name)
{
efd::TypeSupport discovery_type(new DiscoveryTimePubSubType);
discovery_type->register_type_object_representation();
return_code = find_or_create_topic_and_type(topic, topic_name, discovery_type);
}
else if (SAMPLE_DATAS_TOPIC == topic_name)
{
efd::TypeSupport sample_identity_count_type(new SampleIdentityCountPubSubType);
sample_identity_count_type->register_type_object_representation();
return_code = find_or_create_topic_and_type(topic, topic_name, sample_identity_count_type);
}
else if (PHYSICAL_DATA_TOPIC == topic_name)
{
efd::TypeSupport physical_data_type(new PhysicalDataPubSubType);
physical_data_type->register_type_object_representation();
return_code = find_or_create_topic_and_type(topic, topic_name, physical_data_type);
}
return return_code;
Expand Down

0 comments on commit 5951850

Please sign in to comment.