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

Fix exception safety in assignment for multimap/multiset.

Browse Source 
The assignment code seemed like a bit of a premature optimization, I
replaced it with a slightly slower but much simpler implementation.
This commit is contained in:
Daniel James committed 2016-05-30 15:02:04 +01:00
1 parent 1d4845d6b8
commit b4a3c6f460
6 files changed
+91 -60
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/boost/unordered/detail/equivalent.hpp
+11 -17
View File
@@ -385,7 +385,14 @@ namespace boost { namespace unordered { namespace detail {
std::size_t key_hash,
iterator pos)
{
node_pointer n = a.release();
return add_node(a.release(), key_hash, pos);
}
inline iterator add_node(
node_pointer n,
std::size_t key_hash,
iterator pos)
{
n->hash_ = key_hash;
if (pos.node_) {
this->add_after_node(n, pos.node_);
@@ -622,30 +629,17 @@ namespace boost { namespace unordered { namespace detail {
// fill_buckets
template <class NodeCreator>
static void fill_buckets(iterator n, table& dst,
NodeCreator& creator)
void fill_buckets(iterator n, NodeCreator& creator)
{
link_pointer prev = dst.get_previous_start();
while (n.node_) {
std::size_t key_hash = n.node_->hash_;
iterator group_end(n.node_->group_prev_->next_);
node_pointer first_node = creator.create(*n);
node_pointer end = first_node;
first_node->hash_ = key_hash;
prev->next_ = first_node;
++dst.size_;
iterator pos = this->add_node(creator.create(*n), key_hash, iterator());
for (++n; n != group_end; ++n)
{
end = creator.create(*n);
end->hash_ = key_hash;
add_after_node(end, first_node);
++dst.size_;
this->add_node(creator.create(*n), key_hash, pos);
}
prev = place_in_bucket(dst, prev, end);
}
}