[Boost-commit] svn:boost r75801 - in trunk/boost/thread: . detail

Subject: [Boost-commit] svn:boost r75801 - in trunk/boost/thread: . detail
From: vicente.botet_at_[hidden]
Date: 2011-12-04 09:58:09

Author: viboes
Date: 2011-12-04 09:58:08 EST (Sun, 04 Dec 2011)
New Revision: 75801
URL: http://svn.boost.org/trac/boost/changeset/75801

Log:
Thread: 6207/6208 shared_lock/try_lock_wrapper swap compiler error on clang 3.0 c++11
Text files modified: 
   trunk/boost/thread/detail/config.hpp |     6 +++---                                  
   trunk/boost/thread/locks.hpp         |    10 ++++++++++                              
   2 files changed, 13 insertions(+), 3 deletions(-)

Modified: trunk/boost/thread/detail/config.hpp
==============================================================================
--- trunk/boost/thread/detail/config.hpp	(original)
+++ trunk/boost/thread/detail/config.hpp	2011-12-04 09:58:08 EST (Sun, 04 Dec 2011)
@@ -1,7 +1,7 @@
 // Copyright (C) 2001-2003
 // William E. Kempf
 //
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying 
+//  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)
 
 #ifndef BOOST_THREAD_CONFIG_WEK01032003_HPP
@@ -62,7 +62,7 @@
 #   else
 #       define BOOST_THREAD_DECL
 #   endif
-#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4) 
+#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)
 #  define BOOST_THREAD_DECL BOOST_SYMBOL_VISIBLE
 
 #else
@@ -75,7 +75,7 @@
 #if !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_THREAD_NO_LIB) && !defined(BOOST_THREAD_BUILD_DLL) && !defined(BOOST_THREAD_BUILD_LIB)
 //
 // Tell the autolink to link dynamically, this will get undef'ed by auto_link.hpp
-// once it's done with it: 
+// once it's done with it:
 //
 #if defined(BOOST_THREAD_USE_DLL)
 #   define BOOST_DYN_LINK

Modified: trunk/boost/thread/locks.hpp
==============================================================================
--- trunk/boost/thread/locks.hpp	(original)
+++ trunk/boost/thread/locks.hpp	2011-12-04 09:58:08 EST (Sun, 04 Dec 2011)
@@ -715,6 +715,11 @@
     {
         lhs.swap(rhs);
     }
+    template<typename Mutex>
+    void swap(shared_lock<Mutex>& lhs,shared_lock<Mutex>& rhs)
+    {
+        lhs.swap(rhs);
+    }
 #else
     template<typename Mutex>
     void swap(shared_lock<Mutex>& lhs,shared_lock<Mutex>& rhs)
@@ -1098,6 +1103,11 @@
         {
             lhs.swap(rhs);
         }
+        template<typename Mutex>
+        void swap(try_lock_wrapper<Mutex>& lhs,try_lock_wrapper<Mutex>& rhs)
+        {
+            lhs.swap(rhs);
+        }
 #else
         template<typename Mutex>
         void swap(try_lock_wrapper<Mutex>& lhs,try_lock_wrapper<Mutex>& rhs)