From d2112b294bfc96c63c53d3d09ab5cdf2f3072d35 Mon Sep 17 00:00:00 2001 From: William Woodall Date: Wed, 19 Apr 2017 12:37:55 -0700 Subject: [PATCH] refactor to pass allocator to some functions in rcl (#321) --- rclcpp/src/rclcpp/node_interfaces/node_graph.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/rclcpp/src/rclcpp/node_interfaces/node_graph.cpp b/rclcpp/src/rclcpp/node_interfaces/node_graph.cpp index 918e4b6..a35b1b3 100644 --- a/rclcpp/src/rclcpp/node_interfaces/node_graph.cpp +++ b/rclcpp/src/rclcpp/node_interfaces/node_graph.cpp @@ -51,8 +51,10 @@ NodeGraph::get_topic_names_and_types() const rcl_topic_names_and_types_t topic_names_and_types = rcl_get_zero_initialized_topic_names_and_types(); - auto ret = rcl_get_topic_names_and_types(node_base_->get_rcl_node_handle(), - &topic_names_and_types); + auto ret = rcl_get_topic_names_and_types( + node_base_->get_rcl_node_handle(), + rcl_get_default_allocator(), + &topic_names_and_types); if (ret != RMW_RET_OK) { auto error_msg = std::string("failed to get topic names and types: ") + rcl_get_error_string_safe(); @@ -86,8 +88,10 @@ NodeGraph::get_node_names() const utilities_string_array_t node_names_c = utilities_get_zero_initialized_string_array(); - auto ret = rcl_get_node_names(node_base_->get_rcl_node_handle(), - &node_names_c); + auto ret = rcl_get_node_names( + node_base_->get_rcl_node_handle(), + rcl_get_default_allocator(), + &node_names_c); if (ret != RCL_RET_OK) { auto error_msg = std::string("failed to get node names: ") + rcl_get_error_string_safe(); rcl_reset_error();