feedc0de/boost_unordered
1
0
Fork 0
forked from boostorg/unordered
Code Pull Requests Activity

Unordered: And use allocator traits to destroy values.

Browse Source 
[SVN r80222]
This commit is contained in:
Daniel James
2012-08-25 21:53:25 +00:00
parent a7125259d8
commit cd57bf5000
2 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/boost/unordered/detail/allocate.hpp
View File

@ -775,6 +775,12 @@ namespace boost { namespace unordered { namespace detail {
address, boost::forward<Args>(args)...); address, boost::forward<Args>(args)...);
} }
template <typename Alloc, typename T>
inline void destroy_impl(Alloc& alloc, T* x) {
boost::unordered::detail::allocator_traits<Alloc>::destroy(alloc, x);
}
# else # else
template <typename Alloc, typename T, typename... Args> template <typename Alloc, typename T, typename... Args>
@ -784,8 +790,21 @@ namespace boost { namespace unordered { namespace detail {
new((void*) address) T(boost::forward<Args>(args)...); new((void*) address) T(boost::forward<Args>(args)...);
} }
template <typename Alloc, typename T>
inline void destroy_impl(Alloc&, T* x) {
boost::unordered::detail::destroy(x);
}
# endif # endif
#else
template <typename Alloc, typename T>
inline void destroy_impl(Alloc&, T* x) {
boost::unordered::detail::destroy(x);
}
#endif #endif
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////

9
include/boost/unordered/detail/buckets.hpp
View File

@ -112,7 +112,8 @@ namespace boost { namespace unordered { namespace detail {
{ {
if (node_) { if (node_) {
if (value_constructed_) { if (value_constructed_) {
boost::unordered::detail::destroy(node_->value_ptr()); boost::unordered::detail::destroy_impl(alloc_,
node_->value_ptr());
} }
if (node_constructed_) { if (node_constructed_) {
@ -143,7 +144,8 @@ namespace boost { namespace unordered { namespace detail {
if (value_constructed_) if (value_constructed_)
{ {
boost::unordered::detail::destroy(node_->value_ptr()); boost::unordered::detail::destroy_impl(alloc_,
node_->value_ptr());
value_constructed_ = false; value_constructed_ = false;
} }
} }
@ -762,7 +764,8 @@ namespace boost { namespace unordered { namespace detail {
inline void delete_node(c_iterator n) inline void delete_node(c_iterator n)
{ {
boost::unordered::detail::destroy(n.node_->value_ptr()); boost::unordered::detail::destroy_impl(node_alloc(),
n.node_->value_ptr());
node_allocator_traits::destroy(node_alloc(), node_allocator_traits::destroy(node_alloc(),
boost::addressof(*n.node_)); boost::addressof(*n.node_));
node_allocator_traits::deallocate(node_alloc(), n.node_, 1); node_allocator_traits::deallocate(node_alloc(), n.node_, 1);