From 5d84e1efb0d5ff76c5f690763994b7117745b762 Mon Sep 17 00:00:00 2001 From: Emerson Knapp Date: Tue, 2 Apr 2019 16:20:18 -0700 Subject: [PATCH] Fix merge error for rclcpp_action test and catch linting oversights Signed-off-by: Emerson Knapp --- rclcpp/include/rclcpp/publisher.hpp | 2 +- rclcpp/include/rclcpp/subscription.hpp | 3 +-- rclcpp/src/rclcpp/node_interfaces/node_base.cpp | 2 +- rclcpp/src/rclcpp/publisher.cpp | 2 +- rclcpp_action/test/test_client.cpp | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/rclcpp/include/rclcpp/publisher.hpp b/rclcpp/include/rclcpp/publisher.hpp index a0306846f8..799c6dad43 100644 --- 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> event_handlers_; using IntraProcessManagerWeakPtr = diff --git a/rclcpp/include/rclcpp/subscription.hpp b/rclcpp/include/rclcpp/subscription.hpp index 982f61f5df..9b6efdfaef 100644 --- 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 index 529538857a..a9198ccd73 100644 --- 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 index 6a1c931c8b..3d311962de 100644 --- 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 index 6199d29af2..6b8c06d4bf 100644 --- 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(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);