[Boost-commit] svn:boost r82302 - in trunk: boost/thread/detail libs/thread/doc libs/thread/src/pthread libs/thread/src/win32

Subject: [Boost-commit] svn:boost r82302 - in trunk: boost/thread/detail libs/thread/doc libs/thread/src/pthread libs/thread/src/win32
From: vicente.botet_at_[hidden]
Date: 2012-12-31 10:10:18

Author: viboes
Date: 2012-12-31 10:10:17 EST (Mon, 31 Dec 2012)
New Revision: 82302
URL: http://svn.boost.org/trac/boost/changeset/82302

Log:
Thread: rollback default version 3 change.
Text files modified: 
   trunk/boost/thread/detail/config.hpp     |     4 ++--                                    
   trunk/libs/thread/doc/changes.qbk        |     2 ++                                      
   trunk/libs/thread/src/pthread/thread.cpp |     2 +-                                      
   trunk/libs/thread/src/win32/thread.cpp   |     4 ++--                                    
   4 files changed, 7 insertions(+), 5 deletions(-)

Modified: trunk/boost/thread/detail/config.hpp
==============================================================================
--- trunk/boost/thread/detail/config.hpp	(original)
+++ trunk/boost/thread/detail/config.hpp	2012-12-31 10:10:17 EST (Mon, 31 Dec 2012)
@@ -78,9 +78,9 @@
 #define BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR
 #endif
 
-// Default version is 3
+// Default version
 #if !defined BOOST_THREAD_VERSION
-#define BOOST_THREAD_VERSION 3
+#define BOOST_THREAD_VERSION 2
 #else
 #if BOOST_THREAD_VERSION!=2  && BOOST_THREAD_VERSION!=3 && BOOST_THREAD_VERSION!=4
 #error "BOOST_THREAD_VERSION must be 2, 3 or 4"

Modified: trunk/libs/thread/doc/changes.qbk
==============================================================================
--- trunk/libs/thread/doc/changes.qbk	(original)
+++ trunk/libs/thread/doc/changes.qbk	2012-12-31 10:10:17 EST (Mon, 31 Dec 2012)
@@ -10,11 +10,13 @@
 
 [heading Version 4.0.0 - boost 1.53]
 
+[/
 [*Breaking changes:]
 
 [warning 
 BOOST_THREAD_VERSION==3 by default since Boost 1.53. So that all the deprecated features since 1.50 are not included by default. You can change this by setting the appropriated define (see Configuration section).
 ]
+]
 
 [*Deprecated features:]
 

Modified: trunk/libs/thread/src/pthread/thread.cpp
==============================================================================
--- trunk/libs/thread/src/pthread/thread.cpp	(original)
+++ trunk/libs/thread/src/pthread/thread.cpp	2012-12-31 10:10:17 EST (Mon, 31 Dec 2012)
@@ -6,7 +6,7 @@
 //  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)
 
-#define BOOST_THREAD_VERSION 3
+//#define BOOST_THREAD_VERSION 3
 #include <boost/thread/detail/config.hpp>
 
 #include <boost/thread/thread.hpp>

Modified: trunk/libs/thread/src/win32/thread.cpp
==============================================================================
--- trunk/libs/thread/src/win32/thread.cpp	(original)
+++ trunk/libs/thread/src/win32/thread.cpp	2012-12-31 10:10:17 EST (Mon, 31 Dec 2012)
@@ -3,7 +3,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 // (C) Copyright 2007 Anthony Williams
 // (C) Copyright 2007 David Deakins
-// (C) Copyright 2011-2012 Vicente J. Botet Escriba
+// (C) Copyright 2011-2013 Vicente J. Botet Escriba
 
 #ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x400
@@ -12,7 +12,7 @@
 #ifndef WINVER
 #define WINVER 0x400
 #endif
-#define BOOST_THREAD_VERSION 3
+//#define BOOST_THREAD_VERSION 3
 
 #include <boost/thread/thread.hpp>
 #include <boost/thread/once.hpp>