boost/thread
2
0
Fork 0
mirror of https://github.com/boostorg/thread.git synced 2026-01-27 07:22:11 +00:00
Code Issues Projects Releases Wiki Activity

Thread: try to fix issue with double definition of shared_state_base.

Browse Source 
[SVN r86162]
This commit is contained in:
Vicente J. Botet Escriba
2013-10-04 20:07:03 +00:00
parent 63d9ae2b29
commit 67afa35c49
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/thread/future.hpp
View File

@@ -201,12 +201,8 @@ namespace boost
struct shared_state_base : enable_shared_from_this<shared_state_base>
{
typedef std::list<boost::condition_variable_any*> waiter_list;
#if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION
// This type should be only included conditionally if interruptions are allowed, but is included to maintain the same layout.
typedef shared_ptr<shared_state_base> continuation_ptr_type;
#else
// This type shouldn't be included, but is included to maintain the same layout.
typedef shared_ptr<void> continuation_ptr_type;
#endif
boost::exception_ptr exception;
bool done;
@@ -217,7 +213,7 @@ namespace boost
boost::condition_variable waiters;
waiter_list external_waiters;
boost::function<void()> callback;
// This declaration should be only included conditionally, but is included to maintain the same layout.
// This declaration should be only included conditionally if interruptions are allowed, but is included to maintain the same layout.
bool thread_was_interrupted;
// This declaration should be only included conditionally, but is included to maintain the same layout.
continuation_ptr_type continuation_ptr;