Skip to content

Commit 1d808de

Browse files
jhdcsxabxx
authored andcommitted
Replace reinterperet_cast with static_cast (ros2#410)
* Converted reinterpret_cast to static_cast where I felt it was safe-ish Signed-off-by: Jacob Hassold <[email protected]> * Fixed inconsistent type inference Signed-off-by: Jacob Hassold <[email protected]>
1 parent f8ced7c commit 1d808de

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

rcl/test/rcl/test_init.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ struct FakeTestArgv
6060
: allocator(rcutils_get_default_allocator()), argc(2)
6161
{
6262
this->argv =
63-
reinterpret_cast<char **>(allocator.allocate(2 * sizeof(char *), allocator.state));
63+
static_cast<char **>(allocator.allocate(2 * sizeof(char *), allocator.state));
6464
if (!this->argv) {
6565
throw std::bad_alloc();
6666
}

rcl/test/rcl/test_time.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), default_clock_instanciation) {
222222
});
223223
ASSERT_TRUE(rcl_clock_valid(&ros_clock));
224224

225-
rcl_clock_t * steady_clock = reinterpret_cast<rcl_clock_t *>(
225+
auto * steady_clock = static_cast<rcl_clock_t *>(
226226
allocator.zero_allocate(1, sizeof(rcl_clock_t), allocator.state));
227227
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({
228228
allocator.deallocate(steady_clock, allocator.state);
@@ -235,7 +235,7 @@ TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), default_clock_instanciation) {
235235
});
236236
ASSERT_TRUE(rcl_clock_valid(steady_clock));
237237

238-
rcl_clock_t * system_clock = reinterpret_cast<rcl_clock_t *>(
238+
auto * system_clock = static_cast<rcl_clock_t *>(
239239
allocator.zero_allocate(1, sizeof(rcl_clock_t), allocator.state));
240240
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({
241241
allocator.deallocate(system_clock, allocator.state);
@@ -289,8 +289,8 @@ TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), specific_clock_instantiation) {
289289

290290
TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_time_difference) {
291291
rcl_allocator_t allocator = rcl_get_default_allocator();
292-
rcl_clock_t * ros_clock =
293-
reinterpret_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state));
292+
auto * ros_clock =
293+
static_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state));
294294
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({
295295
allocator.deallocate(ros_clock, allocator.state);
296296
});
@@ -324,8 +324,8 @@ TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_time_difference) {
324324

325325
TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_time_difference_signed) {
326326
rcl_allocator_t allocator = rcl_get_default_allocator();
327-
rcl_clock_t * ros_clock =
328-
reinterpret_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state));
327+
auto * ros_clock =
328+
static_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state));
329329
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({
330330
allocator.deallocate(ros_clock, allocator.state);
331331
});
@@ -405,8 +405,8 @@ void reset_callback_triggers(void)
405405

406406
TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_time_clock_change_callbacks) {
407407
rcl_allocator_t allocator = rcl_get_default_allocator();
408-
rcl_clock_t * ros_clock =
409-
reinterpret_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state));
408+
auto * ros_clock =
409+
static_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state));
410410
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({
411411
allocator.deallocate(ros_clock, allocator.state);
412412
});
@@ -468,8 +468,8 @@ TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_time_clock_change_callbacks) {
468468

469469
TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_time_forward_jump_callbacks) {
470470
rcl_allocator_t allocator = rcl_get_default_allocator();
471-
rcl_clock_t * ros_clock =
472-
reinterpret_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state));
471+
auto * ros_clock =
472+
static_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state));
473473
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({
474474
allocator.deallocate(ros_clock, allocator.state);
475475
});
@@ -529,8 +529,8 @@ TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_time_forward_jump_callbacks) {
529529

530530
TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_time_backward_jump_callbacks) {
531531
rcl_allocator_t allocator = rcl_get_default_allocator();
532-
rcl_clock_t * ros_clock =
533-
reinterpret_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state));
532+
auto * ros_clock =
533+
static_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state));
534534
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({
535535
allocator.deallocate(ros_clock, allocator.state);
536536
});
@@ -589,8 +589,8 @@ TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_time_backward_jump_callbacks)
589589

590590
TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_clock_add_jump_callback) {
591591
rcl_allocator_t allocator = rcl_get_default_allocator();
592-
rcl_clock_t * clock =
593-
reinterpret_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state));
592+
auto * clock =
593+
static_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state));
594594
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({
595595
allocator.deallocate(clock, allocator.state);
596596
});
@@ -625,8 +625,8 @@ TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_clock_add_jump_callback) {
625625

626626
TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_clock_remove_jump_callback) {
627627
rcl_allocator_t allocator = rcl_get_default_allocator();
628-
rcl_clock_t * clock =
629-
reinterpret_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state));
628+
auto * clock =
629+
static_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state));
630630
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({
631631
allocator.deallocate(clock, allocator.state);
632632
});
@@ -673,8 +673,8 @@ TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_clock_remove_jump_callback) {
673673

674674
TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), add_remove_add_jump_callback) {
675675
rcl_allocator_t allocator = rcl_get_default_allocator();
676-
rcl_clock_t * clock =
677-
reinterpret_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state));
676+
auto * clock =
677+
static_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state));
678678
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({
679679
allocator.deallocate(clock, allocator.state);
680680
});

0 commit comments

Comments
 (0)