Merge branch 'develop'

Remove all "throw()" specification to prepare for C++20 where it is r…

.travis.yml

@@ -362,7 +362,7 @@ install:
 script:
   - |-
     echo "using $TOOLSET : : $COMPILER : <cxxflags>-std=$CXXSTD ;" > ~/user-config.jam
-  - ./b2 -j3 libs/thread/test toolset=$TOOLSET
+  - ./b2 -j3 -l60 libs/thread/test toolset=$TOOLSET
 
 notifications:
   email:

appveyor.yml

@@ -1,4 +1,5 @@
-# Copyright 2016, 2017 Peter Dimov
+# Copyright 2016-2018 Peter Dimov
+# Copyright 2018 Vicente Botet
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
 
@@ -12,48 +13,34 @@ branches:
     - develop
     - /feature\/.*/
 
-platform:
-  - x64
-
 environment:
   matrix:
-    - ARGS: --toolset=msvc-9.0  address-model=32 cxxflags="/wd4244 /wd4459"
-    - ARGS: --toolset=msvc-10.0 address-model=32 cxxflags="/wd4244 /wd4459"
-    - ARGS: --toolset=msvc-11.0 address-model=32 cxxflags="/wd4244 /wd4459"
-    - ARGS: --toolset=msvc-12.0 address-model=32 cxxflags="/wd4244 /wd4459"
-    - ARGS: --toolset=msvc-14.0 address-model=32 cxxflags="/wd4244 /wd4459"
-    - ARGS: --toolset=msvc-12.0 address-model=64 cxxflags="/wd4244 /wd4459"
-    - ARGS: --toolset=msvc-14.0 address-model=64 cxxflags="/wd4244 /wd4459"
-    - ARGS: --toolset=msvc-14.0 address-model=64 cxxflags="-std:c++latest /wd4244 /wd4459"
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+#      TOOLSET: msvc-9.0,msvc-10.0,msvc-11.0,msvc-12.0
+      TOOLSET: msvc-12.0
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      TOOLSET: msvc-14.0
+      ADDRMD: 32
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      ARGS: --toolset=msvc-14.1 address-model=64 cxxflags="/wd4244 /wd4459"
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      ARGS: --toolset=msvc-14.1 address-model=32 cxxflags="/wd4244 /wd4459"
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      ARGS: --toolset=msvc-14.1 address-model=64 cxxflags="-std:c++latest /wd4244 /wd4459"
-    - ARGS: --toolset=gcc address-model=64
-      PATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%
-    - ARGS: --toolset=gcc address-model=64 cxxflags="-std=gnu++1z
-      PATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%
-    - ARGS: --toolset=gcc address-model=32
-      PATH: C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin;%PATH%
-    - ARGS: --toolset=gcc address-model=32 linkflags=-Wl,-allow-multiple-definition
-      PATH: C:\MinGW\bin;%PATH%
-
-
-
-#    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-#      ARGS: --toolset=msvc-9.0
-#    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-#      ARGS: --toolset=msvc-10.0
-#    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-#      ARGS: --toolset=msvc-11.0
-#    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-#      ARGS: --toolset=msvc-12.0
-#    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-#      ARGS: --toolset=msvc-14.0
-#    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-#      ARGS: --toolset=msvc-14.1
+      TOOLSET: msvc-14.1
+      CXXSTD: 17
+      ADDRMD: 64
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+      ADDPATH: C:\cygwin\bin;
+      TOOLSET: gcc
+      CXXSTD: 14
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+      ADDPATH: C:\cygwin64\bin;
+      TOOLSET: gcc
+      CXXSTD: 14
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+      ADDPATH: C:\mingw\bin;
+      TOOLSET: gcc
+      CXXSTD: 14
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+      ADDPATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;
+      TOOLSET: gcc
+      CXXSTD: 14
 
 install:
   - set BOOST_BRANCH=develop
@@ -64,16 +51,15 @@ install:
   - git submodule update --init tools/build
   - git submodule update --init libs/config
   - git submodule update --init tools/boostdep
-  - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\thread\
+  - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\thread
   - python tools/boostdep/depinst/depinst.py thread
   - cmd /c bootstrap
-  - b2 headers
+  - b2 -d0 headers
 
 build: off
 
 test_script:
-  - cd libs\config\test
-  - ..\..\..\b2 config_info_travis_install %ARGS%
-  - config_info_travis
-  - cd ..\..\thread\test
-  - ..\..\..\b2 --abbreviate-paths -j3 %ARGS%
+  - PATH=%ADDPATH%%PATH%
+  - if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD%
+  - if not "%ADDRMD%" == "" set ADDRMD=address-model=%ADDRMD%
+  - b2 -j3 libs/thread/test toolset=%TOOLSET% %CXXSTD% %ADDRMD% variant=debug,release

circle.yml

@@ -43,9 +43,9 @@ build_steps: &build_steps
     - run:
         name: Build
         command: |
-          echo "using $TOOLSET : : $COMPILER : <cxxflags>-std=$CXXSTD <cxxflags>$DEFINES ;" > ~/user-config.jam
+          echo "using $TOOLSET : : $COMPILER : <cxxflags>-std=$CXXSTD <cxxflags>$CXXFLAGS <cxxflags>$DEFINES ;" > ~/user-config.jam
           cd ../boost-root
-          ./b2 -j8 libs/thread/test toolset=$TOOLSET
+          ./b2 -d2 -j8 -l60 libs/thread/test toolset=$TOOLSET
 
 mac_build: &mac_build
   macos:
@@ -137,6 +137,7 @@ jobs:
       - TOOLSET: "clang"
       - COMPILER: "clang++"
       - CXXSTD: "c++11"
+      - CXXFLAGS: "-Wno-unusable-partial-specialization"
       - DEFINES: "-DBOOST_THREAD_TEST_TIME_MS=100"
 
   mac-clang++-c++14:
@@ -153,6 +154,7 @@ jobs:
       - TOOLSET: "clang"
       - COMPILER: "clang++"
       - CXXSTD: "c++1z"
+      - CXXFLAGS: "-Wno-unusable-partial-specialization"
       - DEFINES: "-DBOOST_THREAD_TEST_TIME_MS=100"
 
 workflows:

doc/once.qbk

@@ -33,7 +33,7 @@
     #ifdef BOOST_THREAD_PROVIDES_ONCE_CXX11
     struct once_flag
     {
-      constexprr once_flag() noexcept;
+      constexpr once_flag() noexcept;
       once_flag(const once_flag&) = delete;
       once_flag& operator=(const once_flag&) = delete;
     };

include/boost/thread/detail/move.hpp

@@ -350,12 +350,19 @@ namespace boost
 #endif
 
 #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-      template <class T>
-      typename decay<T>::type
-      decay_copy(T&& t)
-      {
-          return boost::forward<T>(t);
-      }
+  template <class T>
+  typename decay<T>::type
+  decay_copy(T&& t)
+  {
+      return boost::forward<T>(t);
+  }
+  typedef void (*void_fct_ptr)();
+
+//  inline void_fct_ptr
+//  decay_copy(void (&t)())
+//  {
+//      return &t;
+//  }
 #else
   template <class T>
   typename decay<T>::type

include/boost/thread/detail/thread_safety.hpp

@@ -1,6 +1,15 @@
 #ifndef BOOST_THREAD_DETAIL_THREAD_SAFETY_HPP
 #define BOOST_THREAD_DETAIL_THREAD_SAFETY_HPP
 
+#if defined(__GNUC__) && !defined(__GXX_EXPERIMENTAL_CXX0X__)
+//
+// This is horrible, but it seems to be the only we can shut up the
+// "anonymous variadic macros were introduced in C99 [-Wvariadic-macros]"
+// warning that get spewed out otherwise in non-C++11 mode.
+//
+#pragma GCC system_header
+#endif
+
 // See https://clang.llvm.org/docs/ThreadSafetyAnalysis.html
 
 // Un-comment to enable Thread Safety Analysis

include/boost/thread/detail/tss_hooks.hpp

@@ -10,7 +10,7 @@
 
 #include <boost/config/abi_prefix.hpp>
 
-#if defined(BOOST_HAS_WINTHREADS)
+#if defined(BOOST_THREAD_WIN32)
 
 namespace boost
 {
@@ -58,7 +58,7 @@ namespace boost
             //it to be linked into the Boost.Threads library.
 }
 
-#endif //defined(BOOST_HAS_WINTHREADS)
+#endif //defined(BOOST_THREAD_WIN32)
 
 #include <boost/config/abi_suffix.hpp>
 

include/boost/thread/exceptions.hpp

@@ -56,7 +56,7 @@ namespace boost
         {
         }
 
-        ~thread_exception() throw()
+        ~thread_exception() BOOST_NOEXCEPT_OR_NOTHROW
         {}
 
 
@@ -113,7 +113,7 @@ namespace boost
         {
         }
 
-        ~lock_error() throw()
+        ~lock_error() BOOST_NOEXCEPT_OR_NOTHROW
         {}
 
     };
@@ -141,7 +141,7 @@ namespace boost
           }
 
 
-        ~thread_resource_error() throw()
+        ~thread_resource_error() BOOST_NOEXCEPT_OR_NOTHROW
         {}
 
     };

include/boost/thread/lockable_traits.hpp

@@ -11,7 +11,12 @@
 
 #include <boost/assert.hpp>
 #include <boost/detail/workaround.hpp>
+#include <boost/type_traits/integral_constant.hpp>
+#ifdef BOOST_NO_CXX11_SFINAE_EXPR
 #include <boost/type_traits/is_class.hpp>
+#else
+#include <boost/type_traits/declval.hpp>
+#endif
 
 #include <boost/config/abi_prefix.hpp>
 
@@ -33,6 +38,7 @@ namespace boost
 #ifndef BOOST_THREAD_NO_AUTO_DETECT_MUTEX_TYPES
     namespace detail
     {
+#ifdef BOOST_NO_CXX11_SFINAE_EXPR
 #define BOOST_THREAD_DEFINE_HAS_MEMBER_CALLED(member_name)                     \
         template<typename T, bool=boost::is_class<T>::value>            \
         struct has_member_called_##member_name                          \
@@ -142,6 +148,31 @@ namespace boost
         BOOST_STATIC_CONSTANT(
             bool,value=sizeof(has_member_try_lock<T>::has_member(&T::try_lock))==sizeof(true_type));
       };
+#else
+      template<typename T,typename Enabled=void>
+      struct has_member_lock : false_type {};
+
+      template<typename T>
+      struct has_member_lock<T,
+          decltype(void(boost::declval<T&>().lock()))
+      > : true_type {};
+
+      template<typename T,typename Enabled=void>
+      struct has_member_unlock : false_type {};
+
+      template<typename T>
+      struct has_member_unlock<T,
+          decltype(void(boost::declval<T&>().unlock()))
+      > : true_type {};
+
+      template<typename T,typename Enabled=bool>
+      struct has_member_try_lock : false_type {};
+
+      template<typename T>
+      struct has_member_try_lock<T,
+          decltype(bool(boost::declval<T&>().try_lock()))
+      > : true_type {};
+#endif
 
     }
 

include/boost/thread/win32/interlocked_read.hpp

@@ -87,9 +87,9 @@ namespace boost
         {
             void* const res=
 #if defined(_M_ARM64)
-                __iso_volatile_load64((const volatile __int64*)x);
+                (void*)__iso_volatile_load64((const volatile __int64*)x);
 #else
-                __iso_volatile_load32((const volatile __int32*)x);
+                (void*)__iso_volatile_load32((const volatile __int32*)x);
 #endif
             BOOST_THREAD_DETAIL_COMPILER_BARRIER();
             __dmb(0xB); // _ARM_BARRIER_ISH, see armintr.h from MSVC 11 and later

meta/libraries.json

@@ -7,11 +7,10 @@
       "Vicente J. Botet Escriba"
     ],
     "maintainers": [
-      "Vicente J. Botet Escriba <vicente.botet -at- wanadoo.fr>",
-      "Niall Douglas <niall -at- nedprod.com>"
+      "Vicente J. Botet Escriba <vicente.botet -at- wanadoo.fr>"
     ],
     "description":
