From 67afa35c4978ace4645d032e21854678a012c9a2 Mon Sep 17 00:00:00 2001 From: "Vicente J. Botet Escriba" Date: Fri, 4 Oct 2013 20:07:03 +0000 Subject: [PATCH] Thread: try to fix issue with double definition of shared_state_base. [SVN r86162] --- include/boost/thread/future.hpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/include/boost/thread/future.hpp b/include/boost/thread/future.hpp index 8b131599..2e0f5f2d 100644 --- a/include/boost/thread/future.hpp +++ b/include/boost/thread/future.hpp @@ -201,12 +201,8 @@ namespace boost struct shared_state_base : enable_shared_from_this { typedef std::list 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 continuation_ptr_type; -#else - // This type shouldn't be included, but is included to maintain the same layout. - typedef shared_ptr 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 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;