roscpp: do not use boost_161_condition_variable.h on Windows (untested)

ros · Dec 11, 2018 · 3afb85d · 3afb85d
1 parent fdca164
commit 3afb85d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/clients/roscpp/CMakeLists.txt b/clients/roscpp/CMakeLists.txt
@@ -22,8 +22,8 @@ list(GET roscpp_VERSION_LIST 2 roscpp_VERSION_PATCH)
 
 find_package(Boost REQUIRED COMPONENTS chrono filesystem signals system)
 
-# Make sure we use CLOCK_MONOTONIC for the condition variable wait_for if not Apple.
-if(NOT APPLE)
+# Make sure we use CLOCK_MONOTONIC for the condition variable wait_for if not Apple or Windows.
+if(NOT APPLE AND NOT WIN32)
   if(Boost_VERSION LESS 106100)
     set(ROSCPP_USE_BACKPORTED_BOOST_CONDITION_VARIABLE_IMPLEMENTATION ON)
   endif()

diff --git a/clients/roscpp/include/boost_161_condition_variable.h b/clients/roscpp/include/boost_161_condition_variable.h
@@ -12,9 +12,6 @@
 #include <boost/thread/detail/platform.hpp>
 #if defined(BOOST_THREAD_PLATFORM_WIN32)
 #include <boost/thread/win32/condition_variable.hpp>
-namespace boost_161 {
-  using condition_variable = boost::condition_variable;
-}
 #elif defined(BOOST_THREAD_PLATFORM_PTHREAD)
 #include "boost_161_pthread_condition_variable.h"
 #else