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

Move the allocators after copying the hash functions.

Browse Source 
Just in case the hash functions throw.
This commit is contained in:
Daniel James
2014-11-09 23:36:10 +00:00
parent 31211a607f
commit 8ccde2e5a1
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/changes.qbk
View File

@ -265,5 +265,6 @@ C++11 support has resulted in some breaking changes:
confuses some traits classes. confuses some traits classes.
* Fix move assignment with stateful, propagate_on_container_move_assign * Fix move assignment with stateful, propagate_on_container_move_assign
allocators ([ticket 10777]). allocators ([ticket 10777]).
* Fix rare exception safety issue in move assignment.
[endsect] [endsect]

24
include/boost/unordered/detail/table.hpp
View File

@ -712,15 +712,25 @@ namespace boost { namespace unordered { namespace detail {
void move_assign(table& x, true_type) void move_assign(table& x, true_type)
{ {
delete_buckets(); delete_buckets();
set_hash_functions new_func_this(*this, x);
allocators_.move_assign(x.allocators_); allocators_.move_assign(x.allocators_);
move_assign_no_alloc(x); // No throw from here.
mlf_ = x.mlf_;
max_load_ = x.max_load_;
move_buckets_from(x);
new_func_this.commit();
} }
void move_assign(table& x, false_type) void move_assign(table& x, false_type)
{ {
if (node_alloc() == x.node_alloc()) { if (node_alloc() == x.node_alloc()) {
delete_buckets(); delete_buckets();
move_assign_no_alloc(x); set_hash_functions new_func_this(*this, x);
// No throw from here.
mlf_ = x.mlf_;
max_load_ = x.max_load_;
move_buckets_from(x);
new_func_this.commit();
} }
else { else {
set_hash_functions new_func_this(*this, x); set_hash_functions new_func_this(*this, x);
@ -745,16 +755,6 @@ namespace boost { namespace unordered { namespace detail {
table_impl::fill_buckets(nodes.begin(), *this, node_creator); table_impl::fill_buckets(nodes.begin(), *this, node_creator);
} }
} }
void move_assign_no_alloc(table& x)
{
set_hash_functions new_func_this(*this, x);
// No throw from here.
mlf_ = x.mlf_;
max_load_ = x.max_load_;
move_buckets_from(x);
new_func_this.commit();
}
// Accessors // Accessors