Mercurial > hg > vamp-build-and-test
diff DEPENDENCIES/generic/include/boost/thread/detail/thread_group.hpp @ 101:c530137014c0
Update Boost headers (1.58.0)
| author | Chris Cannam |
|---|---|
| date | Mon, 07 Sep 2015 11:12:49 +0100 |
| parents | 2665513ce2d3 |
| children |
line wrap: on
line diff
--- a/DEPENDENCIES/generic/include/boost/thread/detail/thread_group.hpp Fri Sep 04 12:01:02 2015 +0100 +++ b/DEPENDENCIES/generic/include/boost/thread/detail/thread_group.hpp Mon Sep 07 11:12:49 2015 +0100 @@ -85,7 +85,7 @@ if(thrd) { BOOST_THREAD_ASSERT_PRECONDITION( ! is_thread_in(thrd) , - thread_resource_error(system::errc::resource_deadlock_would_occur, "boost::thread_group: trying to add a duplicated thread") + thread_resource_error(static_cast<int>(system::errc::resource_deadlock_would_occur), "boost::thread_group: trying to add a duplicated thread") ); boost::lock_guard<shared_mutex> guard(m); @@ -106,7 +106,7 @@ void join_all() { BOOST_THREAD_ASSERT_PRECONDITION( ! is_this_thread_in() , - thread_resource_error(system::errc::resource_deadlock_would_occur, "boost::thread_group: trying joining itself") + thread_resource_error(static_cast<int>(system::errc::resource_deadlock_would_occur), "boost::thread_group: trying joining itself") ); boost::shared_lock<shared_mutex> guard(m);