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

Zero init topic names and types (#260)

Browse source 
* use zero init topic_names_and_type struct

* use the right arguments

* line length
This commit is contained in:
Mikael Arguedas 2016-10-27 19:02:35 -07:00 • committed by GitHub
parent f28bb11078
commit a71ce25a5a
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
rclcpp/src/rclcpp/node.cpp
View file

@ -20,6 +20,7 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include "rcl/graph.h"
#include "rcl_interfaces/srv/list_parameters.hpp" #include "rcl_interfaces/srv/list_parameters.hpp"
#include "rclcpp/exceptions.hpp" #include "rclcpp/exceptions.hpp"
#include "rclcpp/graph_listener.hpp" #include "rclcpp/graph_listener.hpp"
@ -350,12 +351,10 @@ Node::list_parameters(
std::map<std::string, std::string> std::map<std::string, std::string>
Node::get_topic_names_and_types() const Node::get_topic_names_and_types() const
{ {
rmw_topic_names_and_types_t topic_names_and_types; rcl_topic_names_and_types_t topic_names_and_types =
topic_names_and_types.topic_count = 0; rcl_get_zero_initialized_topic_names_and_types();
topic_names_and_types.topic_names = nullptr;
topic_names_and_types.type_names = nullptr;
auto ret = rmw_get_topic_names_and_types(rcl_node_get_rmw_handle(node_handle_.get()), auto ret = rcl_get_topic_names_and_types(node_handle_.get(),
&topic_names_and_types); &topic_names_and_types);
if (ret != RMW_RET_OK) { if (ret != RMW_RET_OK) {
// *INDENT-OFF* // *INDENT-OFF*