@@ -26,28 +26,28 @@ TEST(TestAllocatorCommon, retyped_allocate) {
26
26
ASSERT_NE (nullptr , allocated_mem);
27
27
28
28
auto code = [&untyped_allocator, allocated_mem]() {
29
- rclcpp::allocator::retyped_deallocate<int , std::allocator<int >>(
29
+ rclcpp::allocator::retyped_deallocate<std::allocator<int >>(
30
30
allocated_mem, untyped_allocator);
31
31
};
32
32
EXPECT_NO_THROW (code ());
33
33
34
34
allocated_mem = allocator.allocate (1 );
35
35
ASSERT_NE (nullptr , allocated_mem);
36
36
void * reallocated_mem =
37
- rclcpp::allocator::retyped_reallocate<int , std::allocator<int >>(
37
+ rclcpp::allocator::retyped_reallocate<std::allocator<int >>(
38
38
allocated_mem, 2u , untyped_allocator);
39
39
ASSERT_NE (nullptr , reallocated_mem);
40
40
41
41
auto code2 = [&untyped_allocator, reallocated_mem]() {
42
- rclcpp::allocator::retyped_deallocate<int , std::allocator<int >>(
42
+ rclcpp::allocator::retyped_deallocate<std::allocator<int >>(
43
43
reallocated_mem, untyped_allocator);
44
44
};
45
45
EXPECT_NO_THROW (code2 ());
46
46
}
47
47
48
48
TEST (TestAllocatorCommon, get_rcl_allocator) {
49
49
std::allocator<int > allocator;
50
- auto rcl_allocator = rclcpp::allocator:: get_rcl_allocator< int > (allocator);
50
+ auto rcl_allocator = rclcpp::get_rcl_allocator (allocator);
51
51
EXPECT_NE (nullptr , rcl_allocator.allocate );
52
52
EXPECT_NE (nullptr , rcl_allocator.deallocate );
53
53
EXPECT_NE (nullptr , rcl_allocator.reallocate );
@@ -57,8 +57,7 @@ TEST(TestAllocatorCommon, get_rcl_allocator) {
57
57
58
58
TEST (TestAllocatorCommon, get_void_rcl_allocator) {
59
59
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);
62
61
EXPECT_NE (nullptr , rcl_allocator.allocate );
63
62
EXPECT_NE (nullptr , rcl_allocator.deallocate );
64
63
EXPECT_NE (nullptr , rcl_allocator.reallocate );
0 commit comments