Skip to content

Commit d74d18e

Browse files
committed
[FIX compile] Remove deprecated headers
tf2*.h is deprecated after commit: ros2/geometry2#789
1 parent b49117c commit d74d18e

File tree

2 files changed

+6
-15
lines changed

2 files changed

+6
-15
lines changed

src/rviz_visual_tools.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,12 @@
4242
#include <rviz_visual_tools/rviz_visual_tools.hpp>
4343

4444
// Conversions
45-
#include <tf2/convert.h>
46-
#include <tf2/LinearMath/Vector3.h>
47-
#include <tf2/LinearMath/Quaternion.h>
48-
#if __has_include(<tf2_eigen/tf2_eigen.hpp>)
45+
#include <tf2/convert.hpp>
46+
#include <tf2/LinearMath/Vector3.hpp>
47+
#include <tf2/LinearMath/Quaternion.hpp>
4948
#include <tf2_eigen/tf2_eigen.hpp>
5049
#include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
51-
#else
52-
#include <tf2_eigen/tf2_eigen.h>
53-
#include <tf2_geometry_msgs/tf2_geometry_msgs.h>
54-
#endif
50+
5551

5652
// Use (void) to silent unused warnings.
5753
#define assertm(exp, msg) assert(((void)msg, exp))

src/tf_visual_tools.cpp

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,11 @@
3232

3333
#include <rviz_visual_tools/tf_visual_tools.hpp>
3434
#include <rclcpp/create_timer.hpp>
35-
#if __has_include(<tf2_eigen/tf2_eigen.hpp>)
3635
#include <tf2_eigen/tf2_eigen.hpp>
37-
#else
38-
#include <tf2_eigen/tf2_eigen.h>
39-
#endif
36+
4037

4138
// TF
42-
#include <tf2/convert.h>
39+
#include <tf2/convert.hpp>
4340

4441
// C++
4542
#include <string>
@@ -54,11 +51,9 @@ TFVisualTools::TFVisualTools(const rclcpp::Node::SharedPtr& node, double loop_hz
5451
{
5552
rclcpp::Duration update_period = rclcpp::Duration::from_seconds(1.0 / loop_hz);
5653

57-
// non_realtime_loop_ = nh_.createTimer(update_freq, &TFVisualTools::publishAllTransforms, this);
5854
non_realtime_loop_ =
5955
rclcpp::create_timer(node_base_interface_, timers_interface_, clock_interface_->get_clock(),
6056
update_period, std::bind(&TFVisualTools::publishAllTransforms, this));
61-
// , std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
6257

6358
tf_broadcaster_ = std::make_shared<tf2_ros::TransformBroadcaster>(node);
6459

0 commit comments

Comments
 (0)