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

Set the high bit in bucket_info_ to false for first node in group

Browse Source 
And true for the reset, so that in containers with unique keys
bucket_info_ is always just the bucket index.
This commit is contained in:
Daniel James
2017-05-01 21:03:11 +01:00
parent 338a94e577
commit b8c754d230
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3313,7 +3313,7 @@ struct table : boost::unordered::detail::functions<typename Types::hasher,
// TODO: Do this need to set_first_in_group ? // TODO: Do this need to set_first_in_group ?
n->bucket_info_ = bucket_index; n->bucket_info_ = bucket_index;
n->set_first_in_group(); // n->set_first_in_group();
if (!b->next_) { if (!b->next_) {
link_pointer start_node = this->get_previous_start(); link_pointer start_node = this->get_previous_start();
@ -3830,6 +3830,7 @@ struct table : boost::unordered::detail::functions<typename Types::hasher,
n->bucket_info_ = bucket_index; n->bucket_info_ = bucket_index;
if (pos) { if (pos) {
n->reset_first_in_group();
n->next_ = pos->next_; n->next_ = pos->next_;
pos->next_ = n; pos->next_ = n;
if (n->next_) { if (n->next_) {
@ -3839,7 +3840,7 @@ struct table : boost::unordered::detail::functions<typename Types::hasher,
} }
} }
} else { } else {
n->set_first_in_group(); // n->set_first_in_group();
bucket_pointer b = this->get_bucket(bucket_index); bucket_pointer b = this->get_bucket(bucket_index);
if (!b->next_) { if (!b->next_) {
@ -4210,7 +4211,7 @@ inline void table<Types>::rehash_impl(std::size_t num_buckets)
} }
n = next; n = next;
n->bucket_info_ = bucket_index; n->bucket_info_ = bucket_index;
// n->reset_first_in_group(); n->reset_first_in_group();
} }
// n is now the last node in the group // n is now the last node in the group
@ -4424,17 +4425,17 @@ struct node : boost::unordered::detail::value_base<T>
std::size_t is_first_in_group() const std::size_t is_first_in_group() const
{ {
return bucket_info_ & ~((std::size_t)-1 >> 1); return !(bucket_info_ & ~((std::size_t)-1 >> 1));
} }
void set_first_in_group() void set_first_in_group()
{ {
bucket_info_ = bucket_info_ | ~((std::size_t)-1 >> 1); bucket_info_ = bucket_info_ & ((std::size_t)-1 >> 1);
} }
void reset_first_in_group() void reset_first_in_group()
{ {
bucket_info_ = bucket_info_ & ((std::size_t)-1 >> 1); bucket_info_ = bucket_info_ | ~((std::size_t)-1 >> 1);
} }
private: private:
@ -4465,17 +4466,17 @@ template <typename T> struct ptr_node : boost::unordered::detail::ptr_bucket
std::size_t is_first_in_group() const std::size_t is_first_in_group() const
{ {
return bucket_info_ & ~((std::size_t)-1 >> 1); return !(bucket_info_ & ~((std::size_t)-1 >> 1));
} }
void set_first_in_group() void set_first_in_group()
{ {
bucket_info_ = bucket_info_ | ~((std::size_t)-1 >> 1); bucket_info_ = bucket_info_ & ((std::size_t)-1 >> 1);
} }
void reset_first_in_group() void reset_first_in_group()
{ {
bucket_info_ = bucket_info_ & ((std::size_t)-1 >> 1); bucket_info_ = bucket_info_ | ~((std::size_t)-1 >> 1);
} }
private: private: