Quickbook: Merge from trunk.

[SVN r77380]

include/boost/thread/detail/thread.hpp

@@ -144,7 +144,7 @@ namespace boost
     class BOOST_THREAD_DECL thread
     {
     public:
-      //typedef int boost_move_emulation_t;
+      typedef int boost_move_emulation_t;
       typedef thread_attributes attributes;
 
 #ifndef BOOST_NO_DELETED_FUNCTIONS
@@ -153,8 +153,20 @@ namespace boost
       thread& operator=(thread const&) = delete;
 #else // BOOST_NO_DELETED_FUNCTIONS
     private:
+//      BOOST_MOVABLE_BUT_NOT_COPYABLE(thread)
+
+#if defined BOOST_THREAD_USES_MOVE
+    private:
+      //thread(thread const&);
+      thread(thread &);
+      //thread& operator=(thread const&);
+      thread& operator=(thread &);
+#else
+    private:
       thread(thread&);
       thread& operator=(thread&);
+#endif
+    public:
 #endif // BOOST_NO_DELETED_FUNCTIONS
     private:
 
@@ -388,15 +400,6 @@ namespace boost
 #endif
 
 #if defined BOOST_THREAD_USES_MOVE
-        ::boost::rv<thread>& move()
-        {
-          return *static_cast< ::boost::rv<thread>* >(this);
-        }
-        const ::boost::rv<thread>& move() const
-        {
-          return *static_cast<const ::boost::rv<thread>* >(this);
-        }
-
       operator ::boost::rv<thread>&()
       {
         return *static_cast< ::boost::rv<thread>* >(this);

test/Jamfile.v2

@@ -157,11 +157,11 @@ rule thread-compile-fail-V2 ( sources : reqs * : name )
     test-suite mutual_exclusion
     :
           #uncomment the following once these works on windows
-          [ thread-compile-fail-V2 ./sync/mutual_exclusion/locks/lock_guard/copy_assign_fail.cpp : : lock_guard__cons__copy_assign_f ]
-          [ thread-compile-fail-V2 ./sync/mutual_exclusion/locks/lock_guard/copy_ctor_fail.cpp : : lock_guard__cons__copy_ctor_f ]
-          [ thread-run2 ./sync/mutual_exclusion/locks/lock_guard/adopt_lock_pass.cpp : lock_guard__cons__adopt_lock_p ]
-          [ thread-run2 ./sync/mutual_exclusion/locks/lock_guard/default_pass.cpp : lock_guard__cons__default_p ]
-          [ thread-run2 ./sync/mutual_exclusion/locks/lock_guard/types_pass.cpp : lock_guard__types_p ]
+          #[ thread-compile-fail-V2 ./sync/mutual_exclusion/locks/lock_guard/copy_assign_fail.cpp : : lock_guard__cons__copy_assign_f ]
+          #[ thread-compile-fail-V2 ./sync/mutual_exclusion/locks/lock_guard/copy_ctor_fail.cpp : : lock_guard__cons__copy_ctor_f ]
+          #[ thread-run2 ./sync/mutual_exclusion/locks/lock_guard/adopt_lock_pass.cpp : lock_guard__cons__adopt_lock_p ]
+          #[ thread-run2 ./sync/mutual_exclusion/locks/lock_guard/default_pass.cpp : lock_guard__cons__default_p ]
+          #[ thread-run2 ./sync/mutual_exclusion/locks/lock_guard/types_pass.cpp : lock_guard__types_p ]
 
           [ thread-compile-fail-V2 ./sync/mutual_exclusion/locks/unique_lock/cons/copy_assign_fail.cpp : : unique_lock__cons__copy_assign_f ]
           [ thread-compile-fail-V2 ./sync/mutual_exclusion/locks/unique_lock/cons/copy_ctor_fail.cpp : : unique_lock__cons__copy_ctor_f ]
@@ -308,7 +308,7 @@ rule thread-compile-fail-V2 ( sources : reqs * : name )
           [ thread-run2 ./threads/thread/static/hardware_concurrency_pass.cpp : thread__static__hardware_concurrency_p ]
     ;
 
-    explicit examples ;
+    #explicit examples ;
     test-suite examples
     :
           [ thread-run ../example/monitor.cpp ]
@@ -323,7 +323,7 @@ rule thread-compile-fail-V2 ( sources : reqs * : name )
           [ thread-run ../example/tss.cpp ]
           [ thread-run ../example/xtime.cpp ]
           [ thread-run ../example/shared_monitor.cpp ]
-          #[ thread-run ../example/shared_mutex.cpp ]
+          [ thread-run ../example/shared_mutex.cpp ]
           #[ thread-run ../example/v2_shared_monitor.cpp ]
           #[ thread-run ../example/v2_shared_mutex.cpp ]
     ;