From fe513fd14cd5b301d5405b40022e4d4c59bcf944 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= Date: Thu, 1 Aug 2013 14:17:39 +0000 Subject: [PATCH] Fixes #8842. [SVN r85180] --- doc/move.qbk | 7 ++++--- include/boost/move/core.hpp | 7 +++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/doc/move.qbk b/doc/move.qbk index 99f2f3d..48a2a2f 100644 --- a/doc/move.qbk +++ b/doc/move.qbk @@ -792,7 +792,8 @@ Many thanks to all boosters that have tested, reviewed and improved the library. [section:release_notes_boost_1_55_00 Boost 1.55 Release] -* Fixed bug [@https://svn.boost.org/trac/boost/ticket/7952 #7952]). +* Fixed bugs [@https://svn.boost.org/trac/boost/ticket/7952 #7952], + [@https://svn.boost.org/trac/boost/ticket/8842 #8842]. [endsect] @@ -800,8 +801,8 @@ Many thanks to all boosters that have tested, reviewed and improved the library. [section:release_notes_boost_1_54_00 Boost 1.54 Release] -* Fixed bugs [@https://svn.boost.org/trac/boost/ticket/7969 #7969]), - [@https://svn.boost.org/trac/boost/ticket/8231 #8231]). +* Fixed bugs [@https://svn.boost.org/trac/boost/ticket/7969 #7969], + [@https://svn.boost.org/trac/boost/ticket/8231 #8231]. [endsect] diff --git a/include/boost/move/core.hpp b/include/boost/move/core.hpp index d939f03..9586eca 100644 --- a/include/boost/move/core.hpp +++ b/include/boost/move/core.hpp @@ -18,17 +18,24 @@ #include +//boost_move_no_copy_constructor_or_assign typedef +//used to detect noncopyable types for other Boost libraries. #ifdef BOOST_NO_CXX11_DELETED_FUNCTIONS #define BOOST_MOVE_IMPL_NO_COPY_CTOR_OR_ASSIGN(TYPE) \ private:\ TYPE(TYPE &);\ TYPE& operator=(TYPE &);\ + public:\ + typedef int boost_move_no_copy_constructor_or_assign; \ + private:\ // #else #define BOOST_MOVE_IMPL_NO_COPY_CTOR_OR_ASSIGN(TYPE) \ public:\ TYPE(TYPE const &) = delete;\ TYPE& operator=(TYPE const &) = delete;\ + public:\ + typedef int boost_move_no_copy_constructor_or_assign; \ private:\ // #endif //BOOST_NO_CXX11_DELETED_FUNCTIONS