Skip to content

Commit c2cc2c6

Browse files
DanipizaDanipiza
committed
[#24584] Fixed MacOS tests compilation errors
Signed-off-by: danipiza <dpizarrogallego@gmail.com>
1 parent 910ac99 commit c2cc2c6

24 files changed

Lines changed: 159 additions & 140 deletions

File tree

‎src/cpp/utils/collections/FixedSizeQueue.hpp‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ class FixedSizeQueue
4747
public:
4848

4949
using allocator_type = _Alloc;
50+
using allocator_traits = std::allocator_traits<allocator_type>;
5051
using value_type = _Ty;
5152
using pointer = _Ty*;
5253
using const_pointer = const _Ty*;
@@ -346,7 +347,7 @@ class FixedSizeQueue
346347
return false;
347348
}
348349
--head_;
349-
allocator_.construct(&(*head_), val);
350+
allocator_traits::construct(allocator_, &(*head_), val);
350351
++size_;
351352
return true;
352353
}
@@ -386,7 +387,7 @@ class FixedSizeQueue
386387
return false;
387388
}
388389
--head_;
389-
allocator_.construct(&(*head_), std::forward<Args &&>(args)...);
390+
allocator_traits::construct(allocator_, &(*head_), std::forward<Args &&>(args)...);
390391
++size_;
391392
return true;
392393
}
@@ -406,7 +407,7 @@ class FixedSizeQueue
406407
{
407408
return false;
408409
}
409-
allocator_.construct(&(*tail_), val);
410+
allocator_traits::construct(allocator_, &(*tail_), val);
410411
++tail_;
411412
++size_;
412413
return true;
@@ -446,7 +447,7 @@ class FixedSizeQueue
446447
{
447448
return false;
448449
}
449-
allocator_.construct(&(*tail_), std::forward<Args &&>(args)...);
450+
allocator_traits::construct(allocator_, &(*tail_), std::forward<Args &&>(args)...);
450451
++tail_;
451452
++size_;
452453
return true;
@@ -464,7 +465,7 @@ class FixedSizeQueue
464465
{
465466
return false;
466467
}
467-
allocator_.destroy(&(*head_));
468+
allocator_traits::destroy(allocator_, &(*head_));
468469
++head_;
469470
--size_;
470471
return true;
@@ -483,7 +484,7 @@ class FixedSizeQueue
483484
return false;
484485
}
485486
--tail_;
486-
allocator_.destroy(&(*tail_));
487+
allocator_traits::destroy(allocator_, &(*tail_));
487488
--size_;
488489
return true;
489490
}
@@ -652,7 +653,7 @@ class FixedSizeQueue
652653
++head_;
653654
memmove(&(*head_), &(*old_head), (pos - old_head) * sizeof(value_type));
654655

655-
allocator_.destroy(&(*old_head));
656+
allocator_traits::destroy(allocator_, &(*old_head));
656657
--size_;
657658
iterator next = pos;
658659
return ++next;
@@ -664,7 +665,7 @@ class FixedSizeQueue
664665
memmove(&(*pos), &(*next), (tail_ - pos) * sizeof(value_type));
665666

666667
--tail_;
667-
allocator_.destroy(&(*tail_));
668+
allocator_traits::destroy(allocator_, &(*tail_));
668669
--size_;
669670
return pos;
670671
}

‎test/blackbox/common/BlackboxTestsTransportTCP.cpp‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ TEST_P(TransportTCP, send_resource_cleanup)
498498
}
499499
return tcp_send_resources;
500500
};
501-
EXPECT_EQ(tcp_send_resources(send_resource_list), 1);
501+
EXPECT_EQ(tcp_send_resources(send_resource_list), 1u);
502502

