Fix merge error for rclcpp_action test and catch linting oversights

Signed-off-by: Emerson Knapp <eknapp@amazon.com>
aws-ros-dev · Apr 2, 2019 · 5d84e1e · 5d84e1e
1 parent 0984fb2
commit 5d84e1e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/rclcpp/include/rclcpp/publisher.hpp b/rclcpp/include/rclcpp/publisher.hpp
@@ -200,7 +200,7 @@ class PublisherBase
 
   rcl_publisher_t publisher_handle_ = rcl_get_zero_initialized_publisher();
   rcl_publisher_t intra_process_publisher_handle_ = rcl_get_zero_initialized_publisher();
-  
+
   std::vector<std::shared_ptr<QOSEventHandlerBase>> event_handlers_;
 
   using IntraProcessManagerWeakPtr =

diff --git a/rclcpp/include/rclcpp/subscription.hpp b/rclcpp/include/rclcpp/subscription.hpp
@@ -30,8 +30,6 @@
 
 #include "rcl_interfaces/msg/intra_process_message.hpp"
 
-#include "rclcpp/subscription_options.hpp"
-#include "rclcpp/waitable.hpp"
 #include "rclcpp/any_subscription_callback.hpp"
 #include "rclcpp/exceptions.hpp"
 #include "rclcpp/expand_topic_or_service_name.hpp"
@@ -42,6 +40,7 @@
 #include "rclcpp/subscription_traits.hpp"
 #include "rclcpp/type_support_decl.hpp"
 #include "rclcpp/visibility_control.hpp"
+#include "rclcpp/waitable.hpp"
 
 namespace rclcpp
 {

diff --git a/rclcpp/src/rclcpp/node_interfaces/node_base.cpp b/rclcpp/src/rclcpp/node_interfaces/node_base.cpp
@@ -200,7 +200,7 @@ NodeBase::get_shared_rcl_node_handle() const
 bool
 NodeBase::assert_liveliness() const
 {
-  return (RCL_RET_OK == rcl_node_assert_liveliness(get_rcl_node_handle()));
+  return RCL_RET_OK == rcl_node_assert_liveliness(get_rcl_node_handle());
 }
 
 rclcpp::callback_group::CallbackGroup::SharedPtr

diff --git a/rclcpp/src/rclcpp/publisher.cpp b/rclcpp/src/rclcpp/publisher.cpp
@@ -207,7 +207,7 @@ PublisherBase::get_intra_process_subscription_count() const
 bool
 PublisherBase::assert_liveliness() const
 {
-  return (RCL_RET_OK == rcl_publisher_assert_liveliness(&publisher_handle_));
+  return RCL_RET_OK == rcl_publisher_assert_liveliness(&publisher_handle_);
 }
 
 bool

diff --git a/rclcpp_action/test/test_client.cpp b/rclcpp_action/test/test_client.cpp
@@ -205,7 +205,7 @@ class TestClient : public ::testing::Test
       action_name, allocator, &status_topic_name);
     ASSERT_EQ(RCL_RET_OK, ret);
     status_publisher = server_node->create_publisher<ActionStatusMessage>(status_topic_name,
-        nullptr, rclcpp::PublisherOptions<>(rcl_action_qos_profile_status_default));
+      rcl_action_qos_profile_status_default);
     ASSERT_TRUE(status_publisher != nullptr);
     allocator.deallocate(status_topic_name, allocator.state);
     server_executor.add_node(server_node);