Skip to content

Commit 71f3060

Browse files
committed
Also update recently added tests.
Signed-off-by: Steve Wolter <[email protected]>
1 parent 399b5f7 commit 71f3060

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

rclcpp/test/rclcpp/allocator/test_allocator_common.cpp

+5-6
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,28 @@ TEST(TestAllocatorCommon, retyped_allocate) {
2626
ASSERT_NE(nullptr, allocated_mem);
2727

2828
auto code = [&untyped_allocator, allocated_mem]() {
29-
rclcpp::allocator::retyped_deallocate<int, std::allocator<int>>(
29+
rclcpp::allocator::retyped_deallocate<std::allocator<int>>(
3030
allocated_mem, untyped_allocator);
3131
};
3232
EXPECT_NO_THROW(code());
3333

3434
allocated_mem = allocator.allocate(1);
3535
ASSERT_NE(nullptr, allocated_mem);
3636
void * reallocated_mem =
37-
rclcpp::allocator::retyped_reallocate<int, std::allocator<int>>(
37+
rclcpp::allocator::retyped_reallocate<std::allocator<int>>(
3838
allocated_mem, 2u, untyped_allocator);
3939
ASSERT_NE(nullptr, reallocated_mem);
4040

4141
auto code2 = [&untyped_allocator, reallocated_mem]() {
42-
rclcpp::allocator::retyped_deallocate<int, std::allocator<int>>(
42+
rclcpp::allocator::retyped_deallocate<std::allocator<int>>(
4343
reallocated_mem, untyped_allocator);
4444
};
4545
EXPECT_NO_THROW(code2());
4646
}
4747

4848
TEST(TestAllocatorCommon, get_rcl_allocator) {
4949
std::allocator<int> allocator;
50-
auto rcl_allocator = rclcpp::allocator::get_rcl_allocator<int>(allocator);
50+
auto rcl_allocator = rclcpp::get_rcl_allocator(allocator);
5151
EXPECT_NE(nullptr, rcl_allocator.allocate);
5252
EXPECT_NE(nullptr, rcl_allocator.deallocate);
5353
EXPECT_NE(nullptr, rcl_allocator.reallocate);
@@ -57,8 +57,7 @@ TEST(TestAllocatorCommon, get_rcl_allocator) {
5757

5858
TEST(TestAllocatorCommon, get_void_rcl_allocator) {
5959
std::allocator<void> allocator;
60-
auto rcl_allocator =
61-
rclcpp::allocator::get_rcl_allocator<void, std::allocator<void>>(allocator);
60+
auto rcl_allocator = rclcpp::get_rcl_allocator(allocator);
6261
EXPECT_NE(nullptr, rcl_allocator.allocate);
6362
EXPECT_NE(nullptr, rcl_allocator.deallocate);
6463
EXPECT_NE(nullptr, rcl_allocator.reallocate);

0 commit comments

Comments
 (0)