-      "Portable C++ multi-threading. C++11, C++14.",
+      "Portable C++ multi-threading. C++03, C++11, C++14, C++17.",
     "std": [ "proposal" ],    
     "category": [
       "Concurrent", "System"

src/pthread/thread.cpp

@@ -149,7 +149,7 @@ namespace boost
 
         boost::detail::thread_data_base* get_current_thread_data()
         {
-            boost::call_once(current_thread_tls_init_flag,create_current_thread_tls_key);
+            boost::call_once(current_thread_tls_init_flag,&create_current_thread_tls_key);
             return (boost::detail::thread_data_base*)pthread_getspecific(current_thread_tls_key);
         }
 

src/tss_null.cpp

@@ -6,7 +6,7 @@
 
 #include <boost/thread/detail/config.hpp>
 
-#if defined(BOOST_HAS_WINTHREADS) && (defined(BOOST_THREAD_BUILD_LIB) || defined(BOOST_THREAD_TEST) || defined(UNDER_CE)) && (!defined(_MSC_VER) || defined(UNDER_CE))
+#if defined(BOOST_THREAD_WIN32) && (defined(BOOST_THREAD_BUILD_LIB) || defined(BOOST_THREAD_TEST) || defined(UNDER_CE)) && (!defined(_MSC_VER) || defined(UNDER_CE))
 
 namespace boost
 {
@@ -35,4 +35,4 @@ namespace boost
 
 }
 
-#endif //defined(BOOST_HAS_WINTHREADS) && defined(BOOST_THREAD_BUILD_LIB) && !defined(_MSC_VER)
+#endif //defined(BOOST_THREAD_WIN32) && defined(BOOST_THREAD_BUILD_LIB) && !defined(_MSC_VER)

src/win32/tss_dll.cpp

@@ -7,7 +7,7 @@
 #include <boost/thread/detail/config.hpp>
 
 
-#if defined(BOOST_HAS_WINTHREADS) && defined(BOOST_THREAD_BUILD_DLL)
+#if defined(BOOST_THREAD_WIN32) && defined(BOOST_THREAD_BUILD_DLL)
 
     #include <boost/thread/detail/tss_hooks.hpp>
 
@@ -73,7 +73,7 @@ namespace boost
     }
 }
 
-#else //defined(BOOST_HAS_WINTHREADS) && defined(BOOST_THREAD_BUILD_DLL)
+#else //defined(BOOST_THREAD_WIN32) && defined(BOOST_THREAD_BUILD_DLL)
 
 #ifdef _MSC_VER
 // Prevent LNK4221 warning with link=static
@@ -82,4 +82,4 @@ namespace boost { namespace link_static_warning_inhibit {
 } }
 #endif
 
-#endif //defined(BOOST_HAS_WINTHREADS) && defined(BOOST_THREAD_BUILD_DLL)
+#endif //defined(BOOST_THREAD_WIN32) && defined(BOOST_THREAD_BUILD_DLL)

src/win32/tss_pe.cpp

@@ -10,7 +10,7 @@
 #include <boost/winapi/config.hpp>
 #include <boost/thread/detail/config.hpp>
 
-#if defined(BOOST_HAS_WINTHREADS) && defined(BOOST_THREAD_BUILD_LIB)
+#if defined(BOOST_THREAD_WIN32) && defined(BOOST_THREAD_BUILD_LIB)
 
 #if (defined(__MINGW32__) && !defined(_WIN64)) || defined(__MINGW64__) || (__MINGW64_VERSION_MAJOR)
 
@@ -334,4 +334,4 @@ namespace boost
 
 #endif //defined(_MSC_VER) && !defined(UNDER_CE)
 
-#endif //defined(BOOST_HAS_WINTHREADS) && defined(BOOST_THREAD_BUILD_LIB)
+#endif //defined(BOOST_THREAD_WIN32) && defined(BOOST_THREAD_BUILD_LIB)

test/Jamfile.v2

@@ -296,8 +296,8 @@ rule thread-compile ( sources : reqs * : name )
           #[ thread-test test_vhh_shared_mutex_timed_locks.cpp ]
     ;
 
-    #explicit t_futures ;
-    test-suite t_futures
+    explicit t_futures_too_long ;
+    test-suite t_futures_too_long
     :
           [ thread-test test_futures.cpp ]
     ;
