|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r74767 - trunk/boost/unordered/detail
From: dnljms_at_[hidden]
Date: 2011-10-06 17:31:26
Author: danieljames
Date: 2011-10-06 17:31:25 EDT (Thu, 06 Oct 2011)
New Revision: 74767
URL: http://svn.boost.org/trac/boost/changeset/74767
Log:
Unordered: some more formatting + namespaces
Text files modified:
trunk/boost/unordered/detail/equivalent.hpp | 89 +++++++++++++++++++++++----------------
trunk/boost/unordered/detail/unique.hpp | 64 ++++++++++++++++------------
2 files changed, 90 insertions(+), 63 deletions(-)
Modified: trunk/boost/unordered/detail/equivalent.hpp
==============================================================================
--- trunk/boost/unordered/detail/equivalent.hpp (original)
+++ trunk/boost/unordered/detail/equivalent.hpp 2011-10-06 17:31:25 EDT (Thu, 06 Oct 2011)
@@ -69,7 +69,8 @@
// If the allocator uses raw pointers use grouped_ptr_node
// Otherwise use grouped_node.
- template <typename A, typename T, typename VoidPointer, typename NodePtr, typename BucketPtr>
+ template <typename A, typename T,
+ typename VoidPointer, typename NodePtr, typename BucketPtr>
struct pick_grouped_node2
{
typedef boost::unordered::detail::grouped_node<VoidPointer, T> node;
@@ -118,7 +119,7 @@
template <typename A, typename H, typename P>
struct multiset
{
- typedef multiset<A, H, P> types;
+ typedef boost::unordered::detail::multiset<A, H, P> types;
typedef A allocator;
typedef H hasher;
@@ -129,18 +130,19 @@
typedef typename traits::void_pointer void_pointer;
typedef value_type key_type;
- typedef typename boost::unordered::detail::pick_grouped_node<A, value_type>::node node;
- typedef typename boost::unordered::detail::pick_grouped_node<A, value_type>::bucket bucket;
- typedef typename boost::unordered::detail::pick_grouped_node<A, value_type>::link_pointer link_pointer;
- typedef boost::unordered::detail::grouped_table_impl<types> table;
+ typedef boost::unordered::detail::pick_grouped_node<A, value_type> pick;
+ typedef typename pick::node node;
+ typedef typename pick::bucket bucket;
+ typedef typename pick::link_pointer link_pointer;
+ typedef boost::unordered::detail::grouped_table_impl<types> table;
typedef boost::unordered::detail::set_extractor<value_type> extractor;
};
template <typename A, typename K, typename H, typename P>
struct multimap
{
- typedef multimap<A, K, H, P> types;
+ typedef boost::unordered::detail::multimap<A, K, H, P> types;
typedef A allocator;
typedef H hasher;
@@ -151,12 +153,14 @@
typedef typename traits::value_type value_type;
typedef typename traits::void_pointer void_pointer;
- typedef typename boost::unordered::detail::pick_grouped_node<A, value_type>::node node;
- typedef typename boost::unordered::detail::pick_grouped_node<A, value_type>::bucket bucket;
- typedef typename boost::unordered::detail::pick_grouped_node<A, value_type>::link_pointer link_pointer;
- typedef boost::unordered::detail::grouped_table_impl<types> table;
+ typedef boost::unordered::detail::pick_grouped_node<A, value_type> pick;
+ typedef typename pick::node node;
+ typedef typename pick::bucket bucket;
+ typedef typename pick::link_pointer link_pointer;
- typedef boost::unordered::detail::map_extractor<key_type, value_type> extractor;
+ typedef boost::unordered::detail::grouped_table_impl<types> table;
+ typedef boost::unordered::detail::map_extractor<key_type, value_type>
+ extractor;
};
template <typename Types>
@@ -234,7 +238,8 @@
return node_pointer();
}
- n = static_cast<node_pointer>(static_cast<node_pointer>(n->group_prev_)->next_);
+ n = static_cast<node_pointer>(
+ static_cast<node_pointer>(n->group_prev_)->next_);
}
}
@@ -273,8 +278,10 @@
{
node_pointer n2 = other.find_matching_node(n1);
if (!n2) return false;
- node_pointer end1 = static_cast<node_pointer>(static_cast<node_pointer>(n1->group_prev_)->next_);
- node_pointer end2 = static_cast<node_pointer>(static_cast<node_pointer>(n2->group_prev_)->next_);
+ node_pointer end1 = static_cast<node_pointer>(
+ static_cast<node_pointer>(n1->group_prev_)->next_);
+ node_pointer end2 = static_cast<node_pointer>(
+ static_cast<node_pointer>(n2->group_prev_)->next_);
if (!group_equals(n1, end1, n2, end2)) return false;
n1 = end1;
}
@@ -319,7 +326,8 @@
value_type const& v = n1->value();
if (find(start, n1, v)) continue;
std::size_t matches = count_equal(n2, end2, v);
- if (!matches || matches != 1 + count_equal(static_cast<node_pointer>(n1->next_), end1, v))
+ if (!matches || matches != 1 + count_equal(
+ static_cast<node_pointer>(n1->next_), end1, v))
return false;
}
@@ -334,7 +342,8 @@
return false;
}
- static std::size_t count_equal(node_pointer n, node_pointer end, value_type const& v)
+ static std::size_t count_equal(node_pointer n, node_pointer end,
+ value_type const& v)
{
std::size_t count = 0;
for(;n != end; n = static_cast<node_pointer>(n->next_))
@@ -371,7 +380,8 @@
{
n->next_ = static_cast<node_pointer>(pos->group_prev_)->next_;
n->group_prev_ = pos->group_prev_;
- static_cast<node_pointer>(pos->group_prev_)->next_ = static_cast<link_pointer>(n);
+ static_cast<node_pointer>(pos->group_prev_)->next_ =
+ static_cast<link_pointer>(n);
pos->group_prev_ = static_cast<link_pointer>(n);
}
@@ -402,8 +412,8 @@
if (start_node->next_) {
this->get_bucket(
- static_cast<node_pointer>(start_node->next_)->hash_ %
- this->bucket_count_)->next_ = n;
+ static_cast<node_pointer>(start_node->next_)->hash_
+ % this->bucket_count_)->next_ = n;
}
b->next_ = start_node;
@@ -502,7 +512,7 @@
}
}
- ////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////
// Erase
//
// no throw
@@ -521,18 +531,21 @@
for (;;)
{
if (!prev->next_) return 0;
- std::size_t node_hash = static_cast<node_pointer>(prev->next_)->hash_;
+ std::size_t node_hash =
+ static_cast<node_pointer>(prev->next_)->hash_;
if (node_hash % this->bucket_count_ != bucket_index)
return 0;
if (node_hash == hash &&
- this->key_eq()(k, this->get_key(static_cast<node_pointer>(prev->next_)->value())))
+ this->key_eq()(k, this->get_key(
+ static_cast<node_pointer>(prev->next_)->value())))
break;
prev = static_cast<previous_pointer>(
static_cast<node_pointer>(prev->next_)->group_prev_);
}
node_pointer pos = static_cast<node_pointer>(prev->next_);
- link_pointer end1 = static_cast<node_pointer>(pos->group_prev_)->next_;
+ link_pointer end1 =
+ static_cast<node_pointer>(pos->group_prev_)->next_;
node_pointer end = static_cast<node_pointer>(end1);
prev->next_ = end1;
this->fix_buckets(bucket, prev, end);
@@ -571,7 +584,8 @@
static previous_pointer unlink_node(bucket& b, node_pointer n)
{
node_pointer next = static_cast<node_pointer>(n->next_);
- previous_pointer prev = static_cast<previous_pointer>(n->group_prev_);
+ previous_pointer prev =
+ static_cast<previous_pointer>(n->group_prev_);
if(prev->next_ != n) {
// The node is at the beginning of a group.
@@ -579,7 +593,8 @@
// Find the previous node pointer:
prev = b.next_;
while(prev->next_ != n) {
- prev = static_cast<previous_pointer>(static_cast<node_pointer>(prev->next_)->group_prev_);
+ prev = static_cast<previous_pointer>(
+ static_cast<node_pointer>(prev->next_)->group_prev_);
}
// Remove from group
@@ -609,12 +624,13 @@
return prev;
}
- static previous_pointer unlink_nodes(bucket& b, node_pointer begin, node_pointer end)
+ static previous_pointer unlink_nodes(bucket& b,
+ node_pointer begin, node_pointer end)
{
- previous_pointer prev = static_cast<previous_pointer>(begin->group_prev_);
+ previous_pointer prev = static_cast<previous_pointer>(
+ begin->group_prev_);
if(prev->next_ != static_cast<link_pointer>(begin)) {
-std::cout << "A" << std::endl;
// The node is at the beginning of a group.
// Find the previous node pointer:
@@ -626,7 +642,6 @@
if (end) split_group(end);
}
else {
-std::cout << "B" << std::endl;
node_pointer group1 = split_group(begin);
if (end) {
@@ -653,7 +668,8 @@
{
// Find first node in group.
node_pointer first = split;
- while (static_cast<node_pointer>(first->group_prev_)->next_ == static_cast<link_pointer>(first))
+ while (static_cast<node_pointer>(first->group_prev_)->next_ ==
+ static_cast<link_pointer>(first))
first = static_cast<node_pointer>(first->group_prev_);
if(first == split) return split;
@@ -665,7 +681,7 @@
return first;
}
- ////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////
// copy_buckets_to
//
// Basic exception safety. If an exception is thrown this will
@@ -712,11 +728,11 @@
}
}
- ////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////
// move_buckets_to
//
- // Basic exception safety. The source nodes are left in an unusable state
- // if an exception throws.
+ // Basic exception safety. The source nodes are left in an unusable
+ // state if an exception throws.
static void move_buckets_to(buckets& src, buckets& dst)
{
@@ -788,7 +804,8 @@
// Iterate through the nodes placing them in the correct buckets.
// pre: prev->next_ is not null.
- static previous_pointer place_in_bucket(buckets& dst, previous_pointer prev, node_pointer end)
+ static previous_pointer place_in_bucket(buckets& dst,
+ previous_pointer prev, node_pointer end)
{
bucket_pointer b = dst.get_bucket(end->hash_ % dst.bucket_count_);
Modified: trunk/boost/unordered/detail/unique.hpp
==============================================================================
--- trunk/boost/unordered/detail/unique.hpp (original)
+++ trunk/boost/unordered/detail/unique.hpp 2011-10-06 17:31:25 EDT (Thu, 06 Oct 2011)
@@ -65,7 +65,8 @@
// If the allocator uses raw pointers use ptr_node
// Otherwise use node.
- template <typename A, typename T, typename VoidPointer, typename NodePtr, typename BucketPtr>
+ template <typename A, typename T,
+ typename VoidPointer, typename NodePtr, typename BucketPtr>
struct pick_node2
{
typedef boost::unordered::detail::node<VoidPointer, T> node;
@@ -114,7 +115,7 @@
template <typename A, typename H, typename P>
struct set
{
- typedef set<A, H, P> types;
+ typedef boost::unordered::detail::set<A, H, P> types;
typedef A allocator;
typedef H hasher;
@@ -125,18 +126,19 @@
typedef typename traits::void_pointer void_pointer;
typedef value_type key_type;
- typedef typename boost::unordered::detail::pick_node<A, value_type>::node node;
- typedef typename boost::unordered::detail::pick_node<A, value_type>::bucket bucket;
- typedef typename boost::unordered::detail::pick_node<A, value_type>::link_pointer link_pointer;
- typedef boost::unordered::detail::table_impl<types> table;
+ typedef boost::unordered::detail::pick_node<A, value_type> pick;
+ typedef typename pick::node node;
+ typedef typename pick::bucket bucket;
+ typedef typename pick::link_pointer link_pointer;
+ typedef boost::unordered::detail::table_impl<types> table;
typedef boost::unordered::detail::set_extractor<value_type> extractor;
};
template <typename A, typename K, typename H, typename P>
struct map
{
- typedef map<A, K, H, P> types;
+ typedef boost::unordered::detail::map<A, K, H, P> types;
typedef A allocator;
typedef H hasher;
@@ -147,12 +149,14 @@
typedef typename traits::value_type value_type;
typedef typename traits::void_pointer void_pointer;
- typedef typename boost::unordered::detail::pick_node<A, value_type>::node node;
- typedef typename boost::unordered::detail::pick_node<A, value_type>::bucket bucket;
- typedef typename boost::unordered::detail::pick_node<A, value_type>::link_pointer link_pointer;
- typedef boost::unordered::detail::table_impl<types> table;
+ typedef boost::unordered::detail::pick_node<A, value_type> pick;
+ typedef typename pick::node node;
+ typedef typename pick::bucket bucket;
+ typedef typename pick::link_pointer link_pointer;
- typedef boost::unordered::detail::map_extractor<key_type, value_type> extractor;
+ typedef boost::unordered::detail::table_impl<types> table;
+ typedef boost::unordered::detail::map_extractor<key_type, value_type>
+ extractor;
};
template <typename Types>
@@ -454,12 +458,13 @@
do {
// Note: can't use get_key as '*i' might not be value_type - it
- // could be a pair with first_types as key_type without const or a
- // different second_type.
+ // could be a pair with first_types as key_type without const or
+ // a different second_type.
//
- // TODO: Might be worth storing the value_type instead of the key
- // here. Could be more efficient if '*i' is expensive. Could be
- // less efficient if copying the full value_type is expensive.
+ // TODO: Might be worth storing the value_type instead of the
+ // key here. Could be more efficient if '*i' is expensive. Could
+ // be less efficient if copying the full value_type is
+ // expensive.
insert_range_impl2(a, extractor::extract(*i), i, j);
} while(++i != j);
}
@@ -509,7 +514,7 @@
} while(++i != j);
}
- ////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////
// Erase
//
// no throw
@@ -528,11 +533,13 @@
for (;;)
{
if (!prev->next_) return 0;
- std::size_t node_hash = static_cast<node_pointer>(prev->next_)->hash_;
+ std::size_t node_hash =
+ static_cast<node_pointer>(prev->next_)->hash_;
if (node_hash % this->bucket_count_ != bucket_index)
return 0;
if (node_hash == hash &&
- this->key_eq()(k, this->get_key(static_cast<node_pointer>(prev->next_)->value())))
+ this->key_eq()(k, this->get_key(
+ static_cast<node_pointer>(prev->next_)->value())))
break;
prev = static_cast<previous_pointer>(prev->next_);
}
@@ -578,16 +585,18 @@
return unlink_nodes(b, n, static_cast<node_pointer>(n->next_));
}
- static previous_pointer unlink_nodes(bucket& b, node_pointer begin, node_pointer end)
+ static previous_pointer unlink_nodes(bucket& b,
+ node_pointer begin, node_pointer end)
{
previous_pointer prev = b.next_;
link_pointer begin_void = static_cast<link_pointer>(begin);
- while(prev->next_ != begin_void) prev = static_cast<previous_pointer>(prev->next_);
+ while(prev->next_ != begin_void)
+ prev = static_cast<previous_pointer>(prev->next_);
prev->next_ = static_cast<link_pointer>(end);
return prev;
}
- ////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////
// copy_buckets_to
//
// Basic exception safety. If an exception is thrown this will
@@ -618,11 +627,11 @@
}
}
- ////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////
// move_buckets_to
//
- // Basic exception safety. The source nodes are left in an unusable state
- // if an exception throws.
+ // Basic exception safety. The source nodes are left in an unusable
+ // state if an exception throws.
static void move_buckets_to(buckets& src, buckets& dst)
{
@@ -676,7 +685,8 @@
// Iterate through the nodes placing them in the correct buckets.
// pre: prev->next_ is not null.
- static previous_pointer place_in_bucket(buckets& dst, previous_pointer prev)
+ static previous_pointer place_in_bucket(buckets& dst,
+ previous_pointer prev)
{
node_pointer n = static_cast<node_pointer>(prev->next_);
bucket_pointer b = dst.get_bucket(n->hash_ % dst.bucket_count_);
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk