[Boost-commit] svn:boost r86162 - trunk/boost/thread

Subject: [Boost-commit] svn:boost r86162 - trunk/boost/thread
From: vicente.botet_at_[hidden]
Date: 2013-10-04 16:07:04

Author: viboes
Date: 2013-10-04 16:07:03 EDT (Fri, 04 Oct 2013)
New Revision: 86162
URL: http://svn.boost.org/trac/boost/changeset/86162

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

Text files modified: 
   trunk/boost/thread/future.hpp |     8 ++------                                
   1 files changed, 2 insertions(+), 6 deletions(-)

Modified: trunk/boost/thread/future.hpp
==============================================================================
--- trunk/boost/thread/future.hpp	Fri Oct  4 16:05:26 2013	(r86161)
+++ trunk/boost/thread/future.hpp	2013-10-04 16:07:03 EDT (Fri, 04 Oct 2013)	(r86162)
@@ -201,12 +201,8 @@
         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 @@
             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;