diff --git a/clients/roscpp/include/ros/callback_queue.h b/clients/roscpp/include/ros/callback_queue.h index 95f03be5a0..1881f1cf9c 100644 --- a/clients/roscpp/include/ros/callback_queue.h +++ b/clients/roscpp/include/ros/callback_queue.h @@ -35,21 +35,6 @@ #ifndef ROSCPP_CALLBACK_QUEUE_H #define ROSCPP_CALLBACK_QUEUE_H -// check if we might need to include our own backported version boost::condition_variable -// in order to use CLOCK_MONOTONIC for the condition variable -// the include order here is important! -#ifdef BOOST_THREAD_HAS_CONDATTR_SET_CLOCK_MONOTONIC -#include -#if BOOST_VERSION < 106100 -// use backported version of boost condition variable, see https://svn.boost.org/trac/boost/ticket/6377 -#include "boost_161_condition_variable.h" -#else // Boost version is 1.61 or greater and has the steady clock fixes -#include -#endif -#else // !BOOST_THREAD_HAS_CONDATTR_SET_CLOCK_MONOTONIC -#include -#endif // BOOST_THREAD_HAS_CONDATTR_SET_CLOCK_MONOTONIC - #include "ros/callback_queue_interface.h" #include "ros/internal/condition_variable.h" #include "ros/time.h"