Changes between Initial Version and Version 1 of Ticket #8596, comment 2


Ignore:
Timestamp:
May 20, 2013, 2:24:15 PM (9 years ago)
Author:
viboes

Legend:

Unmodified
Added
Removed
Modified

  • Ticket #8596, comment 2

    initial v1  
    88
    99{{{
    10 svn diff future.hpp
     10 svn diff future.hpp detail/config.hpp
    1111Index: future.hpp
    1212===================================================================
    … …  
    2424   #if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
    2525             typedef detail::task_object<FR,R(ArgTypes...)> task_object_type;
    26 @@ -2852,7 +2852,7 @@
    27  #else
    28              typedef detail::task_object<FR,R> task_object_type;
     26@@ -2923,8 +2923,8 @@
     27         template <class F, class Allocator>
     28         packaged_task(boost::allocator_arg_t, Allocator a, BOOST_THREAD_RV_REF(F) f)
     29         {
     30-          //typedef typename remove_cv<typename remove_reference<F>::type>::type FR;
     31-          typedef F FR;
     32+          typedef typename remove_cv<typename remove_reference<F>::type>::type FR;
     33+          //typedef F FR;
     34 #if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK
     35   #if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
     36           typedef detail::task_object<FR,R(ArgTypes...)> task_object_type;
     37Index: detail/config.hpp
     38===================================================================
     39--- detail/config.hpp   (revision 84336)
     40+++ detail/config.hpp   (working copy)
     41@@ -95,7 +95,7 @@
    2942 #endif
    30 -            task = task_ptr(new task_object_type(boost::forward<F>(f)));
    31 +            task = task_ptr(new task_object_type(boost::forward<FR>(f)));
    32              future_obtained = false;
    3343 
    34          }
     44 /// RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR
     45-#if defined BOOST_NO_CXX11_RVALUE_REFERENCES || defined BOOST_MSVC
     46+#if defined BOOST_NO_CXX11_RVALUE_REFERENCES || defined BOOST_MSVC || (defined __GNUC__ && ! defined __clang__)
     47 #define BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR
     48 #endif
    3549
    3650}}}