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

Fix some code that could be using next_node

Browse Source
This commit is contained in:
Daniel James
2017-05-03 23:36:09 +01:00
parent 41f6a051ef
commit 622dff50df
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2729,11 +2729,6 @@ struct table : boost::unordered::detail::functions<typename Types::hasher,
return n2; return n2;
} }
static link_pointer next_for_erase(link_pointer prev)
{
return prev->next_;
}
node_pointer next_group(node_pointer n) const node_pointer next_group(node_pointer n) const
{ {
node_pointer n1 = n; node_pointer n1 = n;
@ -3020,7 +3015,7 @@ struct table : boost::unordered::detail::functions<typename Types::hasher,
void delete_node(link_pointer prev) void delete_node(link_pointer prev)
{ {
node_pointer n = static_cast<node_pointer>(prev->next_); node_pointer n = next_node(prev);
prev->next_ = n->next_; prev->next_ = n->next_;
BOOST_UNORDERED_CALL_DESTROY( BOOST_UNORDERED_CALL_DESTROY(
@ -3082,25 +3077,26 @@ struct table : boost::unordered::detail::functions<typename Types::hasher,
std::size_t fix_bucket(std::size_t bucket_index, link_pointer prev) std::size_t fix_bucket(std::size_t bucket_index, link_pointer prev)
{ {
link_pointer end = prev->next_; node_pointer next = next_node(prev);
std::size_t bucket_index2 = bucket_index; std::size_t bucket_index2 = bucket_index;
if (end) { if (next) {
bucket_index2 = node_bucket(static_cast<node_pointer>(end)); bucket_index2 = node_bucket(next);
// If begin and end are in the same bucket, then // If next is in the same bucket, then there's nothing to do.
// there's nothing to do. if (bucket_index == bucket_index2) {
if (bucket_index == bucket_index2)
return bucket_index2; return bucket_index2;
}
// Update the bucket containing end. // Update the bucket containing next.
get_bucket(bucket_index2)->next_ = prev; get_bucket(bucket_index2)->next_ = prev;
} }
// Check if this bucket is now empty. // Check if this bucket is now empty.
bucket_pointer this_bucket = get_bucket(bucket_index); bucket_pointer this_bucket = get_bucket(bucket_index);
if (this_bucket->next_ == prev) if (this_bucket->next_ == prev) {
this_bucket->next_ = link_pointer(); this_bucket->next_ = link_pointer();
}
return bucket_index2; return bucket_index2;
} }
@ -4047,7 +4043,7 @@ struct table : boost::unordered::detail::functions<typename Types::hasher,
link_pointer prev = this->get_previous_start(bucket_index); link_pointer prev = this->get_previous_start(bucket_index);
while (prev->next_ != i) { while (prev->next_ != i) {
prev = next_for_erase(prev); prev = next_node(prev);
} }
prev->next_ = i->next_; prev->next_ = i->next_;
@ -4091,7 +4087,7 @@ struct table : boost::unordered::detail::functions<typename Types::hasher,
link_pointer prev = this->get_previous_start(bucket_index); link_pointer prev = this->get_previous_start(bucket_index);
while (prev->next_ != i) { while (prev->next_ != i) {
prev = next_for_erase(prev); prev = next_node(prev);
} }
// Delete the nodes. // Delete the nodes.