Merge branch 'develop'

This commit is contained in:
Ion Gaztañaga
2015-07-31 21:57:20 +02:00
2 changed files with 3 additions and 2 deletions

View File

@@ -768,6 +768,7 @@ Many thanks to all boosters that have tested, reviewed and improved the library.
from convertible types returned by value.
* Fixed bug:
* [@https://svn.boost.org/trac/boost/ticket/11229 Trac #11229: ['"vector incorrectly copies move-only objects using memcpy"]],
* [@https://svn.boost.org/trac/boost/ticket/11510 Trac #11510: ['"unique_ptr: -Wshadow warning issued"]],
[endsect]

View File

@@ -105,8 +105,8 @@ struct unique_ptr_data
{}
template <class U>
unique_ptr_data(P p, BOOST_FWD_REF(U) d) BOOST_NOEXCEPT
: m_p(p), d(::boost::forward<U>(d))
unique_ptr_data(P p, BOOST_FWD_REF(U) d1) BOOST_NOEXCEPT
: m_p(p), d(::boost::forward<U>(d1))
{}
del_ref deleter() { return d; }