Ticket #3122: locks.hpp.patch

boost/thread/locks.hpp

@@ -422 +422 @@
     {
         lhs.swap(rhs);
     }
-#else
+#endif
     template<typename Mutex>
     void swap(unique_lock<Mutex>& lhs,unique_lock<Mutex>& rhs)
     {
         lhs.swap(rhs);
     }
-#endif
 
 #ifdef BOOST_HAS_RVALUE_REFS
     template<typename Mutex>
@@ -635 +634 @@
     {
         lhs.swap(rhs);
     }
-#else
+#endif
     template<typename Mutex>
     void swap(shared_lock<Mutex>& lhs,shared_lock<Mutex>& rhs)
     {
         lhs.swap(rhs);
     }
-#endif
 
     template<typename Mutex>
     class upgrade_lock
@@ -954 +952 @@
         {
             lhs.swap(rhs);
         }
-#else
+#endif
         template<typename Mutex>
         void swap(try_lock_wrapper<Mutex>& lhs,try_lock_wrapper<Mutex>& rhs)
         {
             lhs.swap(rhs);
         }
-#endif
         
         template<typename MutexType1,typename MutexType2>
         unsigned try_lock_internal(MutexType1& m1,MutexType2& m2)