@@ -815,6 +815,12 @@ rule thread-compile ( sources : reqs * : name )
           [ thread-run2-noit ./threads/container/thread_ptr_list_pass.cpp : container__thread_ptr_list_p ]
     ;
 
+    explicit ts_examples_too_long ;
+    test-suite ts_examples_too_long
+    :
+          [ thread-run2 ../example/shared_mutex.cpp : ex_shared_mutex ]
+    ;
+
     #explicit ts_examples ;
     test-suite ts_examples
     :
@@ -830,7 +836,6 @@ rule thread-compile ( sources : reqs * : name )
           [ thread-run2-noit ../example/tss.cpp : ex_tss ]
           [ thread-run2 ../example/xtime.cpp : ex_xtime ]
           [ thread-run2 ../example/shared_monitor.cpp : ex_shared_monitor ]
-          [ thread-run2 ../example/shared_mutex.cpp : ex_shared_mutex ]
           #[ thread-run ../example/vhh_shared_monitor.cpp ]
           #[ thread-run ../example/vhh_shared_mutex.cpp ]
           [ thread-run2 ../example/make_future.cpp : ex_make_future ]

test/test_5542_2.cpp

@@ -12,7 +12,7 @@ void run_thread() {
 }
 
 int main() {
-        boost::thread t(run_thread);
+        boost::thread t(&run_thread);
         return 0;
 }
 

test/test_condition_notify_all.cpp

