Subject: [Boost-commit] svn:boost r81704 - in trunk: boost/thread boost/thread/detail libs/thread/src/pthread libs/thread/src/win32 libs/thread/test
From: vicente.botet_at_[hidden]
Date: 2012-12-04 11:32:35
Author: viboes
Date: 2012-12-04 11:32:33 EST (Tue, 04 Dec 2012)
New Revision: 81704
URL: http://svn.boost.org/trac/boost/changeset/81704
Log:
Thread: set default version to 3
Text files modified:
trunk/boost/thread/detail/config.hpp | 4 ++--
trunk/boost/thread/strict_lock.hpp | 4 ++--
trunk/libs/thread/src/pthread/thread.cpp | 2 +-
trunk/libs/thread/src/win32/thread.cpp | 2 +-
trunk/libs/thread/test/Jamfile.v2 | 6 +++---
5 files changed, 9 insertions(+), 9 deletions(-)
Modified: trunk/boost/thread/detail/config.hpp
==============================================================================
--- trunk/boost/thread/detail/config.hpp (original)
+++ trunk/boost/thread/detail/config.hpp 2012-12-04 11:32:33 EST (Tue, 04 Dec 2012)
@@ -78,9 +78,9 @@
#define BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR
#endif
-// Default version is 2
+// Default version is 3
#if !defined BOOST_THREAD_VERSION
-#define BOOST_THREAD_VERSION 2
+#define BOOST_THREAD_VERSION 3
#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/boost/thread/strict_lock.hpp
==============================================================================
--- trunk/boost/thread/strict_lock.hpp (original)
+++ trunk/boost/thread/strict_lock.hpp 2012-12-04 11:32:33 EST (Tue, 04 Dec 2012)
@@ -8,7 +8,7 @@
#include <boost/thread/detail/delete.hpp>
#include <boost/thread/lock_options.hpp>
-#include <boost/thread/is_locked_by_this_thread.hpp>
+//#include <boost/thread/is_locked_by_this_thread.hpp>
#include <boost/thread/lock_traits.hpp>
#include <boost/thread/lockable_traits.hpp>
#include <boost/thread/lockable_concepts.hpp>
@@ -74,7 +74,7 @@
public:
/**
- * @return whether if this lock is locking that mutex.
+ * @return whether this lock is locking that mutex.
*/
bool owns_lock(mutex_type const* l) const BOOST_NOEXCEPT
{
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-04 11:32:33 EST (Tue, 04 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 2
+#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-04 11:32:33 EST (Tue, 04 Dec 2012)
@@ -12,7 +12,7 @@
#ifndef WINVER
#define WINVER 0x400
#endif
-#define BOOST_THREAD_VERSION 2
+#define BOOST_THREAD_VERSION 3
#include <boost/thread/thread.hpp>
#include <boost/thread/once.hpp>
Modified: trunk/libs/thread/test/Jamfile.v2
==============================================================================
--- trunk/libs/thread/test/Jamfile.v2 (original)
+++ trunk/libs/thread/test/Jamfile.v2 2012-12-04 11:32:33 EST (Tue, 04 Dec 2012)
@@ -438,8 +438,8 @@
[ thread-run2-noit ./sync/mutual_exclusion/locks/shared_lock/obs/owns_lock_pass.cpp : shared_lock__owns_lock_p ]
[ thread-run2-noit ./sync/mutual_exclusion/locks/shared_lock/types_pass.cpp : shared_lock__types_p ]
- [ thread-run2-h ./sync/mutual_exclusion/locks/shared_lock/cons/default_pass.cpp : shared_lock__cons__default_p ]
- [ thread-run2-h ./sync/mutual_exclusion/locks/shared_lock/cons/defer_lock_pass.cpp : shared_lock__cons__defer_lock_p ]
+ #[ thread-run2-h ./sync/mutual_exclusion/locks/shared_lock/cons/default_pass.cpp : shared_lock__cons__default_p ]
+ #[ thread-run2-h ./sync/mutual_exclusion/locks/shared_lock/cons/defer_lock_pass.cpp : shared_lock__cons__defer_lock_p ]
;
@@ -531,7 +531,7 @@
[ thread-run2-noit ./sync/mutual_exclusion/shared_mutex/try_lock_pass.cpp : shared_mutex__try_lock_p ]
[ thread-run2-noit ./sync/mutual_exclusion/shared_mutex/try_lock_until_pass.cpp : shared_mutex__try_lock_until_p ]
- [ thread-run2-h ./sync/mutual_exclusion/shared_mutex/default_pass.cpp : shared_mutex__default_p ]
+ #[ thread-run2-h ./sync/mutual_exclusion/shared_mutex/default_pass.cpp : shared_mutex__default_p ]
;
#explicit ts_this_thread ;