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

Make setting max_load_ a tad more consistent

Browse Source
This commit is contained in:
Daniel James
2017-04-25 09:54:28 +01:00
parent 1c8edf0298
commit cba643fc51
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/boost/unordered/detail/implementation.hpp
View File

@ -2852,7 +2852,7 @@ struct table : boost::unordered::detail::functions<typename Types::hasher,
table(
table& x, node_allocator const& a, boost::unordered::detail::move_tag m)
: functions(x, m), allocators_(a, a), bucket_count_(x.bucket_count_),
size_(0), mlf_(x.mlf_), max_load_(x.max_load_), buckets_()
size_(0), mlf_(x.mlf_), max_load_(0), buckets_()
{
}
@ -2987,6 +2987,7 @@ struct table : boost::unordered::detail::functions<typename Types::hasher,
buckets_ = other.buckets_;
bucket_count_ = other.bucket_count_;
size_ = other.size_;
max_load_ = other.max_load_;
other.buckets_ = bucket_pointer();
other.size_ = 0;
other.max_load_ = 0;
@ -3139,7 +3140,6 @@ struct table : boost::unordered::detail::functions<typename Types::hasher,
new_func_this.commit();
mlf_ = x.mlf_;
bucket_count_ = min_buckets_for_size(x.size_);
max_load_ = 0;
// Finally copy the elements.
if (x.size_) {
@ -3169,7 +3169,6 @@ struct table : boost::unordered::detail::functions<typename Types::hasher,
allocators_.move_assign(x.allocators_);
// No throw from here.
mlf_ = x.mlf_;
max_load_ = x.max_load_;
move_buckets_from(x);
new_func_this.commit();
}
@ -3181,7 +3180,6 @@ struct table : boost::unordered::detail::functions<typename Types::hasher,
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 {