[Boost-commit] svn:boost r80783 - in trunk: boost/thread boost/thread/detail libs/thread/test/sync/futures/packaged_task

Subject: [Boost-commit] svn:boost r80783 - in trunk: boost/thread boost/thread/detail libs/thread/test/sync/futures/packaged_task
From: vicente.botet_at_[hidden]
Date: 2012-09-30 10:31:52

Author: viboes
Date: 2012-09-30 10:31:52 EDT (Sun, 30 Sep 2012)
New Revision: 80783
URL: http://svn.boost.org/trac/boost/changeset/80783

Log:
Thread: try to fix some issues with packaged_task with signature parameters
Text files modified: 
   trunk/boost/thread/detail/config.hpp                                |     1 +                                       
   trunk/boost/thread/future.hpp                                       |     8 ++++----                                
   trunk/libs/thread/test/sync/futures/packaged_task/dtor_pass.cpp     |     2 +-                                      
   trunk/libs/thread/test/sync/futures/packaged_task/operator_pass.cpp |     2 +-                                      
   4 files changed, 7 insertions(+), 6 deletions(-)

Modified: trunk/boost/thread/detail/config.hpp
==============================================================================
--- trunk/boost/thread/detail/config.hpp	(original)
+++ trunk/boost/thread/detail/config.hpp	2012-09-30 10:31:52 EDT (Sun, 30 Sep 2012)
@@ -132,6 +132,7 @@
  && ! defined BOOST_THREAD_DONT_PROVIDE_VARIADIC_THREAD
 
 #if ! defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && \
+    ! defined(BOOST_NO_CXX11_DECLTYPE) && \
     ! defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && \
     ! defined(BOOST_NO_CXX11_HDR_TUPLE) && \
     defined(BOOST_THREAD_PLATFORM_PTHREAD)

Modified: trunk/boost/thread/future.hpp
==============================================================================
--- trunk/boost/thread/future.hpp	(original)
+++ trunk/boost/thread/future.hpp	2012-09-30 10:31:52 EDT (Sun, 30 Sep 2012)
@@ -1981,7 +1981,7 @@
 
 
 #if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK
-  #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+  #if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
         template <class R, class... ArgTypes>
         BOOST_THREAD_FUTURE<R>
         async(launch policy, R(*f)(ArgTypes...), BOOST_THREAD_FWD_REF(ArgTypes)... args)
@@ -2033,7 +2033,7 @@
         }
 #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 #if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK
-  #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+  #if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
         template <class F, class ...ArgTypes>
         BOOST_THREAD_FUTURE<typename boost::result_of<typename decay<F>::type()>::type>
         async(launch policy, BOOST_THREAD_FWD_REF(F) f, BOOST_THREAD_FWD_REF(ArgTypes)... args)
@@ -2090,7 +2090,7 @@
 #else
 
 #if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK
-  #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+  #if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
         template <class F, class ...ArgTypes>
         BOOST_THREAD_FUTURE<typename boost::result_of<typename decay<F>::type()>::type>
         async(launch policy, BOOST_THREAD_FWD_REF(F) f, BOOST_THREAD_FWD_REF(ArgTypes)... args)
@@ -2139,7 +2139,7 @@
         }
     }
 #if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK
-  #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+  #if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
         template <class F, class ...ArgTypes>
         BOOST_THREAD_FUTURE<typename boost::result_of<F()>::type>
         async(BOOST_THREAD_FWD_REF(F) f, BOOST_THREAD_FWD_REF(ArgTypes)... args )

Modified: trunk/libs/thread/test/sync/futures/packaged_task/dtor_pass.cpp
==============================================================================
--- trunk/libs/thread/test/sync/futures/packaged_task/dtor_pass.cpp	(original)
+++ trunk/libs/thread/test/sync/futures/packaged_task/dtor_pass.cpp	2012-09-30 10:31:52 EDT (Sun, 30 Sep 2012)
@@ -33,7 +33,7 @@
 #endif
 
 #if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK
-#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+#if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
 #define BOOST_THREAD_DETAIL_SIGNATURE_2 double(int, char)
 #define BOOST_THREAD_DETAIL_SIGNATURE_2_RES 5 + 3 +'a'
 #else

Modified: trunk/libs/thread/test/sync/futures/packaged_task/operator_pass.cpp
==============================================================================
--- trunk/libs/thread/test/sync/futures/packaged_task/operator_pass.cpp	(original)
+++ trunk/libs/thread/test/sync/futures/packaged_task/operator_pass.cpp	2012-09-30 10:31:52 EDT (Sun, 30 Sep 2012)
@@ -31,7 +31,7 @@
 #endif
 
 #if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK
-#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+#if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
 #define BOOST_THREAD_DETAIL_SIGNATURE_2 double(int, char)
 #define BOOST_THREAD_DETAIL_SIGNATURE_2_RES 5 + 3 +'a'
 #else