Subject: [Boost-commit] svn:boost r82026 - branches/release/boost/smart_ptr
From: pdimov_at_[hidden]
Date: 2012-12-16 11:20:04
Author: pdimov
Date: 2012-12-16 11:20:03 EST (Sun, 16 Dec 2012)
New Revision: 82026
URL: http://svn.boost.org/trac/boost/changeset/82026
Log:
Manually apply a change from [58306] that didn't get merged at the time.
Text files modified:
branches/release/boost/smart_ptr/shared_ptr.hpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Modified: branches/release/boost/smart_ptr/shared_ptr.hpp
==============================================================================
--- branches/release/boost/smart_ptr/shared_ptr.hpp (original)
+++ branches/release/boost/smart_ptr/shared_ptr.hpp 2012-12-16 11:20:03 EST (Sun, 16 Dec 2012)
@@ -926,11 +926,11 @@
template<class D, class T> D * get_deleter( shared_ptr<T> const & p ) BOOST_NOEXCEPT
{
- D *del = detail::basic_get_deleter<D>(p);
+ D *del = boost::detail::basic_get_deleter<D>(p);
if(del == 0)
{
- detail::esft2_deleter_wrapper *del_wrapper = detail::basic_get_deleter<detail::esft2_deleter_wrapper>(p);
+ boost::detail::esft2_deleter_wrapper *del_wrapper = boost::detail::basic_get_deleter<boost::detail::esft2_deleter_wrapper>(p);
// The following get_deleter method call is fully qualified because
// older versions of gcc (2.95, 3.2.3) fail to compile it when written del_wrapper->get_deleter<D>()
if(del_wrapper) del = del_wrapper->::boost::detail::esft2_deleter_wrapper::get_deleter<D>();