most of a patch for ros/geometry#23 but blocked by ros/ros_comm#267

daju1-ros · Aug 3, 2013 · f66ebc7 · f66ebc7
1 parent cfd3b4c
commit f66ebc7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/tf/include/tf/message_filter.h b/tf/include/tf/message_filter.h
@@ -44,7 +44,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 #include <boost/thread.hpp>
-#include <boost/signals.hpp>
+#include <boost/signals2.hpp>
 
 #include <ros/callback_queue.h>
 
@@ -109,7 +109,7 @@ class MessageFilter : public MessageFilterBase, public message_filters::SimpleFi
   typedef boost::shared_ptr<M const> MConstPtr;
   typedef ros::MessageEvent<M const> MEvent;
   typedef boost::function<void(const MConstPtr&, FilterFailureReason)> FailureCallback;
-  typedef boost::signal<void(const MConstPtr&, FilterFailureReason)> FailureSignal;
+  typedef boost::signals2::signal<void(const MConstPtr&, FilterFailureReason)> FailureSignal;
 
   // 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);
@@ -538,7 +538,7 @@ class MessageFilter : public MessageFilterBase, public message_filters::SimpleFi
 
   ros::Duration time_tolerance_; ///< Provide additional tolerance on time for messages which are stamped but can have associated duration
 
-  boost::signals::connection tf_connection_;
+  boost::signals2::connection tf_connection_;
   message_filters::Connection message_connection_;
 
   FailureSignal failure_signal_;

diff --git a/tf/include/tf/tf.h b/tf/include/tf/tf.h
@@ -42,7 +42,7 @@
 #include <tf/exceptions.h>
 #include "tf/time_cache.h"
 #include <boost/unordered_map.hpp>
-#include <boost/signals.hpp>
+#include <boost/signals2.hpp>
 #include "geometry_msgs/TwistStamped.h"
 
 #include <tf2_ros/buffer.h>
@@ -321,11 +321,11 @@ class Transformer
    * \brief Add a callback that happens when a new transform has arrived
    *
    * \param callback The callback, of the form void func();
-   * \return A boost::signals::connection object that can be used to remove this
+   * \return A boost::signals2::connection object that can be used to remove this
    * listener
    */
-  boost::signals::connection addTransformsChangedListener(boost::function<void(void)> callback);
-  void removeTransformsChangedListener(boost::signals::connection c);
+  boost::signals2::connection addTransformsChangedListener(boost::function<void(void)> callback);
+  void removeTransformsChangedListener(boost::signals2::connection c);
 
   /** 
    * \brief Get the tf_prefix this is running with

diff --git a/tf/src/tf.cpp b/tf/src/tf.cpp
@@ -570,12 +570,12 @@ void Transformer::transformPose(const std::string& target_frame, const ros::Time
   stamped_out.frame_id_ = target_frame;
 };
 
-boost::signals::connection Transformer::addTransformsChangedListener(boost::function<void(void)> callback)
+boost::signals2::connection Transformer::addTransformsChangedListener(boost::function<void(void)> callback)
 {
   return tf2_buffer_._addTransformsChangedListener(callback);
 }
 
-void Transformer::removeTransformsChangedListener(boost::signals::connection c)
+void Transformer::removeTransformsChangedListener(boost::signals2::connection c)
 {
   tf2_buffer_._removeTransformsChangedListener(c);
 }