diff --git a/doc/changes.qbk b/doc/changes.qbk index 60096bf5..f0f02e19 100644 --- a/doc/changes.qbk +++ b/doc/changes.qbk @@ -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:] diff --git a/include/boost/thread/detail/config.hpp b/include/boost/thread/detail/config.hpp index b15f2328..c5fa5c67 100644 --- a/include/boost/thread/detail/config.hpp +++ b/include/boost/thread/detail/config.hpp @@ -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" diff --git a/src/pthread/thread.cpp b/src/pthread/thread.cpp index 2600a940..5f2d5b4a 100644 --- a/src/pthread/thread.cpp +++ b/src/pthread/thread.cpp @@ -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 #include diff --git a/src/win32/thread.cpp b/src/win32/thread.cpp index c5022e27..0a8a3360 100644 --- a/src/win32/thread.cpp +++ b/src/win32/thread.cpp @@ -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 #include