Fixed Trac #11510 ("unique_ptr: -Wshadow warning issued")

boostorg · Jul 31, 2015 · b88cfca · b88cfca
1 parent 49a42a2
commit b88cfca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/doc/move.qbk b/doc/move.qbk
@@ -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]
 

diff --git a/include/boost/move/unique_ptr.hpp b/include/boost/move/unique_ptr.hpp
@@ -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; }