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

refactor to pass allocator to some functions in rcl (#321)

Browse source
This commit is contained in:
William Woodall 2017-04-19 12:37:55 -07:00 • committed by GitHub
parent 81b8255e61
commit d2112b294b
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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();