Thread: merge from trunk 1.54. Fix #8027,#8323,#8337.

[SVN r83660]
2026-02-20 15:12:11 +00:00 · 2013-03-31 10:56:43 +00:00
parent b1a674869d
commit 677dbe7688
101 changed files with 2763 additions and 554 deletions
--- a/test/threads/this_thread/get_id/get_id_pass.cpp
+++ b/test/threads/this_thread/get_id/get_id_pass.cpp
@@ -15,7 +15,7 @@

 // thread::id this_thread::get_id();

-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>

 #include <boost/detail/lightweight_test.hpp>

--- a/test/threads/this_thread/sleep_for/sleep_for_pass.cpp
+++ b/test/threads/this_thread/sleep_for/sleep_for_pass.cpp
@@ -15,7 +15,7 @@

 // thread::id this_thread::get_id();

-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include <cstdlib>
 #include <algorithm>

--- a/test/threads/this_thread/sleep_until/sleep_until_pass.cpp
+++ b/test/threads/this_thread/sleep_until/sleep_until_pass.cpp
@@ -15,7 +15,7 @@

 // thread::id this_thread::get_id();

-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include <cstdlib>
 #include <algorithm>

--- a/test/threads/thread/assign/copy_fail.cpp
+++ b/test/threads/thread/assign/copy_fail.cpp
@@ -18,7 +18,7 @@

 // thread& operator=(thread&& t);

-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include <new>
 #include <cstdlib>
 #include <boost/detail/lightweight_test.hpp>
--- a/test/threads/thread/assign/move_pass.cpp
+++ b/test/threads/thread/assign/move_pass.cpp
@@ -20,7 +20,7 @@

 #define BOOST_THREAD_PROVIDES_THREAD_MOVE_ASSIGN_CALLS_TERMINATE_IF_JOINABLE

-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include <new>
 #include <cstdlib>
 #include <cassert>
--- a/test/threads/thread/constr/FArgs_pass.cpp
+++ b/test/threads/thread/constr/FArgs_pass.cpp
@@ -20,7 +20,7 @@
 #include <new>
 #include <cstdlib>
 #include <cassert>
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include <boost/detail/lightweight_test.hpp>

 unsigned throw_one = 0xFFFF;
--- a/test/threads/thread/constr/F_pass.cpp
+++ b/test/threads/thread/constr/F_pass.cpp
@@ -20,7 +20,7 @@
 #include <new>
 #include <cstdlib>
 #include <cassert>
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include <boost/detail/lightweight_test.hpp>

 unsigned throw_one = 0xFFFF;
--- a/test/threads/thread/constr/FrvalueArgs_pass.cpp
+++ b/test/threads/thread/constr/FrvalueArgs_pass.cpp
@@ -19,7 +19,7 @@

 #define BOOST_THREAD_VERSION 4

-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include <new>
 #include <cstdlib>
 #include <cassert>
--- a/test/threads/thread/constr/Frvalue_pass.cpp
+++ b/test/threads/thread/constr/Frvalue_pass.cpp
@@ -19,7 +19,7 @@

 #define BOOST_THREAD_USES_MOVE

-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include <new>
 #include <cstdlib>
 #include <cassert>
--- a/test/threads/thread/constr/copy_fail.cpp
+++ b/test/threads/thread/constr/copy_fail.cpp
@@ -18,7 +18,7 @@

 // thread(const thread&) = delete;

-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include <new>
 #include <cstdlib>
 #include <boost/detail/lightweight_test.hpp>
--- a/test/threads/thread/constr/default_pass.cpp
+++ b/test/threads/thread/constr/default_pass.cpp
@@ -18,7 +18,7 @@

 // thread();

-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include <cassert>
 #include <boost/detail/lightweight_test.hpp>

--- a/test/threads/thread/constr/move_pass.cpp
+++ b/test/threads/thread/constr/move_pass.cpp
@@ -17,7 +17,7 @@

 // thread(thread&& t);

