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

Subject: [Boost-commit] svn:boost r77655 - trunk/boost/thread
From: vicente.botet_at_[hidden]
Date: 2012-03-30 15:16:52

Author: viboes
Date: 2012-03-30 15:16:51 EDT (Fri, 30 Mar 2012)
New Revision: 77655
URL: http://svn.boost.org/trac/boost/changeset/77655

Log:
Thread: Fix warning + added DEPRECATED tag
Text files modified: 
   trunk/boost/thread/future.hpp |    10 ++++++----                              
   1 files changed, 6 insertions(+), 4 deletions(-)

Modified: trunk/boost/thread/future.hpp
==============================================================================
--- trunk/boost/thread/future.hpp	(original)
+++ trunk/boost/thread/future.hpp	2012-03-30 15:16:51 EDT (Fri, 30 Mar 2012)
@@ -492,7 +492,7 @@
                 return static_cast<shared_future_get_result_type>(*result);
             }
 
-            future_state::state get_state()
+            future_state::state get_state() // DEPRECATED V2
             {
                 boost::lock_guard<boost::mutex> guard(mutex);
                 if(!done)
@@ -538,7 +538,7 @@
             {
                 wait();
             }
-            future_state::state get_state()
+            future_state::state get_state() // DEPRECATED V2
             {
                 boost::lock_guard<boost::mutex> guard(mutex);
                 if(!done)
@@ -910,7 +910,7 @@
         }
 
         // functions to check state, and wait for ready
-        state get_state() const BOOST_NOEXCEPT
+        state get_state() const BOOST_NOEXCEPT // DEPRECATED V2
         {
             if(!future_)
             {
@@ -1145,7 +1145,7 @@
         }
 
         // functions to check state, and wait for ready
-        state get_state() const  BOOST_NOEXCEPT
+        state get_state() const  BOOST_NOEXCEPT // DEPRECATED V2
         {
             if(!future_)
             {
@@ -1904,6 +1904,8 @@
             {
                 boost::throw_exception(future_already_retrieved());
             }
+            return BOOST_THREAD_FUTURE<R>();
+
         }