Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r86467 - trunk/libs/thread/example
From: vicente.botet_at_[hidden]
Date: 2013-10-26 18:47:02


Author: viboes
Date: 2013-10-26 18:47:02 EDT (Sat, 26 Oct 2013)
New Revision: 86467
URL: http://svn.boost.org/trac/boost/changeset/86467

Log:
Thread: fix change of BOOST_THREAD_VECTOR to boost::csbl::vector.

Text files modified:
   trunk/libs/thread/example/future_when_all.cpp | 19 ++++++++-----------
   1 files changed, 8 insertions(+), 11 deletions(-)

Modified: trunk/libs/thread/example/future_when_all.cpp
==============================================================================
--- trunk/libs/thread/example/future_when_all.cpp Sat Oct 26 18:43:12 2013 (r86466)
+++ trunk/libs/thread/example/future_when_all.cpp 2013-10-26 18:47:02 EDT (Sat, 26 Oct 2013) (r86467)
@@ -26,6 +26,7 @@
 
 
 #include <boost/thread/future.hpp>
+#include <boost/thread/csbl/vector.hpp>
 #include <boost/assert.hpp>
 #include <boost/thread/detail/log.hpp>
 #include <string>
@@ -103,9 +104,9 @@
       boost::future<int> f1 = boost::async(boost::launch::async, &p1);
       boost::future<int> f2 = boost::async(boost::launch::async, &p1b);
       boost::future<std::tuple<> > all0 = boost::when_all();
- boost::future<BOOST_THREAD_VECTOR<boost::future<int> > > all = boost::when_all(boost::move(f1), boost::move(f2));
+ boost::future<boost::csbl::vector<boost::future<int> > > all = boost::when_all(boost::move(f1), boost::move(f2));
       //(void) all.wait();
- BOOST_THREAD_VECTOR<boost::future<int> > res = all.get();
+ boost::csbl::vector<boost::future<int> > res = all.get();
       BOOST_THREAD_LOG
         << res[0].get() <<" " << BOOST_THREAD_END_LOG;
       BOOST_THREAD_LOG
@@ -130,9 +131,9 @@
       boost::future<int> f1 = boost::async(boost::launch::async, &p1);
       boost::future<int> f2 = boost::async(boost::launch::async, &p1b);
       boost::future<std::tuple<> > all0 = boost::when_any();
- boost::future<BOOST_THREAD_VECTOR<boost::future<int> > > all = boost::when_any(boost::move(f1), boost::move(f2));
+ boost::future<boost::csbl::vector<boost::future<int> > > all = boost::when_any(boost::move(f1), boost::move(f2));
       //(void) all.wait();
- BOOST_THREAD_VECTOR<boost::future<int> > res = all.get();
+ boost::csbl::vector<boost::future<int> > res = all.get();
       BOOST_THREAD_LOG
         << res[0].get() <<" " << BOOST_THREAD_END_LOG;
       BOOST_THREAD_LOG
@@ -156,21 +157,17 @@
   return 0;
 }
 #else
-#include <boost/container/vector.hpp>
-#define BOOST_THREAD_VECTOR boost::container::vector
+#include <boost/thread/csbl/vector.hpp>
 using namespace boost;
-//#include <vector>
-//#define BOOST_THREAD_VECTOR std::vector
-//using namespace std;
 
-void f( BOOST_THREAD_VECTOR<future<int> > &//vec
+void f( boost::csbl::vector<future<int> > &//vec
     , BOOST_THREAD_RV_REF(future<int>) //f
     ) {
   //vec.push_back(boost::forward<future<int> >(f));
 }
 int main()
 {
- BOOST_THREAD_VECTOR<future<int> > vec;
+ boost::csbl::vector<future<int> > vec;
   f(vec, make_ready_future(0));
   return 0;
 }


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk