[Boost-commit] svn:boost r85493 - trunk/libs/thread/example

Subject: [Boost-commit] svn:boost r85493 - trunk/libs/thread/example
From: vicente.botet_at_[hidden]
Date: 2013-08-27 18:35:21

Author: viboes
Date: 2013-08-27 18:35:21 EDT (Tue, 27 Aug 2013)
New Revision: 85493
URL: http://svn.boost.org/trac/boost/changeset/85493

Log:
Thread: avoid conflict with thread symbol.

Text files modified: 
   trunk/libs/thread/example/not_interleaved.cpp           |     4 ++--                                    
   trunk/libs/thread/example/producer_consumer.cpp         |     6 +++---                                  
   trunk/libs/thread/example/producer_consumer_bounded.cpp |     6 +++---                                  
   3 files changed, 8 insertions(+), 8 deletions(-)

Modified: trunk/libs/thread/example/not_interleaved.cpp
==============================================================================
--- trunk/libs/thread/example/not_interleaved.cpp	Tue Aug 27 18:31:32 2013	(r85492)
+++ trunk/libs/thread/example/not_interleaved.cpp	2013-08-27 18:35:21 EDT (Tue, 27 Aug 2013)	(r85493)
@@ -44,8 +44,8 @@
   externally_locked_stream<std::ostream> mcout(std::cout, terminal_mutex);
   externally_locked_stream<std::istream> mcin(std::cin, terminal_mutex);
 
-  scoped_thread<> t1(thread(use_cerr, boost::ref(mcerr)));
-  scoped_thread<> t2(thread(use_cout, boost::ref(mcout)));
+  scoped_thread<> t1(boost::thread(use_cerr, boost::ref(mcerr)));
+  scoped_thread<> t2(boost::thread(use_cout, boost::ref(mcout)));
   this_thread::sleep_for(chrono::seconds(2));
   std::string nm;
   {

Modified: trunk/libs/thread/example/producer_consumer.cpp
==============================================================================
--- trunk/libs/thread/example/producer_consumer.cpp	Tue Aug 27 18:31:32 2013	(r85492)
+++ trunk/libs/thread/example/producer_consumer.cpp	2013-08-27 18:35:21 EDT (Tue, 27 Aug 2013)	(r85493)
@@ -110,9 +110,9 @@
 
   {
     mcout << "begin of main" << std::endl;
-    scoped_thread<> t11(thread(producer, boost::ref(mcerr), boost::ref(sbq)));
-    scoped_thread<> t12(thread(producer, boost::ref(mcerr), boost::ref(sbq)));
-    scoped_thread<> t2(thread(consumer, boost::ref(mcout), boost::ref(sbq)));
+    scoped_thread<> t11(boost::thread(producer, boost::ref(mcerr), boost::ref(sbq)));
+    scoped_thread<> t12(boost::thread(producer, boost::ref(mcerr), boost::ref(sbq)));
+    scoped_thread<> t2(boost::thread(consumer, boost::ref(mcout), boost::ref(sbq)));
 
     this_thread::sleep_for(chrono::seconds(1));
 

Modified: trunk/libs/thread/example/producer_consumer_bounded.cpp
==============================================================================
--- trunk/libs/thread/example/producer_consumer_bounded.cpp	Tue Aug 27 18:31:32 2013	(r85492)
+++ trunk/libs/thread/example/producer_consumer_bounded.cpp	2013-08-27 18:35:21 EDT (Tue, 27 Aug 2013)	(r85493)
@@ -110,9 +110,9 @@
 
   {
     mcout << "begin of main" << std::endl;
-    scoped_thread<> t11(thread(producer, boost::ref(mcerr), boost::ref(sbq)));
-    scoped_thread<> t12(thread(producer, boost::ref(mcerr), boost::ref(sbq)));
-    scoped_thread<> t2(thread(consumer, boost::ref(mcout), boost::ref(sbq)));
+    scoped_thread<> t11(boost::thread(producer, boost::ref(mcerr), boost::ref(sbq)));
+    scoped_thread<> t12(boost::thread(producer, boost::ref(mcerr), boost::ref(sbq)));
+    scoped_thread<> t2(boost::thread(consumer, boost::ref(mcout), boost::ref(sbq)));
 
     this_thread::sleep_for(chrono::seconds(1));