Skip to content

Commit

Permalink
remove support for tf < 1.11.3
Browse files Browse the repository at this point in the history
... and thus the need for boost::signals(1)
which was removed from boost in version 1.69
  • Loading branch information
rhaschke committed Feb 17, 2019
1 parent 26ffa64 commit f230eab
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 13 deletions.
5 changes: 0 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ find_package(Boost REQUIRED
COMPONENTS
filesystem
program_options
signals
system
thread
)
Expand Down Expand Up @@ -141,10 +140,6 @@ find_package(catkin REQUIRED
urdfdom_headers
)

if(${tf_VERSION} VERSION_LESS "1.11.3")
add_definitions("-DRVIZ_USE_BOOST_SIGNAL_1")
endif()

find_package(PythonLibs "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" REQUIRED)

find_package(Eigen3 QUIET)
Expand Down
8 changes: 0 additions & 8 deletions src/rviz/default_plugin/effort_display.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,7 @@ namespace tf
typedef boost::shared_ptr<M const> MConstPtr;
typedef ros::MessageEvent<M const> MEvent;
typedef boost::function<void(const MConstPtr&, FilterFailureReason)> FailureCallback;
#ifdef RVIZ_USE_BOOST_SIGNAL_1
typedef boost::signal<void(const MConstPtr&, FilterFailureReason)> FailureSignal;
#else
typedef boost::signals2::signal<void(const MConstPtr&, FilterFailureReason)> FailureSignal;
#endif

// If you hit this assert your message does not have a header, or does not have the HasHeader trait defined for it
ROS_STATIC_ASSERT(ros::message_traits::HasHeader<M>::value);
Expand Down Expand Up @@ -496,11 +492,7 @@ namespace tf

ros::Duration time_tolerance_; ///< Provide additional tolerance on time for messages which are stamped but can have associated duration

#ifdef RVIZ_USE_BOOST_SIGNAL_1
boost::signals::connection tf_connection_;
#else
boost::signals2::connection tf_connection_;
#endif
message_filters::Connection message_connection_;

FailureSignal failure_signal_;
Expand Down

0 comments on commit f230eab

Please sign in to comment.