niklas/rcl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace reinterperet_cast with static_cast (#410)

Browse source 
* Converted reinterpret_cast to static_cast where I felt it was safe-ish

Signed-off-by: Jacob Hassold <jhassold@dcscorp.com>

* Fixed inconsistent type inference

Signed-off-by: Jacob Hassold <jhassold@dcscorp.com>
This commit is contained in:
jhdcs 2019-04-22 16:24:22 -04:00 • committed by Shane Loretz
parent 273797e387
commit 64610d2548
2 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rcl/test/rcl/test_init.cpp
View file

@ -60,7 +60,7 @@ struct FakeTestArgv
: allocator(rcutils_get_default_allocator()), argc(2) : allocator(rcutils_get_default_allocator()), argc(2)
{ {
this->argv = this->argv =
reinterpret_cast<char **>(allocator.allocate(2 * sizeof(char *), allocator.state)); static_cast<char **>(allocator.allocate(2 * sizeof(char *), allocator.state));
if (!this->argv) { if (!this->argv) {
throw std::bad_alloc(); throw std::bad_alloc();
} }

36
rcl/test/rcl/test_time.cpp
View file

@ -222,7 +222,7 @@ TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), default_clock_instanciation) {
}); });
ASSERT_TRUE(rcl_clock_valid(&ros_clock)); ASSERT_TRUE(rcl_clock_valid(&ros_clock));
rcl_clock_t * steady_clock = reinterpret_cast<rcl_clock_t *>( auto * steady_clock = static_cast<rcl_clock_t *>(
allocator.zero_allocate(1, sizeof(rcl_clock_t), allocator.state)); allocator.zero_allocate(1, sizeof(rcl_clock_t), allocator.state));
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({ OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({
allocator.deallocate(steady_clock, allocator.state); allocator.deallocate(steady_clock, allocator.state);
@ -235,7 +235,7 @@ TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), default_clock_instanciation) {
}); });
ASSERT_TRUE(rcl_clock_valid(steady_clock)); ASSERT_TRUE(rcl_clock_valid(steady_clock));
rcl_clock_t * system_clock = reinterpret_cast<rcl_clock_t *>( auto * system_clock = static_cast<rcl_clock_t *>(
allocator.zero_allocate(1, sizeof(rcl_clock_t), allocator.state)); allocator.zero_allocate(1, sizeof(rcl_clock_t), allocator.state));
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({ OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({
allocator.deallocate(system_clock, allocator.state); allocator.deallocate(system_clock, allocator.state);
@ -289,8 +289,8 @@ TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), specific_clock_instantiation) {
TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_time_difference) { TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_time_difference) {
rcl_allocator_t allocator = rcl_get_default_allocator(); rcl_allocator_t allocator = rcl_get_default_allocator();
rcl_clock_t * ros_clock = auto * ros_clock =
reinterpret_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state)); static_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state));
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({ OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({
allocator.deallocate(ros_clock, allocator.state); allocator.deallocate(ros_clock, allocator.state);
}); });
@ -324,8 +324,8 @@ TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_time_difference) {
TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_time_difference_signed) { TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_time_difference_signed) {
rcl_allocator_t allocator = rcl_get_default_allocator(); rcl_allocator_t allocator = rcl_get_default_allocator();
rcl_clock_t * ros_clock = auto * ros_clock =
reinterpret_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state)); static_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state));
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({ OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({
allocator.deallocate(ros_clock, allocator.state); allocator.deallocate(ros_clock, allocator.state);
}); });
@ -405,8 +405,8 @@ void reset_callback_triggers(void)
TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_time_clock_change_callbacks) { TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_time_clock_change_callbacks) {
rcl_allocator_t allocator = rcl_get_default_allocator(); rcl_allocator_t allocator = rcl_get_default_allocator();
rcl_clock_t * ros_clock = auto * ros_clock =
reinterpret_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state)); static_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state));
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({ OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({
allocator.deallocate(ros_clock, allocator.state); allocator.deallocate(ros_clock, allocator.state);
}); });
@ -468,8 +468,8 @@ TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_time_clock_change_callbacks) {
TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_time_forward_jump_callbacks) { TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_time_forward_jump_callbacks) {
rcl_allocator_t allocator = rcl_get_default_allocator(); rcl_allocator_t allocator = rcl_get_default_allocator();
rcl_clock_t * ros_clock = auto * ros_clock =
reinterpret_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state)); static_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state));
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({ OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({
allocator.deallocate(ros_clock, allocator.state); allocator.deallocate(ros_clock, allocator.state);
}); });
@ -529,8 +529,8 @@ TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_time_forward_jump_callbacks) {
TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_time_backward_jump_callbacks) { TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_time_backward_jump_callbacks) {
rcl_allocator_t allocator = rcl_get_default_allocator(); rcl_allocator_t allocator = rcl_get_default_allocator();
rcl_clock_t * ros_clock = auto * ros_clock =
reinterpret_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state)); static_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state));
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({ OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({
allocator.deallocate(ros_clock, allocator.state); allocator.deallocate(ros_clock, allocator.state);
}); });
@ -589,8 +589,8 @@ TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_time_backward_jump_callbacks)
TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_clock_add_jump_callback) { TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_clock_add_jump_callback) {
rcl_allocator_t allocator = rcl_get_default_allocator(); rcl_allocator_t allocator = rcl_get_default_allocator();
rcl_clock_t * clock = auto * clock =
reinterpret_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state)); static_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state));
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({ OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({
allocator.deallocate(clock, allocator.state); allocator.deallocate(clock, allocator.state);
}); });
@ -625,8 +625,8 @@ TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_clock_add_jump_callback) {
TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_clock_remove_jump_callback) { TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_clock_remove_jump_callback) {
rcl_allocator_t allocator = rcl_get_default_allocator(); rcl_allocator_t allocator = rcl_get_default_allocator();
rcl_clock_t * clock = auto * clock =
reinterpret_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state)); static_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state));
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({ OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({
allocator.deallocate(clock, allocator.state); allocator.deallocate(clock, allocator.state);
}); });
@ -673,8 +673,8 @@ TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), rcl_clock_remove_jump_callback) {
TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), add_remove_add_jump_callback) { TEST(CLASSNAME(rcl_time, RMW_IMPLEMENTATION), add_remove_add_jump_callback) {
rcl_allocator_t allocator = rcl_get_default_allocator(); rcl_allocator_t allocator = rcl_get_default_allocator();
rcl_clock_t * clock = auto * clock =
reinterpret_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state)); static_cast<rcl_clock_t *>(allocator.allocate(sizeof(rcl_clock_t), allocator.state));
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({ OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({
allocator.deallocate(clock, allocator.state); allocator.deallocate(clock, allocator.state);
}); });