503503
// Release TCP client resources.
504504
client.reset();
@@ -519,7 +519,7 @@ TEST_P(TransportTCP, send_resource_cleanup)
519519
// Check that the send_resource_list has size 0. This means that the send resource
520520
// for the client has been removed.
521521
send_resource_list = server_chaining_transport->get_send_resource_list();
522-
EXPECT_EQ(tcp_send_resources(send_resource_list), 0);
522+
EXPECT_EQ(tcp_send_resources(send_resource_list), 0u);
523523
send_resource_list.clear();
524524
}
525525

@@ -642,7 +642,7 @@ TEST_P(TransportTCP, send_resource_cleanup_initial_peer)
642642
}
643643
return tcp_send_resources;
644644
};
645-
EXPECT_EQ(tcp_send_resources(send_resource_list), 1);
645+
EXPECT_EQ(tcp_send_resources(send_resource_list), 1u);
646646

647647
// Release TCP client resources.
648648
server.reset();
@@ -663,7 +663,7 @@ TEST_P(TransportTCP, send_resource_cleanup_initial_peer)
663663
// Check that the send_resource_list has size 1. This means that the send resource
664664
// for the first client hasn't been removed because it was created from an initial_peer.
665665
send_resource_list = client_chaining_transport->get_send_resource_list();
666-
EXPECT_EQ(tcp_send_resources(send_resource_list), 1);
666+
EXPECT_EQ(tcp_send_resources(send_resource_list), 1u);
667667
send_resource_list.clear();
668668

669669
// If relaunching the server, the client should connect again.
@@ -1090,8 +1090,8 @@ TEST_P(TransportTCP, tcp_unique_network_flows_init)
10901090

10911091
EXPECT_TRUE(locators == locators2);
10921092
// LocatorList size depends on the number of interfaces. Different address but same port.
1093-
ASSERT_GT(locators.size(), 0);
1094-
ASSERT_GT(locators2.size(), 0);
1093+
ASSERT_GT(locators.size(), 0u);
1094+
ASSERT_GT(locators2.size(), 0u);
10951095
auto locator1 = locators.begin();
10961096
auto locator2 = locators2.begin();
10971097
EXPECT_EQ(IPLocator::getPhysicalPort(*locator1), IPLocator::getPhysicalPort(*locator2));
@@ -1120,8 +1120,8 @@ TEST_P(TransportTCP, tcp_unique_network_flows_init)
11201120

11211121
EXPECT_FALSE(locators == locators2);
11221122
// LocatorList size depends on the number of interfaces. Different address but same port.
1123-
ASSERT_GT(locators.size(), 0);
1124-
ASSERT_GT(locators2.size(), 0);
1123+
ASSERT_GT(locators.size(), 0u);
1124+
ASSERT_GT(locators2.size(), 0u);
11251125
auto locator1 = locators.begin();
11261126
auto locator2 = locators2.begin();
11271127
EXPECT_EQ(IPLocator::getPhysicalPort(*locator1), IPLocator::getPhysicalPort(*locator2));
@@ -1300,3 +1300,4 @@ GTEST_INSTANTIATE_TEST_MACRO(TransportTCP,
13001300
}
13011301

13021302
});
1303+

‎test/blackbox/common/DDSBlackboxTestsContentFilter.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ class DDSContentFilter : public testing::TestWithParam<communication_type>
339339
// Ensure writer is in clean state
340340
drop_data_on_all_readers();
341341
EXPECT_TRUE(writer.waitForAllAcked(std::chrono::seconds(5)));
342-
EXPECT_EQ(reader->get_unread_count(), 0);
342+
EXPECT_EQ(reader->get_unread_count(), 0ull);
343343

344344
// Send 10 samples with index 1 to 10
345345
auto data = default_helloworld_data_generator();
@@ -371,7 +371,7 @@ class DDSContentFilter : public testing::TestWithParam<communication_type>
371371
ReturnCode_t expected_ret;
372372
expected_ret = expected_samples == 0 ? RETCODE_NO_DATA : RETCODE_OK;
373373
EXPECT_EQ(expected_ret, reader->take(recv_data, recv_info));
374-
EXPECT_EQ(recv_data.length(), expected_samples);
374+
EXPECT_EQ(static_cast<uint64_t>(recv_data.length()), expected_samples);
375375
for (HelloWorldSeq::size_type i = 0;
376376
i < recv_data.length() && static_cast<uint32_t>(i) < expected_samples;
377377
++i)
@@ -1282,3 +1282,4 @@ GTEST_INSTANTIATE_TEST_MACRO(DDSContentFilter,
12821282
} // namespace dds
12831283
} // namespace fastdds
12841284
} // namespace eprosima
1285+

