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

Subject: [Boost-commit] svn:boost r84520 - trunk/boost/thread
From: vicente.botet_at_[hidden]
Date: 2013-05-26 17:26:25

Author: viboes
Date: 2013-05-26 17:26:25 EDT (Sun, 26 May 2013)
New Revision: 84520
URL: http://svn.boost.org/trac/boost/changeset/84520

Log:
Thread: fix copy_exception ambiguity.
Text files modified: 
   trunk/boost/thread/future.hpp |     4 +++-                                    
   1 files changed, 3 insertions(+), 1 deletions(-)

Modified: trunk/boost/thread/future.hpp
==============================================================================
--- trunk/boost/thread/future.hpp	(original)
+++ trunk/boost/thread/future.hpp	2013-05-26 17:26:25 EDT (Sun, 26 May 2013)
@@ -1466,6 +1466,7 @@
     public:
         BOOST_THREAD_MOVABLE_ONLY(BOOST_THREAD_FUTURE)
         typedef future_state::state state;
+        typedef R value_type;
 
         BOOST_CONSTEXPR BOOST_THREAD_FUTURE() {}
 
@@ -1564,6 +1565,7 @@
 
     public:
         BOOST_THREAD_MOVABLE(shared_future)
+        typedef R value_type;
 
         shared_future(shared_future const& other):
         base_type(other)
@@ -3327,7 +3329,7 @@
   BOOST_THREAD_FUTURE<T> make_ready_future(E ex)
   {
     promise<T> p;
-    p.set_exception(copy_exception(ex));
+    p.set_exception(boost::copy_exception(ex));
     return BOOST_THREAD_MAKE_RV_REF(p.get_future());
   }