Skip to content

Commit

Permalink
switch to boost signals2 following ros/ros_comm#267, blocking ros/geo…
Browse files Browse the repository at this point in the history
  • Loading branch information
tfoote committed Apr 29, 2014
1 parent 851fc53 commit e2601a0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions include/tf2/buffer_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

#include "transform_storage.h"

#include <boost/signals.hpp>
#include <boost/signals2.hpp>

#include <string>

Expand Down Expand Up @@ -250,11 +250,11 @@ class BufferCore
* \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 Check if a frame exists in the tree
Expand Down Expand Up @@ -356,7 +356,7 @@ class BufferCore
struct RemoveRequestByID;

// Backwards compatability for tf message_filter
typedef boost::signal<void(void)> TransformsChangedSignal;
typedef boost::signals2::signal<void(void)> TransformsChangedSignal;
/// Signal which is fired whenever new transform data has arrived, from the thread the data arrived in
TransformsChangedSignal _transforms_changed_;

Expand Down
4 changes: 2 additions & 2 deletions src/buffer_core.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1195,13 +1195,13 @@ void BufferCore::cancelTransformableRequest(TransformableRequestHandle handle)


// backwards compability for tf methods
boost::signals::connection BufferCore::_addTransformsChangedListener(boost::function<void(void)> callback)
boost::signals2::connection BufferCore::_addTransformsChangedListener(boost::function<void(void)> callback)
{
boost::mutex::scoped_lock lock(transformable_requests_mutex_);
return _transforms_changed_.connect(callback);
}

void BufferCore::_removeTransformsChangedListener(boost::signals::connection c)
void BufferCore::_removeTransformsChangedListener(boost::signals2::connection c)
{
boost::mutex::scoped_lock lock(transformable_requests_mutex_);
c.disconnect();
Expand Down

0 comments on commit e2601a0

Please sign in to comment.