niklas/rclcpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename {c_}utilities to rcutils (#322)

Browse source
This commit is contained in:
William Woodall 2017-04-20 11:15:10 -07:00 • committed by GitHub
parent d2112b294b
commit 3e6a6d2781
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
rclcpp/src/rclcpp/node_interfaces/node_graph.cpp
View file

@ -85,8 +85,8 @@ NodeGraph::get_topic_names_and_types() const
std::vector<std::string> std::vector<std::string>
NodeGraph::get_node_names() const NodeGraph::get_node_names() const
{ {
utilities_string_array_t node_names_c = rcutils_string_array_t node_names_c =
utilities_get_zero_initialized_string_array(); rcutils_get_zero_initialized_string_array();
auto ret = rcl_get_node_names( auto ret = rcl_get_node_names(
node_base_->get_rcl_node_handle(), node_base_->get_rcl_node_handle(),
@ -95,20 +95,20 @@ NodeGraph::get_node_names() const
if (ret != RCL_RET_OK) { if (ret != RCL_RET_OK) {
auto error_msg = std::string("failed to get node names: ") + rcl_get_error_string_safe(); auto error_msg = std::string("failed to get node names: ") + rcl_get_error_string_safe();
rcl_reset_error(); 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: ") + error_msg += std::string(", failed also to cleanup node names, leaking memory: ") +
rcl_get_error_string_safe(); 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); throw std::runtime_error(error_msg);
} }
std::vector<std::string> node_names(&node_names_c.data[0], std::vector<std::string> node_names(&node_names_c.data[0],
&node_names_c.data[0 + node_names_c.size]); &node_names_c.data[0 + node_names_c.size]);
ret = utilities_string_array_fini(&node_names_c); ret = rcutils_string_array_fini(&node_names_c);
if (ret != UTILITIES_RET_OK) { if (ret != RCUTILS_RET_OK) {
// *INDENT-OFF* // *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( throw std::runtime_error(
std::string("could not destroy node names: ")); std::string("could not destroy node names: "));
// *INDENT-ON* // *INDENT-ON*