boostorg/unordered
1
0
Fork 1
mirror of https://github.com/boostorg/unordered.git synced 2025-07-30 03:17:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Try to destruct values in a way that all compilers might like.

Browse Source 
[SVN r51983]
This commit is contained in:
Daniel James
2009-03-26 07:00:46 +00:00
parent 3a8739cd60
commit 188bcafdec
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/boost/unordered/detail/hash_table.hpp
View File

@ -223,11 +223,6 @@ namespace boost {
functions func2_; functions func2_;
functions_ptr func_; // The currently active functions. functions_ptr func_; // The currently active functions.
}; };
template <typename T>
void destroy(T* x) {
x->~T();
}
} }
} }

4
include/boost/unordered/detail/hash_table_impl.hpp
View File

@ -130,7 +130,7 @@ namespace boost {
void destroy(link_ptr ptr) void destroy(link_ptr ptr)
{ {
node* raw_ptr = static_cast<node*>(&*ptr); node* raw_ptr = static_cast<node*>(&*ptr);
boost::unordered_detail::destroy(&raw_ptr->value()); (&raw_ptr->value())->~value_type();
node_ptr n(node_alloc_.address(*raw_ptr)); node_ptr n(node_alloc_.address(*raw_ptr));
node_alloc_.destroy(n); node_alloc_.destroy(n);
node_alloc_.deallocate(n, 1); node_alloc_.deallocate(n, 1);
@ -172,7 +172,7 @@ namespace boost {
{ {
if (node_) { if (node_) {
if (value_constructed_) { if (value_constructed_) {
boost::unordered_detail::destroy(&node_->value()); (&node_->value())->~value_type();
} }
if (node_constructed_) if (node_constructed_)