‎test/blackbox/common/DDSBlackboxTestsMonitorService.cpp‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1541,9 +1541,9 @@ TEST(DDSMonitorServiceTest, monitor_service_simple_connection_list)
15411541
StatisticsGUIDList w_guids, r_guids;
15421542
endpoint_connections_msg.status_kind(eprosima::fastdds::statistics::StatusKind::CONNECTION_LIST);
15431543
w_guids = MSP1.get_writer_guids();
1544-
ASSERT_EQ(w_guids.size(), 1);
1544+
ASSERT_EQ(w_guids.size(), 1u);
15451545
r_guids = MSP2.get_reader_guids();
1546-
ASSERT_EQ(r_guids.size(), 1);
1546+
ASSERT_EQ(r_guids.size(), 1u);
15471547

15481548
//! dw and dr have one connection only (with each other)
15491549
endpoint_connections_msg.local_entity(w_guids.back());
@@ -1616,7 +1616,7 @@ TEST(DDSMonitorServiceTest, monitor_service_simple_qos_incompatibility_status)
16161616

16171617
endpoint_qos_msg.status_kind(eprosima::fastdds::statistics::StatusKind::INCOMPATIBLE_QOS);
16181618
w_guids = MSP.get_writer_guids();
1619-
ASSERT_EQ(w_guids.size(), 1);
1619+
ASSERT_EQ(w_guids.size(), 1u);
16201620
endpoint_qos_msg.local_entity(w_guids.back());
16211621

16221622
statistics::IncompatibleQoSStatus_s incompatible_qos;
@@ -1629,7 +1629,7 @@ TEST(DDSMonitorServiceTest, monitor_service_simple_qos_incompatibility_status)
16291629

16301630
endpoint_qos_msg.status_kind(eprosima::fastdds::statistics::StatusKind::INCOMPATIBLE_QOS);
16311631
r_guids = MSP.get_reader_guids();
1632-
ASSERT_EQ(r_guids.size(), 1);
1632+
ASSERT_EQ(r_guids.size(), 1u);
16331633
endpoint_qos_msg.local_entity(r_guids.back());
16341634

16351635
expected_msgs.push_back(endpoint_qos_msg);
@@ -1689,7 +1689,7 @@ TEST(DDSMonitorServiceTest, monitor_service_simple_liveliness_lost_status)
16891689

16901690
endpoint_liveliness_msg.status_kind(eprosima::fastdds::statistics::StatusKind::LIVELINESS_LOST);
16911691
w_guids = MSP.get_writer_guids();
1692-
ASSERT_EQ(w_guids.size(), 1);
1692+
ASSERT_EQ(w_guids.size(), 1u);
16931693
endpoint_liveliness_msg.local_entity(w_guids.back());
16941694

16951695
statistics::LivelinessLostStatus_s liv_lost_status;
@@ -1753,7 +1753,7 @@ TEST(DDSMonitorServiceTest, monitor_service_simple_liveliness_changed_status)
17531753

17541754
endpoint_liveliness_msg.status_kind(eprosima::fastdds::statistics::StatusKind::LIVELINESS_CHANGED);
17551755
r_guids = MSP.get_reader_guids();
1756-
ASSERT_EQ(r_guids.size(), 1);
1756+
ASSERT_EQ(r_guids.size(), 1u);
17571757
endpoint_liveliness_msg.local_entity(r_guids.back());
17581758

17591759
statistics::LivelinessChangedStatus_s liv_changed_status;
@@ -1809,7 +1809,7 @@ TEST(DDSMonitorServiceTest, monitor_service_simple_deadline_missed_status)
18091809

