src/cxx_supportlib/vendor-modified/boost/thread/detail/config.hpp in passenger-5.1.4 vs src/cxx_supportlib/vendor-modified/boost/thread/detail/config.hpp in passenger-5.1.5

- old
+ new

@@ -10,10 +10,12 @@ #include <boost/config.hpp> #include <boost/detail/workaround.hpp> #include <boost/thread/detail/platform.hpp> +//#define BOOST_THREAD_USEFIXES_TIMESPEC +//#define BOOST_THREAD_HAS_CONDATTR_SET_CLOCK_MONOTONIC //#define BOOST_THREAD_DONT_PROVIDE_INTERRUPTIONS // ATTRIBUTE_MAY_ALIAS #if defined(__GNUC__) && !defined(__INTEL_COMPILER) @@ -98,12 +100,12 @@ // Default version #if !defined BOOST_THREAD_VERSION #define BOOST_THREAD_VERSION 2 #else -#if BOOST_THREAD_VERSION!=2 && BOOST_THREAD_VERSION!=3 && BOOST_THREAD_VERSION!=4 -#error "BOOST_THREAD_VERSION must be 2, 3 or 4" +#if BOOST_THREAD_VERSION!=2 && BOOST_THREAD_VERSION!=3 && BOOST_THREAD_VERSION!=4 && BOOST_THREAD_VERSION!=5 +#error "BOOST_THREAD_VERSION must be 2, 3, 4 or 5" #endif #endif // CHRONO // Uses Boost.Chrono by default if not stated the opposite defining BOOST_THREAD_DONT_USE_CHRONO @@ -302,9 +304,16 @@ #define BOOST_THREAD_DONT_PROVIDE_CONDITION #endif #endif // BOOST_THREAD_VERSION>=4 + +#if BOOST_THREAD_VERSION>=5 +//#define BOOST_THREAD_FUTURE_BLOCKING +#else +//#define BOOST_THREAD_FUTURE_BLOCKING +#define BOOST_THREAD_ASYNC_FUTURE_WAITS +#endif // INTERRUPTIONS #if ! defined BOOST_THREAD_PROVIDES_INTERRUPTIONS \ && ! defined BOOST_THREAD_DONT_PROVIDE_INTERRUPTIONS #define BOOST_THREAD_PROVIDES_INTERRUPTIONS #endif