Skip to content

Commit

Permalink
fix uncrustify issues
Browse files Browse the repository at this point in the history
Signed-off-by: Miaofei <miaofei@amazon.com>
  • Loading branch information
mm318 committed May 1, 2019
1 parent 72ebb18 commit bce0450
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 5 deletions.
19 changes: 15 additions & 4 deletions rcl/test/rcl/test_events.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,11 @@ class CLASSNAME (TestEventFixture, RMW_IMPLEMENTATION) : public ::testing::Test
publisher_options.qos.lifespan = lifespan;
publisher_options.qos.liveliness = liveliness_policy;
publisher_options.qos.liveliness_lease_duration = liveliness_lease_duration;
return rcl_publisher_init(&publisher, this->node_ptr, this->ts, this->topic,
return rcl_publisher_init(
&publisher,
this->node_ptr,
this->ts,
this->topic,
&publisher_options);
}

Expand All @@ -104,7 +108,11 @@ class CLASSNAME (TestEventFixture, RMW_IMPLEMENTATION) : public ::testing::Test
subscription_options.qos.liveliness = liveliness_policy;
subscription_options.qos.liveliness_lease_duration = liveliness_lease_duration;

return rcl_subscription_init(&subscription, this->node_ptr, this->ts, this->topic,
return rcl_subscription_init(
&subscription,
this->node_ptr,
this->ts,
this->topic,
&subscription_options);
}

Expand Down Expand Up @@ -221,8 +229,11 @@ wait_for_msgs_and_events(
int num_events = (nullptr == subscription_event ? 0 : 1) + (nullptr == publisher_event ? 0 : 1);

rcl_wait_set_t wait_set = rcl_get_zero_initialized_wait_set();
rcl_ret_t ret = rcl_wait_set_init(&wait_set, num_subscriptions, 0, 0, 0, 0, num_events,
context, rcl_get_default_allocator());
rcl_ret_t ret = rcl_wait_set_init(
&wait_set,
num_subscriptions, 0, 0, 0, 0, num_events,
context,
rcl_get_default_allocator());
EXPECT_EQ(ret, RCL_RET_OK) << rcl_get_error_string().str;
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({
rcl_ret_t ret = rcl_wait_set_fini(&wait_set);
Expand Down
5 changes: 4 additions & 1 deletion rcl/test/rcl/test_timer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,10 @@ TEST_F(TestTimerFixture, test_ros_time_wakes_wait) {

std::thread wait_thr([&](void) {
rcl_wait_set_t wait_set = rcl_get_zero_initialized_wait_set();
ret = rcl_wait_set_init(&wait_set, 0, 0, 1, 0, 0, 0, context_ptr,
ret = rcl_wait_set_init(
&wait_set,
0, 0, 1, 0, 0, 0,
context_ptr,
rcl_get_default_allocator());
EXPECT_EQ(RCL_RET_OK, ret) << rcl_get_error_string().str;

Expand Down

0 comments on commit bce0450

Please sign in to comment.