18101810
endpoint_deadline_msg.status_kind(eprosima::fastdds::statistics::StatusKind::DEADLINE_MISSED);
18111811
r_guids = MSP.get_reader_guids();
1812-
ASSERT_EQ(r_guids.size(), 1);
1812+
ASSERT_EQ(r_guids.size(), 1u);
18131813
endpoint_deadline_msg.local_entity(r_guids.back());
18141814

18151815
statistics::DeadlineMissedStatus_s deadline_missed_status;
@@ -1819,7 +1819,7 @@ TEST(DDSMonitorServiceTest, monitor_service_simple_deadline_missed_status)
18191819
expected_msgs.push_back(endpoint_deadline_msg);
18201820

18211821
w_guids = MSP.get_writer_guids();
1822-
ASSERT_EQ(w_guids.size(), 1);
1822+
ASSERT_EQ(w_guids.size(), 1u);
18231823
endpoint_deadline_msg.local_entity(w_guids.back());
18241824

18251825
expected_msgs.push_back(endpoint_deadline_msg);
@@ -1916,7 +1916,7 @@ TEST(DDSMonitorServiceTest, monitor_service_simple_sample_lost_status)
19161916

19171917
endpoint_sample_lost_msg.status_kind(eprosima::fastdds::statistics::StatusKind::SAMPLE_LOST);
19181918
r_guids = MSP2.get_reader_guids();
1919-
ASSERT_EQ(r_guids.size(), 1);
1919+
ASSERT_EQ(r_guids.size(), 1u);
19201920
endpoint_sample_lost_msg.local_entity(r_guids.back());
19211921

19221922
expected_msgs.push_back(endpoint_sample_lost_msg);
@@ -2034,15 +2034,15 @@ TEST(DDSMonitorServiceTest, monitor_service_simple_late_joiner)
20342034
entity_proxy_msg.status_kind(eprosima::fastdds::statistics::StatusKind::PROXY);
20352035
StatisticsGUIDList w_guids = MSP.get_writer_guids();
20362036

2037-
ASSERT_EQ(w_guids.size(), 1);
2037+
ASSERT_EQ(w_guids.size(), 1u);
20382038
entity_proxy_msg.local_entity(w_guids.back());
20392039

20402040
expected_msgs.push_back(entity_proxy_msg);
20412041

20422042
entity_proxy_msg.status_kind(eprosima::fastdds::statistics::StatusKind::PROXY);
20432043
StatisticsGUIDList r_guids = MSP.get_reader_guids();
20442044

2045-
ASSERT_EQ(r_guids.size(), 1);
2045+
ASSERT_EQ(r_guids.size(), 1u);
20462046
entity_proxy_msg.local_entity(r_guids.back());
20472047

20482048
expected_msgs.push_back(entity_proxy_msg);
@@ -2102,13 +2102,13 @@ TEST(DDSMonitorServiceTest, monitor_service_simple_enable_disable_enable)
21022102
StatisticsGUIDList w_guids = MSP.get_writer_guids();
21032103
StatisticsGUIDList r_guids = MSP.get_reader_guids();
21042104

2105-
ASSERT_EQ(w_guids.size(), 2);
2105+
ASSERT_EQ(w_guids.size(), 2u);
21062106
entity_proxy_msg.local_entity(w_guids.front());
21072107
expected_msgs.push_back(entity_proxy_msg);
21082108
entity_proxy_msg.local_entity(w_guids.back());
21092109
expected_msgs.push_back(entity_proxy_msg);
21102110

2111-
ASSERT_EQ(r_guids.size(), 1);
2111+
ASSERT_EQ(r_guids.size(), 1u);
21122112
entity_proxy_msg.local_entity(r_guids.back());
21132113