-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include <new>
 #include <cstdlib>
 #include <boost/detail/lightweight_test.hpp>
--- a/test/threads/thread/destr/dtor_pass.cpp
+++ b/test/threads/thread/destr/dtor_pass.cpp
@@ -19,7 +19,7 @@

 #define BOOST_THREAD_PROVIDES_THREAD_DESTRUCTOR_CALLS_TERMINATE_IF_JOINABLE

-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include <new>
 #include <cstdlib>
 #include <boost/detail/lightweight_test.hpp>
--- a/test/threads/thread/id/hash_pass.cpp
+++ b/test/threads/thread/id/hash_pass.cpp
@@ -23,7 +23,7 @@
 // };


-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include <boost/detail/lightweight_test.hpp>

 int main()
--- a/test/threads/thread/members/detach_pass.cpp
+++ b/test/threads/thread/members/detach_pass.cpp
@@ -17,7 +17,7 @@

 // void detach();

-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include <new>
 #include <cstdlib>
 #include <cassert>
--- a/test/threads/thread/members/get_id_pass.cpp
+++ b/test/threads/thread/members/get_id_pass.cpp
@@ -17,7 +17,7 @@

 // id get_id() const;

-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include <new>
 #include <cstdlib>
 #include <cassert>
--- a/test/threads/thread/members/join_pass.cpp
+++ b/test/threads/thread/members/join_pass.cpp
@@ -17,7 +17,7 @@

 // void join();
 #define BOOST_THREAD_VESRION 3
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/locks.hpp>
 #include <new>
--- a/test/threads/thread/members/joinable_pass.cpp
+++ b/test/threads/thread/members/joinable_pass.cpp
@@ -17,7 +17,7 @@

 // bool joinable() const;

-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include <new>
 #include <cstdlib>
 #include <cassert>
--- a/test/threads/thread/members/native_handle_pass.cpp
+++ b/test/threads/thread/members/native_handle_pass.cpp
@@ -17,7 +17,7 @@

 // native_handle_type native_handle();

-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include <new>
 #include <cstdlib>
 #include <cassert>
@@ -61,7 +61,7 @@ int main()
 {
  {
    boost::thread t0( (G()));
-    // boost::thread::native_handle_type hdl = 
+    // boost::thread::native_handle_type hdl =
    (void)t0.native_handle();
    t0.join();
  }
--- a/test/threads/thread/members/swap_pass.cpp
+++ b/test/threads/thread/members/swap_pass.cpp
@@ -17,7 +17,7 @@

 // native_handle_type native_handle();

-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include <cstdlib>
 #include <boost/detail/lightweight_test.hpp>

--- a/test/threads/thread/members/try_join_for_pass.cpp
+++ b/test/threads/thread/members/try_join_for_pass.cpp
@@ -19,7 +19,7 @@
 //        bool try_join_for(const chrono::duration<Rep, Period>& rel_time);

 #define BOOST_THREAD_VESRION 3
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/locks.hpp>
 #include <new>
--- a/test/threads/thread/members/try_join_until_pass.cpp
+++ b/test/threads/thread/members/try_join_until_pass.cpp
@@ -19,7 +19,7 @@
 //        bool try_join_until(const chrono::time_point<Clock, Duration>& t);

 #define BOOST_THREAD_VESRION 3
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/locks.hpp>
 #include <new>
--- a/test/threads/thread/non_members/swap_pass.cpp
+++ b/test/threads/thread/non_members/swap_pass.cpp
@@ -15,7 +15,7 @@

 // void swap(thread& x, thread& y);

-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include <new>
 #include <cstdlib>
 #include <cassert>
--- a/test/threads/thread/static/hardware_concurrency_pass.cpp
+++ b/test/threads/thread/static/hardware_concurrency_pass.cpp
@@ -17,7 +17,7 @@

 // static unsigned hardware_concurrency();

-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include <boost/detail/lightweight_test.hpp>

 int main()