Skip to content

Commit

Permalink
Update clients/roscpp/include/ros/callback_queue.h
Browse files Browse the repository at this point in the history
Co-authored-by: Johannes Meyer <johannes@intermodalics.eu>
  • Loading branch information
dirk-thomas and meyerj authored Jul 31, 2020
1 parent b32a932 commit 31dc30a
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions clients/roscpp/include/ros/callback_queue.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 <boost/version.hpp>
#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 <boost/thread/condition_variable.hpp>
#endif
#else // !BOOST_THREAD_HAS_CONDATTR_SET_CLOCK_MONOTONIC
#include <boost/thread/condition_variable.hpp>
#endif // BOOST_THREAD_HAS_CONDATTR_SET_CLOCK_MONOTONIC

#include "ros/callback_queue_interface.h"
#include "ros/internal/condition_variable.h"
#include "ros/time.h"
Expand Down

0 comments on commit 31dc30a

Please sign in to comment.