21142114
expected_msgs.push_back(entity_proxy_msg);
@@ -2178,11 +2178,11 @@ TEST(DDSMonitorServiceTest, monitor_service_simple_extended_incompatible_qos)
21782178
StatisticsGUIDList w_guids = MSP.get_writer_guids();
21792179
StatisticsGUIDList r_guids = MSP.get_reader_guids();
21802180

2181-
ASSERT_EQ(w_guids.size(), 1);
2181+
ASSERT_EQ(w_guids.size(), 1u);
21822182
entity_proxy_msg.local_entity(w_guids.back());
21832183
expected_msgs.push_back(entity_proxy_msg);
21842184

2185-
ASSERT_EQ(r_guids.size(), 1);
2185+
ASSERT_EQ(r_guids.size(), 1u);
21862186
entity_proxy_msg.local_entity(r_guids.back());
21872187
expected_msgs.push_back(entity_proxy_msg);
21882188

@@ -2204,7 +2204,7 @@ TEST(DDSMonitorServiceTest, monitor_service_simple_extended_incompatible_qos)
22042204

22052205
// Reader extended incompatibility for reliability
22062206
r_guids = MSP.get_reader_guids();
2207-
ASSERT_EQ(r_guids.size(), 1);
2207+
ASSERT_EQ(r_guids.size(), 1u);
22082208
endpoint_ext_incmpqos_msg.local_entity(r_guids.back());
22092209
ext_incompatible_qos_seq.at(0).remote_guid(w_guids.back());
22102210
endpoint_ext_incmpqos_msg.value().extended_incompatible_qos_status(ext_incompatible_qos_seq);
@@ -2242,7 +2242,7 @@ TEST(DDSMonitorServiceTest, monitor_service_simple_extended_incompatible_qos)
22422242

22432243
// Expect only the new reader's discovery proxy one
22442244
r_guids = MSP.get_reader_guids();
2245-
ASSERT_EQ(r_guids.size(), 1);
2245+
ASSERT_EQ(r_guids.size(), 1u);
22462246
entity_proxy_msg.local_entity(r_guids.back());
22472247
expected_msgs.push_back(entity_proxy_msg);
22482248

@@ -2299,11 +2299,11 @@ TEST(DDSMonitorServiceTest, monitor_service_advanced_proxy)
22992299
StatisticsGUIDList w_guids = MSP.get_writer_guids();
23002300
StatisticsGUIDList r_guids = MSP.get_reader_guids();
23012301

2302-
ASSERT_EQ(w_guids.size(), 1);
2302+
ASSERT_EQ(w_guids.size(), 1u);
23032303
entity_proxy_msg.local_entity(w_guids.back());
23042304
expected_msgs.push_back(entity_proxy_msg);
23052305

2306-
ASSERT_EQ(r_guids.size(), 1);
2306+
ASSERT_EQ(r_guids.size(), 1u);
23072307
entity_proxy_msg.local_entity(r_guids.back());
23082308

23092309
expected_msgs.push_back(entity_proxy_msg);
@@ -2365,7 +2365,7 @@ TEST(DDSMonitorServiceTest, monitor_service_advanced_instance_disposals)
23652365
expected_msgs.push_back(msg);
23662366
}
23672367

2368-
ASSERT_EQ(3, MSPs.size());
2368+
ASSERT_EQ(3u, MSPs.size());
23692369

23702370
//! Expect 6 empty proxies (disposals) (3 entities per each)
23712371
for (auto& MSP : MSPs)
@@ -2450,7 +2450,7 @@ TEST(DDSMonitorServiceTest, monitor_service_advanced_single_late_joiner)
24502450

24512451
endpoint_qos_msg.status_kind(eprosima::fastdds::statistics::StatusKind::INCOMPATIBLE_QOS);
24522452
w_guids = MSP.get_writer_guids();
2453-
ASSERT_EQ(w_guids.size(), 1);
2453+
ASSERT_EQ(w_guids.size(), 1u);
24542454
endpoint_qos_msg.local_entity(w_guids.back());
24552455

