Subject: [Boost-commit] svn:boost r83548 - in trunk/libs/thread/test: . sync/futures/future threads/this_thread/get_id threads/this_thread/sleep_for threads/this_thread/sleep_until threads/thread/assign threads/thread/constr threads/thread/destr threads/thread/id threads/thread/members threads/thread/non_members threads/thread/static
From: vicente.botet_at_[hidden]
Date: 2013-03-24 14:31:02
Author: viboes
Date: 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
New Revision: 83548
URL: http://svn.boost.org/trac/boost/changeset/83548
Log:
Thread: avoid the use of boost/thread/thread.hpp to limit dependencies.
Text files modified:
trunk/libs/thread/test/sync/futures/future/then_pass.cpp | 2 +-
trunk/libs/thread/test/test_2741.cpp | 2 +-
trunk/libs/thread/test/test_3837.cpp | 1 +
trunk/libs/thread/test/test_4521.cpp | 3 ++-
trunk/libs/thread/test/test_4882.cpp | 2 +-
trunk/libs/thread/test/test_5351.cpp | 2 +-
trunk/libs/thread/test/test_5502.cpp | 2 +-
trunk/libs/thread/test/test_5542_1.cpp | 2 +-
trunk/libs/thread/test/test_5542_2.cpp | 2 +-
trunk/libs/thread/test/test_5542_3.cpp | 2 +-
trunk/libs/thread/test/test_5891.cpp | 2 +-
trunk/libs/thread/test/test_6130.cpp | 2 +-
trunk/libs/thread/test/test_6174.cpp | 3 ++-
trunk/libs/thread/test/test_7160.cpp | 2 +-
trunk/libs/thread/test/test_7328.cpp | 2 +-
trunk/libs/thread/test/test_7571.cpp | 2 +-
trunk/libs/thread/test/test_7665.cpp | 2 +-
trunk/libs/thread/test/test_7666.cpp | 2 +-
trunk/libs/thread/test/test_7720.cpp | 2 +-
trunk/libs/thread/test/test_7755.cpp | 2 +-
trunk/libs/thread/test/test_condition.cpp | 2 +-
trunk/libs/thread/test/test_condition_notify_all.cpp | 2 +-
trunk/libs/thread/test/test_condition_notify_one.cpp | 2 +-
trunk/libs/thread/test/test_condition_timed_wait_times_out.cpp | 2 +-
trunk/libs/thread/test/test_futures.cpp | 2 +-
trunk/libs/thread/test/test_generic_locks.cpp | 2 +-
trunk/libs/thread/test/test_hardware_concurrency.cpp | 2 +-
trunk/libs/thread/test/test_lock_concept.cpp | 17 +++++++++++++++--
trunk/libs/thread/test/test_move_function.cpp | 2 +-
trunk/libs/thread/test/test_mutex.cpp | 2 +-
trunk/libs/thread/test/test_shared_mutex.cpp | 5 +++++
trunk/libs/thread/test/test_shared_mutex_part_2.cpp | 2 +-
trunk/libs/thread/test/test_shared_mutex_timed_locks.cpp | 2 +-
trunk/libs/thread/test/test_thread.cpp | 2 +-
trunk/libs/thread/test/test_thread_exit.cpp | 2 +-
trunk/libs/thread/test/test_thread_id.cpp | 2 +-
trunk/libs/thread/test/test_thread_launching.cpp | 2 +-
trunk/libs/thread/test/test_thread_mf.cpp | 2 +-
trunk/libs/thread/test/test_thread_move.cpp | 2 +-
trunk/libs/thread/test/test_thread_move_return.cpp | 2 +-
trunk/libs/thread/test/test_thread_return_local.cpp | 2 +-
trunk/libs/thread/test/threads/this_thread/get_id/get_id_pass.cpp | 2 +-
trunk/libs/thread/test/threads/this_thread/sleep_for/sleep_for_pass.cpp | 2 +-
trunk/libs/thread/test/threads/this_thread/sleep_until/sleep_until_pass.cpp | 2 +-
trunk/libs/thread/test/threads/thread/assign/copy_fail.cpp | 2 +-
trunk/libs/thread/test/threads/thread/assign/move_pass.cpp | 2 +-
trunk/libs/thread/test/threads/thread/constr/FArgs_pass.cpp | 2 +-
trunk/libs/thread/test/threads/thread/constr/F_pass.cpp | 2 +-
trunk/libs/thread/test/threads/thread/constr/FrvalueArgs_pass.cpp | 2 +-
trunk/libs/thread/test/threads/thread/constr/Frvalue_pass.cpp | 2 +-
trunk/libs/thread/test/threads/thread/constr/copy_fail.cpp | 2 +-
trunk/libs/thread/test/threads/thread/constr/default_pass.cpp | 2 +-
trunk/libs/thread/test/threads/thread/constr/move_pass.cpp | 2 +-
trunk/libs/thread/test/threads/thread/destr/dtor_pass.cpp | 2 +-
trunk/libs/thread/test/threads/thread/id/hash_pass.cpp | 2 +-
trunk/libs/thread/test/threads/thread/members/detach_pass.cpp | 2 +-
trunk/libs/thread/test/threads/thread/members/get_id_pass.cpp | 2 +-
trunk/libs/thread/test/threads/thread/members/join_pass.cpp | 2 +-
trunk/libs/thread/test/threads/thread/members/joinable_pass.cpp | 2 +-
trunk/libs/thread/test/threads/thread/members/native_handle_pass.cpp | 4 ++--
trunk/libs/thread/test/threads/thread/members/swap_pass.cpp | 2 +-
trunk/libs/thread/test/threads/thread/members/try_join_for_pass.cpp | 2 +-
trunk/libs/thread/test/threads/thread/members/try_join_until_pass.cpp | 2 +-
trunk/libs/thread/test/threads/thread/non_members/swap_pass.cpp | 2 +-
trunk/libs/thread/test/threads/thread/static/hardware_concurrency_pass.cpp | 2 +-
65 files changed, 86 insertions(+), 65 deletions(-)
Modified: trunk/libs/thread/test/sync/futures/future/then_pass.cpp
==============================================================================
--- trunk/libs/thread/test/sync/futures/future/then_pass.cpp (original)
+++ trunk/libs/thread/test/sync/futures/future/then_pass.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -12,7 +12,7 @@
#define BOOST_THREAD_VERSION 4
#define BOOST_THREAD_DONT_PROVIDE_FUTURE_INVALID_AFTER_GET
-//#define BOOST_THREAD_USES_LOG
+#define BOOST_THREAD_USES_LOG
#define BOOST_THREAD_USES_LOG_THREAD_ID
#include <boost/thread/detail/log.hpp>
Modified: trunk/libs/thread/test/test_2741.cpp
==============================================================================
--- trunk/libs/thread/test/test_2741.cpp (original)
+++ trunk/libs/thread/test/test_2741.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -7,7 +7,7 @@
#include <boost/thread/detail/config.hpp>
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/thread/xtime.hpp>
#include <boost/bind.hpp>
#include <boost/ref.hpp>
Modified: trunk/libs/thread/test/test_3837.cpp
==============================================================================
--- trunk/libs/thread/test/test_3837.cpp (original)
+++ trunk/libs/thread/test/test_3837.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -5,6 +5,7 @@
#include <iostream>
#include <boost/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/optional.hpp>
#include <boost/detail/lightweight_test.hpp>
Modified: trunk/libs/thread/test/test_4521.cpp
==============================================================================
--- trunk/libs/thread/test/test_4521.cpp (original)
+++ trunk/libs/thread/test/test_4521.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -5,7 +5,8 @@
#define BOOST_THREAD_VERSION 2
-#include <boost/thread.hpp>
+#include <boost/thread/thread_only.hpp>
+#include <boost/thread/future.hpp>
int calculate_the_answer_to_life_the_universe_and_everything()
{
Modified: trunk/libs/thread/test/test_4882.cpp
==============================================================================
--- trunk/libs/thread/test/test_4882.cpp (original)
+++ trunk/libs/thread/test/test_4882.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -7,7 +7,7 @@
//#define BOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN
//#define BOOST_THREAD_USES_LOG
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/thread/shared_mutex.hpp>
#include <boost/detail/no_exceptions_support.hpp>
//#include <boost/thread/detail/log.hpp>
Modified: trunk/libs/thread/test/test_5351.cpp
==============================================================================
--- trunk/libs/thread/test/test_5351.cpp (original)
+++ trunk/libs/thread/test/test_5351.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -6,7 +6,7 @@
#define BOOST_THREAD_PROVIDES_INTERRUPTIONS
#include <iostream>
-#include <boost/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/date_time/posix_time/posix_time_types.hpp>
#include <boost/thread/future.hpp>
Modified: trunk/libs/thread/test/test_5502.cpp
==============================================================================
--- trunk/libs/thread/test/test_5502.cpp (original)
+++ trunk/libs/thread/test/test_5502.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -12,7 +12,7 @@
int XXX = 20;
int YYY = 10;
-#include <boost/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/thread/shared_mutex.hpp>
//#include <unistd.h>
Modified: trunk/libs/thread/test/test_5542_1.cpp
==============================================================================
--- trunk/libs/thread/test/test_5542_1.cpp (original)
+++ trunk/libs/thread/test/test_5542_1.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -6,7 +6,7 @@
#define BOOST_THREAD_VERSION 2
#include <iostream>
-#include <boost/thread.hpp>
+#include <boost/thread/thread_only.hpp>
class Worker
{
Modified: trunk/libs/thread/test/test_5542_2.cpp
==============================================================================
--- trunk/libs/thread/test/test_5542_2.cpp (original)
+++ trunk/libs/thread/test/test_5542_2.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -5,7 +5,7 @@
#define BOOST_THREAD_VERSION 2
-#include <boost/thread.hpp>
+#include <boost/thread/thread_only.hpp>
void run_thread() {
return;
Modified: trunk/libs/thread/test/test_5542_3.cpp
==============================================================================
--- trunk/libs/thread/test/test_5542_3.cpp (original)
+++ trunk/libs/thread/test/test_5542_3.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -6,7 +6,7 @@
#define BOOST_THREAD_VERSION 2
#include <iostream>
-#include <boost/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/date_time.hpp>
void workerFunc()
Modified: trunk/libs/thread/test/test_5891.cpp
==============================================================================
--- trunk/libs/thread/test/test_5891.cpp (original)
+++ trunk/libs/thread/test/test_5891.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -6,7 +6,7 @@
#define BOOST_THREAD_VERSION 2
#include <iostream>
-#include <boost/thread.hpp>
+#include <boost/thread/thread_only.hpp>
using namespace std;
using namespace boost;
Modified: trunk/libs/thread/test/test_6130.cpp
==============================================================================
--- trunk/libs/thread/test/test_6130.cpp (original)
+++ trunk/libs/thread/test/test_6130.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -5,7 +5,7 @@
#define BOOST_THREAD_VERSION 2
-#include <boost/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/date_time/posix_time/posix_time_io.hpp>
#include <assert.h>
#include <iostream>
Modified: trunk/libs/thread/test/test_6174.cpp
==============================================================================
--- trunk/libs/thread/test/test_6174.cpp (original)
+++ trunk/libs/thread/test/test_6174.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -6,7 +6,8 @@
#define BOOST_THREAD_VERSION 3
-#include <boost/thread.hpp>
+#include <boost/thread/thread_only.hpp>
+#include <boost/thread/future.hpp>
#include <boost/config.hpp>
#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
Modified: trunk/libs/thread/test/test_7160.cpp
==============================================================================
--- trunk/libs/thread/test/test_7160.cpp (original)
+++ trunk/libs/thread/test/test_7160.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -6,7 +6,7 @@
#define BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG
#include <iostream>
-#include <boost/thread.hpp>
+#include <boost/thread/thread_only.hpp>
class ThreadClass
{
Modified: trunk/libs/thread/test/test_7328.cpp
==============================================================================
--- trunk/libs/thread/test/test_7328.cpp (original)
+++ trunk/libs/thread/test/test_7328.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -6,7 +6,7 @@
#define BOOST_THREAD_PROVIDES_INTERRUPTIONS
#include <iostream>
-#include <boost/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/detail/lightweight_test.hpp>
#if defined BOOST_THREAD_USES_CHRONO
Modified: trunk/libs/thread/test/test_7571.cpp
==============================================================================
--- trunk/libs/thread/test/test_7571.cpp (original)
+++ trunk/libs/thread/test/test_7571.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -7,7 +7,7 @@
#include <boost/date_time.hpp>
#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <iostream>
// Number should be big enough to allow context switch between threads, otherwise the bug doesn't show.
Modified: trunk/libs/thread/test/test_7665.cpp
==============================================================================
--- trunk/libs/thread/test/test_7665.cpp (original)
+++ trunk/libs/thread/test/test_7665.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -7,7 +7,7 @@
#define BOOST_THREAD_USES_LOG
#include <iostream>
-#include <boost/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/thread/detail/log.hpp>
void thread()
Modified: trunk/libs/thread/test/test_7666.cpp
==============================================================================
--- trunk/libs/thread/test/test_7666.cpp (original)
+++ trunk/libs/thread/test/test_7666.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -6,7 +6,7 @@
#define BOOST_CHRONO_VERSION 2
#define BOOST_THREAD_VERSION 2
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
void myFunc()
{
Modified: trunk/libs/thread/test/test_7720.cpp
==============================================================================
--- trunk/libs/thread/test/test_7720.cpp (original)
+++ trunk/libs/thread/test/test_7720.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -6,7 +6,7 @@
////////////////////////////////////////////
//#define BOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/thread/shared_mutex.hpp>
using namespace boost;
Modified: trunk/libs/thread/test/test_7755.cpp
==============================================================================
--- trunk/libs/thread/test/test_7755.cpp (original)
+++ trunk/libs/thread/test/test_7755.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -7,7 +7,7 @@
//#define BOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN
#include <iostream>
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/thread/shared_mutex.hpp>
// shared_mutex_deadlock.cpp : Defines the entry point for the console application.
//
Modified: trunk/libs/thread/test/test_condition.cpp
==============================================================================
--- trunk/libs/thread/test/test_condition.cpp (original)
+++ trunk/libs/thread/test/test_condition.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -11,7 +11,7 @@
#include <boost/thread/detail/config.hpp>
#include <boost/thread/condition.hpp>
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/thread/xtime.hpp>
#include <boost/test/unit_test.hpp>
Modified: trunk/libs/thread/test/test_condition_notify_all.cpp
==============================================================================
--- trunk/libs/thread/test/test_condition_notify_all.cpp (original)
+++ trunk/libs/thread/test/test_condition_notify_all.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -7,7 +7,7 @@
#include <boost/thread/detail/config.hpp>
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/test/unit_test.hpp>
Modified: trunk/libs/thread/test/test_condition_notify_one.cpp
==============================================================================
--- trunk/libs/thread/test/test_condition_notify_one.cpp (original)
+++ trunk/libs/thread/test/test_condition_notify_one.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -7,7 +7,7 @@
#include <boost/thread/detail/config.hpp>
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/test/unit_test.hpp>
Modified: trunk/libs/thread/test/test_condition_timed_wait_times_out.cpp
==============================================================================
--- trunk/libs/thread/test/test_condition_timed_wait_times_out.cpp (original)
+++ trunk/libs/thread/test/test_condition_timed_wait_times_out.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -8,7 +8,7 @@
#include <boost/thread/detail/config.hpp>
#include <boost/thread/condition.hpp>
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/test/unit_test.hpp>
#include "./util.inl"
Modified: trunk/libs/thread/test/test_futures.cpp
==============================================================================
--- trunk/libs/thread/test/test_futures.cpp (original)
+++ trunk/libs/thread/test/test_futures.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -6,7 +6,7 @@
#define BOOST_THREAD_VERSION 2
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/thread/condition.hpp>
#include <boost/thread/future.hpp>
Modified: trunk/libs/thread/test/test_generic_locks.cpp
==============================================================================
--- trunk/libs/thread/test/test_generic_locks.cpp (original)
+++ trunk/libs/thread/test/test_generic_locks.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -7,7 +7,7 @@
#include <boost/test/unit_test.hpp>
#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/thread/locks.hpp>
#include <boost/thread/condition_variable.hpp>
Modified: trunk/libs/thread/test/test_hardware_concurrency.cpp
==============================================================================
--- trunk/libs/thread/test/test_hardware_concurrency.cpp (original)
+++ trunk/libs/thread/test/test_hardware_concurrency.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -2,7 +2,7 @@
//
// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/test/unit_test.hpp>
#include <boost/thread/mutex.hpp>
Modified: trunk/libs/thread/test/test_lock_concept.cpp
==============================================================================
--- trunk/libs/thread/test/test_lock_concept.cpp (original)
+++ trunk/libs/thread/test/test_lock_concept.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -10,7 +10,7 @@
#include <boost/thread/mutex.hpp>
#include <boost/thread/lock_types.hpp>
#include <boost/thread/shared_mutex.hpp>
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/thread/recursive_mutex.hpp>
#include <boost/thread/condition_variable.hpp>
@@ -227,6 +227,19 @@
BOOST_CHECK(lock.owns_lock());
}
};
+template<typename Mutex,typename Lock>
+struct test_initially_lock_shared_with_adopt_lock_parameter
+{
+ void operator()() const
+ {
+ Mutex m;
+ m.lock_shared();
+ Lock lock(m,boost::adopt_lock);
+
+ BOOST_CHECK(lock);
+ BOOST_CHECK(lock.owns_lock());
+ }
+};
template<typename Mutex,typename Lock>
@@ -531,7 +544,7 @@
test_initially_unlocked_with_try_lock_if_other_thread_has_unique_lock<Mutex,Lock>()();
test_initially_locked_if_other_thread_has_shared_lock<Mutex,Lock>()();
test_initially_unlocked_with_defer_lock_parameter<Mutex,Lock>()();
- test_initially_locked_with_adopt_lock_parameter<Mutex,Lock>()();
+ test_initially_lock_shared_with_adopt_lock_parameter<Mutex,Lock>()();
test_unlocked_after_unlock_called<Mutex,Lock>()();
test_locked_after_lock_called<Mutex,Lock>()();
test_locked_after_try_lock_called<Mutex,Lock>()();
Modified: trunk/libs/thread/test/test_move_function.cpp
==============================================================================
--- trunk/libs/thread/test/test_move_function.cpp (original)
+++ trunk/libs/thread/test/test_move_function.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -5,7 +5,7 @@
#define BOOST_THREAD_VERSION 2
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/test/unit_test.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/shared_ptr.hpp>
Modified: trunk/libs/thread/test/test_mutex.cpp
==============================================================================
--- trunk/libs/thread/test/test_mutex.cpp (original)
+++ trunk/libs/thread/test/test_mutex.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -10,7 +10,7 @@
#include <boost/thread/mutex.hpp>
#include <boost/thread/lock_types.hpp>
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/thread/recursive_mutex.hpp>
#include <boost/thread/thread_time.hpp>
#include <boost/thread/condition.hpp>
Modified: trunk/libs/thread/test/test_shared_mutex.cpp
==============================================================================
--- trunk/libs/thread/test/test_shared_mutex.cpp (original)
+++ trunk/libs/thread/test/test_shared_mutex.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -20,6 +20,7 @@
void test_multiple_readers()
{
+ std::cout << __LINE__ << std::endl;
unsigned const number_of_threads=10;
boost::thread_group pool;
@@ -67,6 +68,7 @@
void test_only_one_writer_permitted()
{
+ std::cout << __LINE__ << std::endl;
unsigned const number_of_threads=10;
boost::thread_group pool;
@@ -109,6 +111,7 @@
void test_reader_blocks_writer()
{
+ std::cout << __LINE__ << std::endl;
boost::thread_group pool;
boost::shared_mutex rw_mutex;
@@ -155,6 +158,7 @@
void test_unlocking_writer_unblocks_all_readers()
{
+ std::cout << __LINE__ << std::endl;
boost::thread_group pool;
boost::shared_mutex rw_mutex;
@@ -206,6 +210,7 @@
void test_unlocking_last_reader_only_unblocks_one_writer()
{
+ std::cout << __LINE__ << std::endl;
boost::thread_group pool;
boost::shared_mutex rw_mutex;
Modified: trunk/libs/thread/test/test_shared_mutex_part_2.cpp
==============================================================================
--- trunk/libs/thread/test/test_shared_mutex_part_2.cpp (original)
+++ trunk/libs/thread/test/test_shared_mutex_part_2.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -51,7 +51,7 @@
void test_only_one_upgrade_lock_permitted()
{
- unsigned const number_of_threads=10;
+ unsigned const number_of_threads=2;
boost::thread_group pool;
Modified: trunk/libs/thread/test/test_shared_mutex_timed_locks.cpp
==============================================================================
--- trunk/libs/thread/test/test_shared_mutex_timed_locks.cpp (original)
+++ trunk/libs/thread/test/test_shared_mutex_timed_locks.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -6,7 +6,7 @@
#define BOOST_THREAD_VERSION 2
#include <boost/test/unit_test.hpp>
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/thread/xtime.hpp>
#include "./util.inl"
#include "./shared_mutex_locking_thread.hpp"
Modified: trunk/libs/thread/test/test_thread.cpp
==============================================================================
--- trunk/libs/thread/test/test_thread.cpp (original)
+++ trunk/libs/thread/test/test_thread.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -10,7 +10,7 @@
#include <boost/thread/detail/config.hpp>
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/thread/xtime.hpp>
#include <boost/bind.hpp>
#include <boost/ref.hpp>
Modified: trunk/libs/thread/test/test_thread_exit.cpp
==============================================================================
--- trunk/libs/thread/test/test_thread_exit.cpp (original)
+++ trunk/libs/thread/test/test_thread_exit.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -4,7 +4,7 @@
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/thread/condition.hpp>
#include <boost/thread/future.hpp>
Modified: trunk/libs/thread/test/test_thread_id.cpp
==============================================================================
--- trunk/libs/thread/test/test_thread_id.cpp (original)
+++ trunk/libs/thread/test/test_thread_id.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -2,7 +2,7 @@
//
// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/test/unit_test.hpp>
#include <boost/bind.hpp>
Modified: trunk/libs/thread/test/test_thread_launching.cpp
==============================================================================
--- trunk/libs/thread/test/test_thread_launching.cpp (original)
+++ trunk/libs/thread/test/test_thread_launching.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -5,7 +5,7 @@
#define BOOST_THREAD_VERSION 3
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/test/unit_test.hpp>
#include <boost/ref.hpp>
#include <boost/utility.hpp>
Modified: trunk/libs/thread/test/test_thread_mf.cpp
==============================================================================
--- trunk/libs/thread/test/test_thread_mf.cpp (original)
+++ trunk/libs/thread/test/test_thread_mf.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -7,7 +7,7 @@
//
#define BOOST_THREAD_VERSION 3
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/detail/lightweight_test.hpp>
struct X
Modified: trunk/libs/thread/test/test_thread_move.cpp
==============================================================================
--- trunk/libs/thread/test/test_thread_move.cpp (original)
+++ trunk/libs/thread/test/test_thread_move.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -2,7 +2,7 @@
//
// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/test/unit_test.hpp>
void do_nothing(boost::thread::id* my_id)
Modified: trunk/libs/thread/test/test_thread_move_return.cpp
==============================================================================
--- trunk/libs/thread/test/test_thread_move_return.cpp (original)
+++ trunk/libs/thread/test/test_thread_move_return.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -5,7 +5,7 @@
#define BOOST_THREAD_USES_MOVE
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/test/unit_test.hpp>
void do_nothing(boost::thread::id* my_id)
Modified: trunk/libs/thread/test/test_thread_return_local.cpp
==============================================================================
--- trunk/libs/thread/test/test_thread_return_local.cpp (original)
+++ trunk/libs/thread/test/test_thread_return_local.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -5,7 +5,7 @@
#define BOOST_THREAD_USES_MOVE
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/test/unit_test.hpp>
void do_nothing(boost::thread::id* my_id)
Modified: trunk/libs/thread/test/threads/this_thread/get_id/get_id_pass.cpp
==============================================================================
--- trunk/libs/thread/test/threads/this_thread/get_id/get_id_pass.cpp (original)
+++ trunk/libs/thread/test/threads/this_thread/get_id/get_id_pass.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -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>
Modified: trunk/libs/thread/test/threads/this_thread/sleep_for/sleep_for_pass.cpp
==============================================================================
--- trunk/libs/thread/test/threads/this_thread/sleep_for/sleep_for_pass.cpp (original)
+++ trunk/libs/thread/test/threads/this_thread/sleep_for/sleep_for_pass.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -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>
Modified: trunk/libs/thread/test/threads/this_thread/sleep_until/sleep_until_pass.cpp
==============================================================================
--- trunk/libs/thread/test/threads/this_thread/sleep_until/sleep_until_pass.cpp (original)
+++ trunk/libs/thread/test/threads/this_thread/sleep_until/sleep_until_pass.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -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>
Modified: trunk/libs/thread/test/threads/thread/assign/copy_fail.cpp
==============================================================================
--- trunk/libs/thread/test/threads/thread/assign/copy_fail.cpp (original)
+++ trunk/libs/thread/test/threads/thread/assign/copy_fail.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -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>
Modified: trunk/libs/thread/test/threads/thread/assign/move_pass.cpp
==============================================================================
--- trunk/libs/thread/test/threads/thread/assign/move_pass.cpp (original)
+++ trunk/libs/thread/test/threads/thread/assign/move_pass.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -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>
Modified: trunk/libs/thread/test/threads/thread/constr/FArgs_pass.cpp
==============================================================================
--- trunk/libs/thread/test/threads/thread/constr/FArgs_pass.cpp (original)
+++ trunk/libs/thread/test/threads/thread/constr/FArgs_pass.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -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;
Modified: trunk/libs/thread/test/threads/thread/constr/F_pass.cpp
==============================================================================
--- trunk/libs/thread/test/threads/thread/constr/F_pass.cpp (original)
+++ trunk/libs/thread/test/threads/thread/constr/F_pass.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -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;
Modified: trunk/libs/thread/test/threads/thread/constr/FrvalueArgs_pass.cpp
==============================================================================
--- trunk/libs/thread/test/threads/thread/constr/FrvalueArgs_pass.cpp (original)
+++ trunk/libs/thread/test/threads/thread/constr/FrvalueArgs_pass.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -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>
Modified: trunk/libs/thread/test/threads/thread/constr/Frvalue_pass.cpp
==============================================================================
--- trunk/libs/thread/test/threads/thread/constr/Frvalue_pass.cpp (original)
+++ trunk/libs/thread/test/threads/thread/constr/Frvalue_pass.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -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>
Modified: trunk/libs/thread/test/threads/thread/constr/copy_fail.cpp
==============================================================================
--- trunk/libs/thread/test/threads/thread/constr/copy_fail.cpp (original)
+++ trunk/libs/thread/test/threads/thread/constr/copy_fail.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -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>
Modified: trunk/libs/thread/test/threads/thread/constr/default_pass.cpp
==============================================================================
--- trunk/libs/thread/test/threads/thread/constr/default_pass.cpp (original)
+++ trunk/libs/thread/test/threads/thread/constr/default_pass.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -18,7 +18,7 @@
// thread();
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <cassert>
#include <boost/detail/lightweight_test.hpp>
Modified: trunk/libs/thread/test/threads/thread/constr/move_pass.cpp
==============================================================================
--- trunk/libs/thread/test/threads/thread/constr/move_pass.cpp (original)
+++ trunk/libs/thread/test/threads/thread/constr/move_pass.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -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>
Modified: trunk/libs/thread/test/threads/thread/destr/dtor_pass.cpp
==============================================================================
--- trunk/libs/thread/test/threads/thread/destr/dtor_pass.cpp (original)
+++ trunk/libs/thread/test/threads/thread/destr/dtor_pass.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -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>
Modified: trunk/libs/thread/test/threads/thread/id/hash_pass.cpp
==============================================================================
--- trunk/libs/thread/test/threads/thread/id/hash_pass.cpp (original)
+++ trunk/libs/thread/test/threads/thread/id/hash_pass.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -23,7 +23,7 @@
// };
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <boost/detail/lightweight_test.hpp>
int main()
Modified: trunk/libs/thread/test/threads/thread/members/detach_pass.cpp
==============================================================================
--- trunk/libs/thread/test/threads/thread/members/detach_pass.cpp (original)
+++ trunk/libs/thread/test/threads/thread/members/detach_pass.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -17,7 +17,7 @@
// void detach();
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <new>
#include <cstdlib>
#include <cassert>
Modified: trunk/libs/thread/test/threads/thread/members/get_id_pass.cpp
==============================================================================
--- trunk/libs/thread/test/threads/thread/members/get_id_pass.cpp (original)
+++ trunk/libs/thread/test/threads/thread/members/get_id_pass.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -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>
Modified: trunk/libs/thread/test/threads/thread/members/join_pass.cpp
==============================================================================
--- trunk/libs/thread/test/threads/thread/members/join_pass.cpp (original)
+++ trunk/libs/thread/test/threads/thread/members/join_pass.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -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>
Modified: trunk/libs/thread/test/threads/thread/members/joinable_pass.cpp
==============================================================================
--- trunk/libs/thread/test/threads/thread/members/joinable_pass.cpp (original)
+++ trunk/libs/thread/test/threads/thread/members/joinable_pass.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -17,7 +17,7 @@
// bool joinable() const;
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
#include <new>
#include <cstdlib>
#include <cassert>
Modified: trunk/libs/thread/test/threads/thread/members/native_handle_pass.cpp
==============================================================================
--- trunk/libs/thread/test/threads/thread/members/native_handle_pass.cpp (original)
+++ trunk/libs/thread/test/threads/thread/members/native_handle_pass.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -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 @@
{
{
boost::thread t0( (G()));
- // boost::thread::native_handle_type hdl =
+ // boost::thread::native_handle_type hdl =
(void)t0.native_handle();
t0.join();
}
Modified: trunk/libs/thread/test/threads/thread/members/swap_pass.cpp
==============================================================================
--- trunk/libs/thread/test/threads/thread/members/swap_pass.cpp (original)
+++ trunk/libs/thread/test/threads/thread/members/swap_pass.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -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>
Modified: trunk/libs/thread/test/threads/thread/members/try_join_for_pass.cpp
==============================================================================
--- trunk/libs/thread/test/threads/thread/members/try_join_for_pass.cpp (original)
+++ trunk/libs/thread/test/threads/thread/members/try_join_for_pass.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -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>
Modified: trunk/libs/thread/test/threads/thread/members/try_join_until_pass.cpp
==============================================================================
--- trunk/libs/thread/test/threads/thread/members/try_join_until_pass.cpp (original)
+++ trunk/libs/thread/test/threads/thread/members/try_join_until_pass.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -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>
Modified: trunk/libs/thread/test/threads/thread/non_members/swap_pass.cpp
==============================================================================
--- trunk/libs/thread/test/threads/thread/non_members/swap_pass.cpp (original)
+++ trunk/libs/thread/test/threads/thread/non_members/swap_pass.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -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>
Modified: trunk/libs/thread/test/threads/thread/static/hardware_concurrency_pass.cpp
==============================================================================
--- trunk/libs/thread/test/threads/thread/static/hardware_concurrency_pass.cpp (original)
+++ trunk/libs/thread/test/threads/thread/static/hardware_concurrency_pass.cpp 2013-03-24 14:30:55 EDT (Sun, 24 Mar 2013)
@@ -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()