From 971a8bf8e787f7353ecab8d3831096b7e861e698 Mon Sep 17 00:00:00 2001 From: alberto Date: Fri, 24 May 2019 13:58:12 +0100 Subject: [PATCH 1/2] removed not used parameter client Signed-off-by: alberto --- rclcpp/include/rclcpp/time_source.hpp | 3 --- rclcpp/src/rclcpp/time_source.cpp | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/rclcpp/include/rclcpp/time_source.hpp b/rclcpp/include/rclcpp/time_source.hpp index 09a8340383..f87292dffd 100644 --- a/rclcpp/include/rclcpp/time_source.hpp +++ b/rclcpp/include/rclcpp/time_source.hpp @@ -100,9 +100,6 @@ class TimeSource // Destroy the subscription for the clock topic void destroy_clock_sub(); - // Parameter Client pointer - std::shared_ptr parameter_client_; - // Parameter Event subscription using ParamMessageT = rcl_interfaces::msg::ParameterEvent; using ParamSubscriptionT = rclcpp::Subscription; diff --git a/rclcpp/src/rclcpp/time_source.cpp b/rclcpp/src/rclcpp/time_source.cpp index 3639e104de..60d81239a4 100644 --- a/rclcpp/src/rclcpp/time_source.cpp +++ b/rclcpp/src/rclcpp/time_source.cpp @@ -112,7 +112,7 @@ void TimeSource::detachNode() { this->ros_time_active_ = false; clock_subscription_.reset(); - parameter_client_.reset(); + parameter_subscription_.reset(); node_base_.reset(); node_topics_.reset(); node_graph_.reset(); From f1902f62a36f21663971b0311c062939fcc2dde1 Mon Sep 17 00:00:00 2001 From: alberto Date: Tue, 28 May 2019 18:13:31 +0100 Subject: [PATCH 2/2] moved parameter include directives to time source cpp file Signed-off-by: alberto --- rclcpp/include/rclcpp/time_source.hpp | 2 -- rclcpp/src/rclcpp/time_source.cpp | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rclcpp/include/rclcpp/time_source.hpp b/rclcpp/include/rclcpp/time_source.hpp index f87292dffd..4dc46ce3e6 100644 --- a/rclcpp/include/rclcpp/time_source.hpp +++ b/rclcpp/include/rclcpp/time_source.hpp @@ -25,8 +25,6 @@ #include "rcl_interfaces/msg/parameter_event.hpp" #include "rclcpp/node.hpp" -#include "rclcpp/parameter_client.hpp" -#include "rclcpp/parameter_events_filter.hpp" namespace rclcpp diff --git a/rclcpp/src/rclcpp/time_source.cpp b/rclcpp/src/rclcpp/time_source.cpp index 60d81239a4..db8dd7ed15 100644 --- a/rclcpp/src/rclcpp/time_source.cpp +++ b/rclcpp/src/rclcpp/time_source.cpp @@ -25,6 +25,8 @@ #include "rclcpp/exceptions.hpp" #include "rclcpp/logging.hpp" #include "rclcpp/node.hpp" +#include "rclcpp/parameter_client.hpp" +#include "rclcpp/parameter_events_filter.hpp" #include "rclcpp/time.hpp" #include "rclcpp/time_source.hpp"