feedc0de/boost_smart_ptr
1
0
Fork 0
forked from boostorg/smart_ptr
Code Pull Requests Activity

Call to_address in the scalar destroy case too

Browse Source
This commit is contained in:
Glen Fernandes
2019-08-30 07:39:02 -04:00
parent 60c26acab8
commit e56eec70ca
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/boost/smart_ptr/allocate_unique.hpp
View File

@ -294,8 +294,7 @@ inline void
sp_alloc_clear(A& a, typename sp_alloc_type<A>::type p, std::size_t, sp_alloc_clear(A& a, typename sp_alloc_type<A>::type p, std::size_t,
boost::false_type) boost::false_type)
{ {
boost::alloc_destroy(a, p); boost::alloc_destroy(a, boost::to_address(p));
a.deallocate(p, 1);
} }
template<class A> template<class A>
@ -310,7 +309,6 @@ sp_alloc_clear(A& a, typename sp_alloc_type<A>::type p, std::size_t n,
#endif #endif
boost::alloc_destroy_n(a, boost::first_scalar(boost::to_address(p)), boost::alloc_destroy_n(a, boost::first_scalar(boost::to_address(p)),
n * sp_alloc_size<typename A::value_type>::value); n * sp_alloc_size<typename A::value_type>::value);
a.deallocate(p, n);
} }
} /* detail */ } /* detail */
@ -332,6 +330,7 @@ public:
void operator()(pointer p) { void operator()(pointer p) {
detail::sp_alloc_clear(base::get(), p.ptr(), p.size(), is_array<T>()); detail::sp_alloc_clear(base::get(), p.ptr(), p.size(), is_array<T>());
base::get().deallocate(p.ptr(), p.size());
} }
}; };