diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-10-06 10:33:54 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-10-06 10:36:09 +0900 |
| commit | d9ec475d945d3035377a0d89ed42e382d8988891 (patch) | |
| tree | 34aff2cee4b209906243ab5499d61f3edee2982f /boost/thread/detail/thread.hpp | |
| parent | 71d216b90256936a9638f325af9bc69d720e75de (diff) | |
| download | boost-d9ec475d945d3035377a0d89ed42e382d8988891.tar.gz boost-d9ec475d945d3035377a0d89ed42e382d8988891.tar.bz2 boost-d9ec475d945d3035377a0d89ed42e382d8988891.zip | |
Imported Upstream version 1.60.0
Change-Id: Ie709530d6d5841088ceaba025cbe175a4ef43050
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'boost/thread/detail/thread.hpp')
| -rw-r--r-- | boost/thread/detail/thread.hpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/boost/thread/detail/thread.hpp b/boost/thread/detail/thread.hpp index b80eacfa1b..9e7e8b8f5e 100644 --- a/boost/thread/detail/thread.hpp +++ b/boost/thread/detail/thread.hpp @@ -72,7 +72,7 @@ namespace boost void run2(tuple_indices<Indices...>) { - invoke(std::move(std::get<0>(fp)), std::move(std::get<Indices>(fp))...); + detail::invoke(std::move(std::get<0>(fp)), std::move(std::get<Indices>(fp))...); } void run() { @@ -173,7 +173,6 @@ namespace boost private: bool start_thread_noexcept(); bool start_thread_noexcept(const attributes& attr); - //public: void start_thread() { if (!start_thread_noexcept()) @@ -355,6 +354,8 @@ namespace boost #if defined BOOST_THREAD_PROVIDES_THREAD_MOVE_ASSIGN_CALLS_TERMINATE_IF_JOINABLE if (joinable()) std::terminate(); +#else + detach(); #endif thread_info=BOOST_THREAD_RV(other).thread_info; BOOST_THREAD_RV(other).thread_info.reset(); @@ -485,9 +486,9 @@ namespace boost bool try_join_until(const chrono::time_point<Clock, Duration>& t) { using namespace chrono; - system_clock::time_point s_now = system_clock::now(); bool joined= false; do { + system_clock::time_point s_now = system_clock::now(); typename Clock::duration d = ceil<nanoseconds>(t-Clock::now()); if (d <= Clock::duration::zero()) return false; // in case the Clock::time_point t is already reached joined = try_join_until(s_now + d); |