@@ -179,13 +179,13 @@ namespace
 
 void do_test_notify_all_following_notify_one_wakes_all_threads()
 {
-    boost::thread thread1(wait_for_condvar_and_increase_count);
-    boost::thread thread2(wait_for_condvar_and_increase_count);
+    boost::thread thread1(&wait_for_condvar_and_increase_count);
+    boost::thread thread2(&wait_for_condvar_and_increase_count);
 
     boost::this_thread::sleep(boost::posix_time::milliseconds(200));
     multiple_wake_cond.notify_one();
 
-    boost::thread thread3(wait_for_condvar_and_increase_count);
+    boost::thread thread3(&wait_for_condvar_and_increase_count);
 
     boost::this_thread::sleep(boost::posix_time::milliseconds(200));
     multiple_wake_cond.notify_one();

test/test_condition_notify_one.cpp

@@ -114,13 +114,13 @@ namespace
 
 void do_test_multiple_notify_one_calls_wakes_multiple_threads()
 {
-    boost::thread thread1(wait_for_condvar_and_increase_count);
-    boost::thread thread2(wait_for_condvar_and_increase_count);
+    boost::thread thread1(&wait_for_condvar_and_increase_count);
+    boost::thread thread2(&wait_for_condvar_and_increase_count);
 
     boost::this_thread::sleep(boost::posix_time::milliseconds(200));
     multiple_wake_cond.notify_one();
 
-    boost::thread thread3(wait_for_condvar_and_increase_count);
+    boost::thread thread3(&wait_for_condvar_and_increase_count);
 
     boost::this_thread::sleep(boost::posix_time::milliseconds(200));
     multiple_wake_cond.notify_one();

test/test_move_function.cpp

@@ -16,7 +16,7 @@ void do_nothing()
 
 BOOST_AUTO_TEST_CASE(test_thread_move_from_lvalue_on_construction)
 {
-    boost::thread src(do_nothing);
+    boost::thread src(&do_nothing);
     boost::thread::id src_id=src.get_id();
     boost::thread dest(boost::move(src));
     boost::thread::id dest_id=dest.get_id();
@@ -27,7 +27,7 @@ BOOST_AUTO_TEST_CASE(test_thread_move_from_lvalue_on_construction)
 
 BOOST_AUTO_TEST_CASE(test_thread_move_from_lvalue_on_assignment)
 {
-    boost::thread src(do_nothing);
+    boost::thread src(&do_nothing);
     boost::thread::id src_id=src.get_id();
     boost::thread dest;
     dest=boost::move(src);
@@ -39,7 +39,7 @@ BOOST_AUTO_TEST_CASE(test_thread_move_from_lvalue_on_assignment)
 
 boost::thread start_thread()
 {
-    return boost::thread(do_nothing);
+    return boost::thread(&do_nothing);
 }
 
 BOOST_AUTO_TEST_CASE(test_thread_move_from_rvalue_on_construction)

test/test_once.cpp

@@ -33,7 +33,7 @@ void call_once_thread()
     int my_once_value=0;
     for(unsigned i=0;i<loop_count;++i)
     {
-        boost::call_once(flag, initialize_variable);
+        boost::call_once(flag, &initialize_variable);
         my_once_value=var_to_init;
         if(my_once_value!=1)
         {

test/test_thread.cpp

@@ -206,8 +206,8 @@ BOOST_AUTO_TEST_CASE(test_timed_join)
 
 BOOST_AUTO_TEST_CASE(test_swap)
 {
-    boost::thread t(simple_thread);
-    boost::thread t2(simple_thread);
+    boost::thread t(&simple_thread);
+    boost::thread t2(&simple_thread);
     boost::thread::id id1=t.get_id();
     boost::thread::id id2=t2.get_id();
 

test/test_thread_exit.cpp

@@ -32,7 +32,7 @@ void tf1()
 BOOST_AUTO_TEST_CASE(test_thread_exit_func_runs_when_thread_exits)
 {
     exit_func_thread_id=boost::thread::id();
-    boost::thread t(tf1);
+    boost::thread t(&tf1);
     boost::thread::id const t_id=t.get_id();
     t.join();
     BOOST_CHECK(exit_func_thread_id==t_id);

test/test_thread_id.cpp

@@ -20,7 +20,7 @@ BOOST_AUTO_TEST_CASE(test_thread_id_for_default_constructed_thread_is_default_co
 
 BOOST_AUTO_TEST_CASE(test_thread_id_for_running_thread_is_not_default_constructed_id)
 {
-    boost::thread t(do_nothing);
+    boost::thread t(&do_nothing);
     BOOST_CHECK(t.get_id()!=boost::thread::id());
     t.join();
 }

test/test_thread_launching.cpp

@@ -22,7 +22,7 @@ void normal_function()
 
 BOOST_AUTO_TEST_CASE(test_thread_function_no_arguments)
 {
-    boost::thread function(normal_function);
+    boost::thread function(&normal_function);
     function.join();
     BOOST_CHECK(normal_function_called);
 }
@@ -36,7 +36,7 @@ void normal_function_one_arg(int i)
 
 BOOST_AUTO_TEST_CASE(test_thread_function_one_argument)
 {
-    boost::thread function(normal_function_one_arg,42);
+    boost::thread function(&normal_function_one_arg,42);
     function.join();
     BOOST_CHECK_EQUAL(42,nfoa_res);
 }

test/test_time_jumps.cpp

@@ -1,5 +1,5 @@
 #ifdef _WIN32
-	#include <Windows.h>
+	#include <windows.h>
 #else
 	#include <sys/time.h>
 #endif

test/test_tss.cpp

@@ -22,7 +22,7 @@
 
 #include <iostream>
 
-#if defined(BOOST_HAS_WINTHREADS)
+#if defined(BOOST_THREAD_PLATFORM_WIN32)
     #define WIN32_LEAN_AND_MEAN
     #include <windows.h>
 #endif

test/util.inl

@@ -93,17 +93,28 @@ public:
     bool wait()
     {
         boost::xtime xt = delay(secs);
-        if (type != use_condition)
+        if (type == use_sleep_only) {
             boost::thread::sleep(xt);
-        if (type != use_sleep_only) {
+            return done;
+        }
+        if (type == use_condition) {
             boost::unique_lock<boost::mutex> lock(mutex);
-            while (type == use_condition && !done) {
+            while (!done) {
                 if (!cond.timed_wait(lock, xt))
                     break;
             }
             return done;
         }
-        return done;
+        for (int i = 0; ; ++i) {
+            {
+                boost::unique_lock<boost::mutex> lock(mutex);
+                if (done)
+                    return true;
+                else if (i > secs * 2)
+                    return done;
+            }
+            boost::thread::sleep(delay(0, 500));
+        }
     }
 
 private: