[Boost-commit] svn:boost r83678 - in trunk/libs/thread: example test/sync/futures/future

Subject: [Boost-commit] svn:boost r83678 - in trunk/libs/thread: example test/sync/futures/future
From: vicente.botet_at_[hidden]
Date: 2013-04-01 13:47:18

Author: viboes
Date: 2013-04-01 13:47:17 EDT (Mon, 01 Apr 2013)
New Revision: 83678
URL: http://svn.boost.org/trac/boost/changeset/83678

Log:
Thread: don't define BOOST_THREAD_DONT_PROVIDE_FUTURE_INVALID_AFTER_GET on future::then tests.
Text files modified: 
   trunk/libs/thread/example/future_then.cpp                |     5 ++---                                   
   trunk/libs/thread/test/sync/futures/future/then_pass.cpp |     4 +---                                    
   2 files changed, 3 insertions(+), 6 deletions(-)

Modified: trunk/libs/thread/example/future_then.cpp
==============================================================================
--- trunk/libs/thread/example/future_then.cpp	(original)
+++ trunk/libs/thread/example/future_then.cpp	2013-04-01 13:47:17 EDT (Mon, 01 Apr 2013)
@@ -1,4 +1,4 @@
-// Copyright (C) 2012 Vicente Botet
+// Copyright (C) 2012-2013 Vicente Botet
 //
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -6,7 +6,6 @@
 #define BOOST_THREAD_VERSION 4
 #define BOOST_THREAD_USES_LOG
 #define BOOST_THREAD_USES_LOG_THREAD_ID
-#define BOOST_THREAD_DONT_PROVIDE_FUTURE_INVALID_AFTER_GET
 
 #include <boost/thread/detail/log.hpp>
 #include <boost/thread/future.hpp>
@@ -47,7 +46,7 @@
   {
     boost::future<int> f1 = boost::async(boost::launch::async, &p1);
     boost::future<int> f2 = f1.then(&p2);
-    int i = f2.get();
+    (void)f2.get();
   }
   catch (std::exception& ex)
   {

Modified: trunk/libs/thread/test/sync/futures/future/then_pass.cpp
==============================================================================
--- trunk/libs/thread/test/sync/futures/future/then_pass.cpp	(original)
+++ trunk/libs/thread/test/sync/futures/future/then_pass.cpp	2013-04-01 13:47:17 EDT (Mon, 01 Apr 2013)
@@ -1,4 +1,4 @@
-// Copyright (C) 2011 Vicente J. Botet Escriba
+// Copyright (C) 2012-2013 Vicente Botet
 //
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -11,8 +11,6 @@
 // auto then(F&& func) -> future<decltype(func(*this))>;
 
 #define BOOST_THREAD_VERSION 4
-#define BOOST_THREAD_DONT_PROVIDE_FUTURE_INVALID_AFTER_GET
-//#define BOOST_THREAD_DONT_PROVIDE_THREAD_DESTRUCTOR_CALLS_TERMINATE_IF_JOINABLE
 #define BOOST_THREAD_USES_LOG
 #define BOOST_THREAD_USES_LOG_THREAD_ID
 #include <boost/thread/detail/log.hpp>