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

Merge pull request #38 from ros2/fix_cppcheck_warning

Browse source 
fix unknownEvaluationOrder warning
This commit is contained in:
Dirk Thomas 2016-03-31 14:19:28 -07:00
commit 1936e12321
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -61,13 +61,12 @@ rcl_timer_init(
if (now_ret != RCL_RET_OK) {
return now_ret; // rcl error state should already be set.
}
rcl_timer_impl_t impl = {
.callback = ATOMIC_VAR_INIT((uintptr_t)callback),
.period = ATOMIC_VAR_INIT(period),
.last_call_time = ATOMIC_VAR_INIT(now_steady),
.canceled = ATOMIC_VAR_INIT(false),
.allocator = allocator,
};
rcl_timer_impl_t impl;
impl.callback = ATOMIC_VAR_INIT((uintptr_t)callback);
impl.period = ATOMIC_VAR_INIT(period);
impl.last_call_time = ATOMIC_VAR_INIT(now_steady);
impl.canceled = ATOMIC_VAR_INIT(false);
impl.allocator = allocator;
RCL_CHECK_FOR_NULL_WITH_MSG(
allocator.allocate, "allocate not set", return RCL_RET_INVALID_ARGUMENT);
RCL_CHECK_FOR_NULL_WITH_MSG(