Commits

Luis Torres committed 517f6eb

Removed unnecessary preprocessor variable for the deprecated boost call nonsense

Comments (0)

Files changed (2)

   # we're using chrono
   find_package(Boost COMPONENTS date_time thread serialization filesystem system program_options unit_test_framework chrono REQUIRED)
 else()
-  # don't use chrono, set a flag to notify that we're using the
-  # deprecated timed_join() call
+  # don't use chrono
   find_package(Boost COMPONENTS date_time thread serialization filesystem system program_options unit_test_framework REQUIRED)
-  add_definitions(-DUSE_BOOST_TIMED_JOIN)
 endif()
 include_directories(SYSTEM ${Boost_INCLUDE_DIR})
 

src/ompl/tools/benchmark/src/Benchmark.cpp

                 boost::thread t(boost::bind(&RunPlanner::runThread, this, planner, memStart + maxMem, time::seconds(maxTime), time::seconds(timeBetweenUpdates)));
 
                 // allow 25% more time than originally specified, in order to detect planner termination
-#ifdef USE_BOOST_TIMED_JOIN
+#if BOOST_VERSION < 105000
                 // For older versions of boost, we have to use this
                 // deprecated form of the timed join
                 if (!t.timed_join(time::seconds(maxTime * 1.25)))