diff --git a/rclcpp/include/rclcpp/node_interfaces/node_clock.hpp b/rclcpp/include/rclcpp/node_interfaces/node_clock.hpp index e0dd031eb9..8e5fba8f46 100644 --- a/rclcpp/include/rclcpp/node_interfaces/node_clock.hpp +++ b/rclcpp/include/rclcpp/node_interfaces/node_clock.hpp @@ -42,7 +42,6 @@ class NodeClock : public NodeClockInterface rclcpp::node_interfaces::NodeTopicsInterface::SharedPtr node_topics, rclcpp::node_interfaces::NodeGraphInterface::SharedPtr node_graph, rclcpp::node_interfaces::NodeServicesInterface::SharedPtr node_services, - rclcpp::node_interfaces::NodeParametersInterface::SharedPtr node_parameters, rclcpp::node_interfaces::NodeLoggingInterface::SharedPtr node_logging); RCLCPP_PUBLIC diff --git a/rclcpp/include/rclcpp/node_interfaces/node_parameters.hpp b/rclcpp/include/rclcpp/node_interfaces/node_parameters.hpp index ce44d689a6..59dd27e373 100644 --- a/rclcpp/include/rclcpp/node_interfaces/node_parameters.hpp +++ b/rclcpp/include/rclcpp/node_interfaces/node_parameters.hpp @@ -106,11 +106,10 @@ class NodeParameters : public NodeParametersInterface rclcpp::Parameter & parameter) const override; RCLCPP_PUBLIC - virtual bool get_parameters_by_prefix( const std::string & prefix, - std::map & parameters) const; + std::map & parameters) const override; RCLCPP_PUBLIC virtual diff --git a/rclcpp/src/rclcpp/node_interfaces/node_clock.cpp b/rclcpp/src/rclcpp/node_interfaces/node_clock.cpp index 78b543a075..8de8c3cba5 100644 --- a/rclcpp/src/rclcpp/node_interfaces/node_clock.cpp +++ b/rclcpp/src/rclcpp/node_interfaces/node_clock.cpp @@ -24,13 +24,11 @@ NodeClock::NodeClock( rclcpp::node_interfaces::NodeTopicsInterface::SharedPtr node_topics, rclcpp::node_interfaces::NodeGraphInterface::SharedPtr node_graph, rclcpp::node_interfaces::NodeServicesInterface::SharedPtr node_services, - rclcpp::node_interfaces::NodeParametersInterface::SharedPtr node_parameters, rclcpp::node_interfaces::NodeLoggingInterface::SharedPtr node_logging) : node_base_(node_base), node_topics_(node_topics), node_graph_(node_graph), node_services_(node_services), - node_parameters_(node_parameters), node_logging_(node_logging), ros_clock_(std::make_shared(RCL_ROS_TIME)) {} diff --git a/rclcpp/src/rclcpp/node_interfaces/node_parameters.cpp b/rclcpp/src/rclcpp/node_interfaces/node_parameters.cpp index 78c284ff4a..b92667b85c 100644 --- a/rclcpp/src/rclcpp/node_interfaces/node_parameters.cpp +++ b/rclcpp/src/rclcpp/node_interfaces/node_parameters.cpp @@ -41,7 +41,7 @@ NodeParameters::NodeParameters( bool use_intra_process, bool start_parameter_services, bool allow_undeclared_parameters) -: node_clock_(node_clock), allow_undeclared_(allow_undeclared_parameters) +: allow_undeclared_(allow_undeclared_parameters), node_clock_(node_clock) { using MessageT = rcl_interfaces::msg::ParameterEvent; using PublisherT = rclcpp::Publisher;