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

Unordered: Call policy functions as static functions.

Browse Source 
[SVN r77831]
This commit is contained in:
Daniel James
2012-04-08 15:28:26 +00:00
parent 9f199eaa23
commit 4e759b4444
6 changed files with 55 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boost/unordered/detail/equivalent.hpp
+19 -11
View File
@@ -173,6 +173,7 @@ namespace boost { namespace unordered { namespace detail {
typedef typename table::value_type value_type;
typedef typename table::bucket bucket;
typedef typename table::buckets buckets;
typedef typename table::policy policy;
typedef typename table::node_pointer node_pointer;
typedef typename table::node_allocator node_allocator;
typedef typename table::node_allocator_traits node_allocator_traits;
@@ -223,7 +224,8 @@ namespace boost { namespace unordered { namespace detail {
Key const& k,
Pred const& eq) const
{
std::size_t bucket_index = this->to_bucket(this->bucket_count_, hash);
std::size_t bucket_index =
policy::to_bucket(this->bucket_count_, hash);
node_pointer n = this->get_start(bucket_index);
for (;;)
@@ -238,7 +240,8 @@ namespace boost { namespace unordered { namespace detail {
}
else
{
if (this->to_bucket(this->bucket_count_, node_hash) != bucket_index)
if (policy::to_bucket(this->bucket_count_, node_hash)
!= bucket_index)
return node_pointer();
}
@@ -401,23 +404,25 @@ namespace boost { namespace unordered { namespace detail {
if(pos) {
this->add_after_node(n, pos);
if (n->next_) {
std::size_t next_bucket = this->to_bucket(
std::size_t next_bucket = policy::to_bucket(
this->bucket_count_,
static_cast<node_pointer>(n->next_)->hash_);
if (next_bucket != this->to_bucket(this->bucket_count_, hash)) {
if (next_bucket !=
policy::to_bucket(this->bucket_count_, hash)) {
this->get_bucket(next_bucket)->next_ = n;
}
}
}
else {
bucket_pointer b = this->get_bucket(this->to_bucket(this->bucket_count_, hash));
bucket_pointer b = this->get_bucket(
policy::to_bucket(this->bucket_count_, hash));
if (!b->next_)
{
previous_pointer start_node = this->get_previous_start();
if (start_node->next_) {
this->get_bucket(this->to_bucket(this->bucket_count_,
this->get_bucket(policy::to_bucket(this->bucket_count_,
static_cast<node_pointer>(start_node->next_)->hash_
))->next_ = n;
}
@@ -528,7 +533,8 @@ namespace boost { namespace unordered { namespace detail {
if(!this->size_) return 0;
std::size_t hash = this->hash(k);
std::size_t bucket_index = this->to_bucket(this->bucket_count_, hash);
std::size_t bucket_index =
policy::to_bucket(this->bucket_count_, hash);
bucket_pointer bucket = this->get_bucket(bucket_index);
previous_pointer prev = bucket->next_;
@@ -539,7 +545,8 @@ namespace boost { namespace unordered { namespace detail {
if (!prev->next_) return 0;
std::size_t node_hash =
static_cast<node_pointer>(prev->next_)->hash_;
if (this->to_bucket(this->bucket_count_, node_hash) != bucket_index)
if (policy::to_bucket(this->bucket_count_, node_hash)
!= bucket_index)
return 0;
if (node_hash == hash &&
this->key_eq()(k, this->get_key(
@@ -564,7 +571,7 @@ namespace boost { namespace unordered { namespace detail {
node_pointer next = static_cast<node_pointer>(r->next_);
bucket_pointer bucket = this->get_bucket(
this->to_bucket(this->bucket_count_, r->hash_));
policy::to_bucket(this->bucket_count_, r->hash_));
previous_pointer prev = unlink_node(*bucket, r);
this->fix_buckets(bucket, prev, next);
@@ -578,7 +585,8 @@ namespace boost { namespace unordered { namespace detail {
{
if (r1 == r2) return r2;
std::size_t bucket_index = this->to_bucket(this->bucket_count_, r1->hash_);
std::size_t bucket_index =
policy::to_bucket(this->bucket_count_, r1->hash_);
previous_pointer prev = unlink_nodes(
*this->get_bucket(bucket_index), r1, r2);
this->fix_buckets_range(bucket_index, prev, r1, r2);
@@ -813,7 +821,7 @@ namespace boost { namespace unordered { namespace detail {
static previous_pointer place_in_bucket(buckets& dst,
previous_pointer prev, node_pointer end)
{
bucket_pointer b = dst.get_bucket(dst.to_bucket(
bucket_pointer b = dst.get_bucket(policy::to_bucket(
dst.bucket_count_, end->hash_));
if (!b->next_) {