[Boost-commit] svn:boost r76558 - trunk/libs/thread/test

Subject: [Boost-commit] svn:boost r76558 - trunk/libs/thread/test
From: vicente.botet_at_[hidden]
Date: 2012-01-17 13:31:03

Author: viboes
Date: 2012-01-17 13:31:03 EST (Tue, 17 Jan 2012)
New Revision: 76558
URL: http://svn.boost.org/trac/boost/changeset/76558

Log:
Thread: Try to fix #6418 - error: 'X(X&&)' cannot be defaulted
Text files modified: 
   trunk/libs/thread/test/test_6174.cpp |    16 +++++++---------                        
   1 files changed, 7 insertions(+), 9 deletions(-)

Modified: trunk/libs/thread/test/test_6174.cpp
==============================================================================
--- trunk/libs/thread/test/test_6174.cpp	(original)
+++ trunk/libs/thread/test/test_6174.cpp	2012-01-17 13:31:03 EST (Tue, 17 Jan 2012)
@@ -5,22 +5,20 @@
 
 #ifndef BOOST_NO_RVALUE_REFERENCES
 struct MovableButNonCopyable {
-#ifndef   BOOST_NO_DEFAULTED_FUNCTIONS
-      MovableButNonCopyable() = default;
+#if ! defined BOOST_NO_DELETED_FUNCTIONS
       MovableButNonCopyable(MovableButNonCopyable const&) = delete;
       MovableButNonCopyable& operator=(MovableButNonCopyable const&) = delete;
-      MovableButNonCopyable(MovableButNonCopyable&&) = default;
-      MovableButNonCopyable& operator=(MovableButNonCopyable&&) = default;
 #else
-  MovableButNonCopyable() {};
-  MovableButNonCopyable(MovableButNonCopyable&&) {};
-  MovableButNonCopyable& operator=(MovableButNonCopyable&&) {
-    return *this;
-  };
 private:
     MovableButNonCopyable(MovableButNonCopyable const&);
     MovableButNonCopyable& operator=(MovableButNonCopyable const&);
 #endif
+public:
+    MovableButNonCopyable() {};
+    MovableButNonCopyable(MovableButNonCopyable&&) {};
+    MovableButNonCopyable& operator=(MovableButNonCopyable&&) {
+      return *this;
+    };
 };
 int main()
 {