24562456
statistics::IncompatibleQoSStatus_s incompatible_qos;
@@ -2461,7 +2461,7 @@ TEST(DDSMonitorServiceTest, monitor_service_advanced_single_late_joiner)
24612461

24622462
endpoint_qos_msg.status_kind(eprosima::fastdds::statistics::StatusKind::INCOMPATIBLE_QOS);
24632463
r_guids = MSP.get_reader_guids();
2464-
ASSERT_EQ(r_guids.size(), 1);
2464+
ASSERT_EQ(r_guids.size(), 1u);
24652465
endpoint_qos_msg.local_entity(r_guids.back());
24662466

24672467
expected_msgs.push_back(endpoint_qos_msg);
@@ -2509,7 +2509,7 @@ TEST(DDSMonitorServiceTest, monitor_service_advanced_multiple_late_joiners)
25092509

25102510
endpoint_qos_msg.status_kind(eprosima::fastdds::statistics::StatusKind::INCOMPATIBLE_QOS);
25112511
w_guids = MSP.get_writer_guids();
2512-
ASSERT_EQ(w_guids.size(), 1);
2512+
ASSERT_EQ(w_guids.size(), 1u);
25132513
endpoint_qos_msg.local_entity(w_guids.back());
25142514

25152515
statistics::IncompatibleQoSStatus_s incompatible_qos;
@@ -2520,7 +2520,7 @@ TEST(DDSMonitorServiceTest, monitor_service_advanced_multiple_late_joiners)
25202520

25212521
endpoint_qos_msg.status_kind(eprosima::fastdds::statistics::StatusKind::INCOMPATIBLE_QOS);
25222522
r_guids = MSP.get_reader_guids();
2523-
ASSERT_EQ(r_guids.size(), 1);
2523+
ASSERT_EQ(r_guids.size(), 1u);
25242524
endpoint_qos_msg.local_entity(r_guids.back());
25252525

25262526
expected_msgs.push_back(endpoint_qos_msg);
@@ -2618,7 +2618,7 @@ TEST(DDSMonitorServiceTest, monitor_service_advanced_extended_incompatible_qos)
26182618

26192619
MSP.create_and_add_writer(dw_qos);
26202620

2621-
ASSERT_EQ(MSP.get_writer_guids().size(), 1);
2621+
ASSERT_EQ(MSP.get_writer_guids().size(), 1u);
26222622
w_guid = MSP.get_writer_guids().back();
26232623

26242624
break;
@@ -2840,7 +2840,7 @@ TEST(DDSMonitorServiceTest, monitor_service_late_joiner_consumer_receives_only_
28402840
// That will prove that only the last update of the instance is being received and, in turn,
28412841
// verify that the monitor service datawriter is not holding past samples of the same instance.
28422842
r_guids = MSP.get_reader_guids();
2843-
ASSERT_EQ(r_guids.size(), 1);
2843+
ASSERT_EQ(r_guids.size(), 1u);
28442844
endpoint_deadline_msg.local_entity(r_guids.back());
28452845

28462846
statistics::DeadlineMissedStatus_s deadline_missed_status;
@@ -2850,7 +2850,7 @@ TEST(DDSMonitorServiceTest, monitor_service_late_joiner_consumer_receives_only_
28502850
non_expected_msgs.push_back(endpoint_deadline_msg);
28512851

28522852
w_guids = MSP.get_writer_guids();
2853-
ASSERT_EQ(w_guids.size(), 1);
2853+
ASSERT_EQ(w_guids.size(), 1u);
28542854
endpoint_deadline_msg.local_entity(w_guids.back());
28552855

28562856
non_expected_msgs.push_back(endpoint_deadline_msg);
@@ -3025,3 +3025,4 @@ TEST(DDSMonitorServiceTest, monitor_service_proxy_optional_qos)
30253025
ASSERT_EQ(MSC.block_for_all(std::chrono::seconds(5)), expected_msgs.size());
30263026
#endif //FASTDDS_STATISTICS
30273027
}
3028+

0 commit comments

Comments
 (0)