feedc0de/boost_move
1
0
Fork 0
forked from boostorg/move
Code Pull Requests Activity

Fixes #42 ("<boost/move/unique_ptr.hpp> fails when BOOST_MOVE_USE_STANDARD_LIBRARY_MOVE is set")

Browse Source
This commit is contained in:
Ion Gaztañaga
2021-10-21 16:11:15 +02:00
parent 55bbf331b0
commit 00db7a0829
3 changed files with 70 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/move.qbk
View File

@@ -806,6 +806,7 @@ Special thanks to:
* Fixed bugs: * Fixed bugs:
* [@https://github.com/boostorg/move/issues/40 Git Issue #40: ['"Warning 4675 is not defined in MSVC"]]. * [@https://github.com/boostorg/move/issues/40 Git Issue #40: ['"Warning 4675 is not defined in MSVC"]].
* [@https://github.com/boostorg/move/issues/42 Git Issue #42: ['"<boost/move/unique_ptr.hpp> fails when BOOST_MOVE_USE_STANDARD_LIBRARY_MOVE is set"]].
[endsect] [endsect]

7
include/boost/move/utility_core.hpp
View File

@@ -258,12 +258,17 @@
#endif //BOOST_MOVE_DOXYGEN_INVOKED #endif //BOOST_MOVE_DOXYGEN_INVOKED
} //namespace boost {
#endif //BOOST_MOVE_USE_STANDARD_LIBRARY_MOVE
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
// //
// move_if_not_lvalue_reference // move_if_not_lvalue_reference
// //
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
namespace boost {
#if defined(BOOST_MOVE_DOXYGEN_INVOKED) #if defined(BOOST_MOVE_DOXYGEN_INVOKED)
//! <b>Effects</b>: Calls `boost::move` if `input_reference` is not a lvalue reference. //! <b>Effects</b>: Calls `boost::move` if `input_reference` is not a lvalue reference.
@@ -295,8 +300,6 @@
} //namespace boost { } //namespace boost {
#endif //#if defined(BOOST_MOVE_USE_STANDARD_LIBRARY_MOVE)
#endif //BOOST_NO_CXX11_RVALUE_REFERENCES #endif //BOOST_NO_CXX11_RVALUE_REFERENCES
#if !defined(BOOST_MOVE_DOXYGEN_INVOKED) #if !defined(BOOST_MOVE_DOXYGEN_INVOKED)

30
test/unique_ptr_std_move.cpp Normal file
View File

@@ -0,0 +1,30 @@
//////////////////////////////////////////////////////////////////////////////
//
// (C) Copyright Howard Hinnant 2009
// (C) Copyright Ion Gaztanaga 2014-2014.
//
// 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)
//
// See http://www.boost.org/libs/move for documentation.
//
//////////////////////////////////////////////////////////////////////////////
#define BOOST_MOVE_USE_STANDARD_LIBRARY_MOVE
#include <boost/move/unique_ptr.hpp>
#include <boost/core/lightweight_test.hpp>
////////////////////////////////
// main
////////////////////////////////
int main()
{
//Just test compilation errors
boost::movelib::unique_ptr<int> a, b(boost::move(a));
BOOST_TEST(!(b.get() || a.get()));
b = boost::move(a);
b.release();
BOOST_TEST(!(b.get() || a.get()));
//Test results
return boost::report_errors();
}