From 975a726a86c76f1e967dea0ad0c786811b1057c4 Mon Sep 17 00:00:00 2001 From: William Woodall Date: Wed, 22 Apr 2020 15:35:35 -0700 Subject: [PATCH] fix ups since rebase Signed-off-by: William Woodall --- rclcpp/test/test_interface_traits.cpp | 2 +- rclcpp_action/include/rclcpp_action/create_client.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rclcpp/test/test_interface_traits.cpp b/rclcpp/test/test_interface_traits.cpp index 599517c328..071ac22ce7 100644 --- a/rclcpp/test/test_interface_traits.cpp +++ b/rclcpp/test/test_interface_traits.cpp @@ -31,7 +31,7 @@ class MyNode return std::make_shared( "my_node_name", "my_node_namespace", - rclcpp::contexts::default_context::get_global_default_context(), + rclcpp::contexts::get_global_default_context(), *options.get_rcl_node_options(), options.use_intra_process_comms(), options.enable_topic_statistics()); diff --git a/rclcpp_action/include/rclcpp_action/create_client.hpp b/rclcpp_action/include/rclcpp_action/create_client.hpp index 2afae36f6e..2acd4d7aee 100644 --- a/rclcpp_action/include/rclcpp_action/create_client.hpp +++ b/rclcpp_action/include/rclcpp_action/create_client.hpp @@ -104,7 +104,7 @@ create_client( const std::string & name, rclcpp::CallbackGroup::SharedPtr group = nullptr) { - return create_client( + return rclcpp_action::create_client( node->get_node_base_interface(), node->get_node_graph_interface(), node->get_node_logging_interface(),