From fe0b38d6a806946d1be3b2a7539707811a0d74f3 Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Fri, 28 Feb 2020 09:50:51 -0800 Subject: [PATCH] remove Boost version check since Noetic only targets platforms with 1.67+ --- clients/roscpp/CMakeLists.txt | 12 ------------ tools/rosbag/src/recorder.cpp | 4 ---- 2 files changed, 16 deletions(-) diff --git a/clients/roscpp/CMakeLists.txt b/clients/roscpp/CMakeLists.txt index b5ef3ff1b2..fe506f1ffc 100644 --- a/clients/roscpp/CMakeLists.txt +++ b/clients/roscpp/CMakeLists.txt @@ -24,18 +24,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/ros/common.h.in ${CATKIN_DEVE find_package(Boost REQUIRED COMPONENTS chrono filesystem system) -# Make sure we use CLOCK_MONOTONIC for the condition variable wait_for if not Apple. -if(NOT APPLE AND NOT WIN32) - if(Boost_VERSION LESS 106100) - message(FATAL_ERROR "${PROJECT_NAME} requires Boost 1.61 or above.") - endif() - if(Boost_VERSION LESS 106700) - # CLOCK_MONOTONIC became the default in Boost 1.67: - # https://github.com/boostorg/thread/commit/1e84b978b2bb0aae830cc14533dea3b7ddda5cde - add_definitions(-DBOOST_THREAD_HAS_CONDATTR_SET_CLOCK_MONOTONIC) - endif() -endif() - include_directories(include ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_INCLUDE_DESTINATION}/ros ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}) # this is needed for use within a bazel workspace. See #1548 for details. include_directories(${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_INCLUDE_DESTINATION}) diff --git a/tools/rosbag/src/recorder.cpp b/tools/rosbag/src/recorder.cpp index 79e16fc998..f3aa71b3c7 100644 --- a/tools/rosbag/src/recorder.cpp +++ b/tools/rosbag/src/recorder.cpp @@ -508,11 +508,7 @@ void Recorder::doRecord() { break; } boost::xtime xt; -#if BOOST_VERSION >= 105000 boost::xtime_get(&xt, boost::TIME_UTC_); -#else - boost::xtime_get(&xt, boost::TIME_UTC); -#endif xt.nsec += 250000000; queue_condition_.timed_wait(lock, xt); if (checkDuration(ros::Time::now()))