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

Merge pull request #39 from ros2/fix_cppcheck_warning_take_2

Browse source 
fix syntax on Linux and Windows
This commit is contained in:
Dirk Thomas 2016-03-31 17:25:12 -07:00
commit 2d2dfb7d76
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rcl/src/rcl/timer.c
View file

@ -62,10 +62,10 @@ rcl_timer_init(
return now_ret; // rcl error state should already be set. return now_ret; // rcl error state should already be set.
} }
rcl_timer_impl_t impl; rcl_timer_impl_t impl;
impl.callback = ATOMIC_VAR_INIT((uintptr_t)callback); atomic_init(&impl.callback, (uintptr_t)callback);
impl.period = ATOMIC_VAR_INIT(period); atomic_init(&impl.period, period);
impl.last_call_time = ATOMIC_VAR_INIT(now_steady); atomic_init(&impl.last_call_time, now_steady);
impl.canceled = ATOMIC_VAR_INIT(false); atomic_init(&impl.canceled, false);
impl.allocator = allocator; impl.allocator = allocator;
RCL_CHECK_FOR_NULL_WITH_MSG( RCL_CHECK_FOR_NULL_WITH_MSG(
allocator.allocate, "allocate not set", return RCL_RET_INVALID_ARGUMENT); allocator.allocate, "allocate not set", return RCL_RET_INVALID_ARGUMENT);