From 3e6a6d2781eb00fde2896d07caa762b39d9511c9 Mon Sep 17 00:00:00 2001 From: William Woodall Date: Thu, 20 Apr 2017 11:15:10 -0700 Subject: [PATCH] rename {c_}utilities to rcutils (#322) --- rclcpp/src/rclcpp/node_interfaces/node_graph.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rclcpp/src/rclcpp/node_interfaces/node_graph.cpp b/rclcpp/src/rclcpp/node_interfaces/node_graph.cpp index a35b1b3..bc7a5ad 100644 --- a/rclcpp/src/rclcpp/node_interfaces/node_graph.cpp +++ b/rclcpp/src/rclcpp/node_interfaces/node_graph.cpp @@ -85,8 +85,8 @@ NodeGraph::get_topic_names_and_types() const std::vector NodeGraph::get_node_names() const { - utilities_string_array_t node_names_c = - utilities_get_zero_initialized_string_array(); + rcutils_string_array_t node_names_c = + rcutils_get_zero_initialized_string_array(); auto ret = rcl_get_node_names( node_base_->get_rcl_node_handle(), @@ -95,20 +95,20 @@ NodeGraph::get_node_names() const if (ret != RCL_RET_OK) { auto error_msg = std::string("failed to get node names: ") + rcl_get_error_string_safe(); rcl_reset_error(); - if (utilities_string_array_fini(&node_names_c) != UTILITIES_RET_OK) { + if (rcutils_string_array_fini(&node_names_c) != RCUTILS_RET_OK) { error_msg += std::string(", failed also to cleanup node names, leaking memory: ") + rcl_get_error_string_safe(); } - // TODO(karsten1987): Append utilities_error_message once it's in master + // TODO(karsten1987): Append rcutils_error_message once it's in master throw std::runtime_error(error_msg); } std::vector node_names(&node_names_c.data[0], &node_names_c.data[0 + node_names_c.size]); - ret = utilities_string_array_fini(&node_names_c); - if (ret != UTILITIES_RET_OK) { + ret = rcutils_string_array_fini(&node_names_c); + if (ret != RCUTILS_RET_OK) { // *INDENT-OFF* - // TODO(karsten1987): Append utilities_error_message once it's in master + // TODO(karsten1987): Append rcutils_error_message once it's in master throw std::runtime_error( std::string("could not destroy node names: ")); // *INDENT-ON*