|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r78364 - in trunk: boost/unordered/detail libs/functional/hash/test libs/unordered/doc libs/unordered/test/exception libs/unordered/test/helpers libs/unordered/test/unordered
From: dnljms_at_[hidden]
Date: 2012-05-07 06:57:38
Author: danieljames
Date: 2012-05-07 06:57:35 EDT (Mon, 07 May 2012)
New Revision: 78364
URL: http://svn.boost.org/trac/boost/changeset/78364
Log:
Unordered: Avoid `-Wshadow` warnings. Refs #6190.
Text files modified:
trunk/boost/unordered/detail/buckets.hpp | 10 ++++--
trunk/boost/unordered/detail/emplace_args.hpp | 10 +++---
trunk/boost/unordered/detail/equivalent.hpp | 60 ++++++++++++++++++++--------------------
trunk/boost/unordered/detail/table.hpp | 8 ++--
trunk/boost/unordered/detail/unique.hpp | 58 +++++++++++++++++++-------------------
trunk/libs/functional/hash/test/Jamfile.v2 | 4 +-
trunk/libs/unordered/doc/changes.qbk | 6 ++-
trunk/libs/unordered/test/exception/assign_exception_tests.cpp | 2
trunk/libs/unordered/test/exception/constructor_exception_tests.cpp | 2
trunk/libs/unordered/test/exception/copy_exception_tests.cpp | 2
trunk/libs/unordered/test/exception/erase_exception_tests.cpp | 2
trunk/libs/unordered/test/exception/insert_exception_tests.cpp | 2
trunk/libs/unordered/test/exception/rehash_exception_tests.cpp | 2
trunk/libs/unordered/test/exception/swap_exception_tests.cpp | 2
trunk/libs/unordered/test/helpers/list.hpp | 6 ++--
trunk/libs/unordered/test/helpers/tracker.hpp | 12 ++++----
trunk/libs/unordered/test/unordered/assign_tests.cpp | 2
trunk/libs/unordered/test/unordered/bucket_tests.cpp | 2
trunk/libs/unordered/test/unordered/constructor_tests.cpp | 2
trunk/libs/unordered/test/unordered/copy_tests.cpp | 2
trunk/libs/unordered/test/unordered/erase_tests.cpp | 2
trunk/libs/unordered/test/unordered/find_tests.cpp | 2
trunk/libs/unordered/test/unordered/insert_tests.cpp | 2
trunk/libs/unordered/test/unordered/load_factor_tests.cpp | 2
trunk/libs/unordered/test/unordered/move_tests.cpp | 2
trunk/libs/unordered/test/unordered/rehash_tests.cpp | 2
trunk/libs/unordered/test/unordered/swap_tests.cpp | 2
27 files changed, 107 insertions(+), 103 deletions(-)
Modified: trunk/boost/unordered/detail/buckets.hpp
==============================================================================
--- trunk/boost/unordered/detail/buckets.hpp (original)
+++ trunk/boost/unordered/detail/buckets.hpp 2012-05-07 06:57:35 EDT (Mon, 07 May 2012)
@@ -861,22 +861,24 @@
// This is called after erasing a node or group of nodes to fix up
// the bucket pointers.
- void fix_buckets(bucket_pointer bucket,
+ void fix_buckets(bucket_pointer this_bucket,
previous_pointer prev, node_pointer next)
{
if (!next)
{
- if (bucket->next_ == prev) bucket->next_ = node_pointer();
+ if (this_bucket->next_ == prev)
+ this_bucket->next_ = node_pointer();
}
else
{
bucket_pointer next_bucket = this->get_bucket(
policy::to_bucket(this->bucket_count_, next->hash_));
- if (next_bucket != bucket)
+ if (next_bucket != this_bucket)
{
next_bucket->next_ = prev;
- if (bucket->next_ == prev) bucket->next_ = node_pointer();
+ if (this_bucket->next_ == prev)
+ this_bucket->next_ = node_pointer();
}
}
}
Modified: trunk/boost/unordered/detail/emplace_args.hpp
==============================================================================
--- trunk/boost/unordered/detail/emplace_args.hpp (original)
+++ trunk/boost/unordered/detail/emplace_args.hpp 2012-05-07 06:57:35 EDT (Mon, 07 May 2012)
@@ -111,7 +111,7 @@
{ \
BOOST_PP_REPEAT_##z(n, BOOST_UNORDERED_EARGS_MEMBER, _) \
BOOST_PP_CAT(emplace_args, n) ( \
- BOOST_PP_ENUM_BINARY_PARAMS_Z(z, n, Arg, a) \
+ BOOST_PP_ENUM_BINARY_PARAMS_Z(z, n, Arg, b) \
) : BOOST_PP_ENUM_##z(n, BOOST_UNORDERED_EARGS_INIT, _) \
{} \
\
@@ -121,12 +121,12 @@
inline BOOST_PP_CAT(emplace_args, n) < \
BOOST_PP_ENUM_PARAMS_Z(z, n, A) \
> create_emplace_args( \
- BOOST_PP_ENUM_##z(n, BOOST_UNORDERED_FWD_PARAM, a) \
+ BOOST_PP_ENUM_##z(n, BOOST_UNORDERED_FWD_PARAM, b) \
) \
{ \
BOOST_PP_CAT(emplace_args, n) < \
BOOST_PP_ENUM_PARAMS_Z(z, n, A) \
- > e(BOOST_PP_ENUM_PARAMS_Z(z, n, a)); \
+ > e(BOOST_PP_ENUM_PARAMS_Z(z, n, b)); \
return e; \
}
@@ -138,7 +138,7 @@
#define BOOST_UNORDERED_EARGS_INIT(z, n, _) \
BOOST_PP_CAT(a, n)( \
- boost::forward<BOOST_PP_CAT(A,n)>(BOOST_PP_CAT(a, n)))
+ boost::forward<BOOST_PP_CAT(A,n)>(BOOST_PP_CAT(b, n)))
#else
@@ -148,7 +148,7 @@
BOOST_PP_CAT(Arg, n) BOOST_PP_CAT(a, n);
#define BOOST_UNORDERED_EARGS_INIT(z, n, _) \
- BOOST_PP_CAT(a, n)(BOOST_PP_CAT(a, n))
+ BOOST_PP_CAT(a, n)(BOOST_PP_CAT(b, n))
#endif
Modified: trunk/boost/unordered/detail/equivalent.hpp
==============================================================================
--- trunk/boost/unordered/detail/equivalent.hpp (original)
+++ trunk/boost/unordered/detail/equivalent.hpp 2012-05-07 06:57:35 EDT (Mon, 07 May 2012)
@@ -257,12 +257,12 @@
template <class Key, class Pred>
iterator find_node_impl(
- std::size_t hash,
+ std::size_t key_hash,
Key const& k,
Pred const& eq) const
{
std::size_t bucket_index =
- policy::to_bucket(this->bucket_count_, hash);
+ policy::to_bucket(this->bucket_count_, key_hash);
iterator n = this->get_start(bucket_index);
for (;;)
@@ -270,7 +270,7 @@
if (!n.node_) return n;
std::size_t node_hash = n.node_->hash_;
- if (hash == node_hash)
+ if (key_hash == node_hash)
{
if (eq(k, this->get_key(*n)))
return n;
@@ -292,14 +292,14 @@
iterator n = this->find_node(k);
if (!n.node_) return 0;
- std::size_t count = 0;
+ std::size_t x = 0;
node_pointer it = n.node_;
do {
it = static_cast<node_pointer>(it->group_prev_);
- ++count;
+ ++x;
} while(it != n.node_);
- return count;
+ return x;
}
std::pair<iterator, iterator>
@@ -432,11 +432,11 @@
inline iterator add_node(
node_constructor& a,
- std::size_t hash,
+ std::size_t key_hash,
iterator pos)
{
node_pointer n = a.release();
- n->hash_ = hash;
+ n->hash_ = key_hash;
if (pos.node_) {
this->add_after_node(n, pos.node_);
if (n->next_) {
@@ -444,14 +444,14 @@
this->bucket_count_,
static_cast<node_pointer>(n->next_)->hash_);
if (next_bucket !=
- policy::to_bucket(this->bucket_count_, hash)) {
+ policy::to_bucket(this->bucket_count_, key_hash)) {
this->get_bucket(next_bucket)->next_ = n;
}
}
}
else {
bucket_pointer b = this->get_bucket(
- policy::to_bucket(this->bucket_count_, hash));
+ policy::to_bucket(this->bucket_count_, key_hash));
if (!b->next_)
{
@@ -480,20 +480,20 @@
iterator emplace_impl(node_constructor& a)
{
key_type const& k = this->get_key(a.value());
- std::size_t hash = this->hash(k);
- iterator position = this->find_node(hash, k);
+ std::size_t key_hash = this->hash(k);
+ iterator position = this->find_node(key_hash, k);
// reserve has basic exception safety if the hash function
// throws, strong otherwise.
this->reserve_for_insert(this->size_ + 1);
- return this->add_node(a, hash, position);
+ return this->add_node(a, key_hash, position);
}
void emplace_impl_no_rehash(node_constructor& a)
{
key_type const& k = this->get_key(a.value());
- std::size_t hash = this->hash(k);
- this->add_node(a, hash, this->find_node(hash, k));
+ std::size_t key_hash = this->hash(k);
+ this->add_node(a, key_hash, this->find_node(key_hash, k));
}
#if defined(BOOST_NO_RVALUE_REFERENCES)
@@ -567,12 +567,12 @@
{
if(!this->size_) return 0;
- std::size_t hash = this->hash(k);
+ std::size_t key_hash = this->hash(k);
std::size_t bucket_index =
- policy::to_bucket(this->bucket_count_, hash);
- bucket_pointer bucket = this->get_bucket(bucket_index);
+ policy::to_bucket(this->bucket_count_, key_hash);
+ bucket_pointer this_bucket = this->get_bucket(bucket_index);
- previous_pointer prev = bucket->next_;
+ previous_pointer prev = this_bucket->next_;
if (!prev) return 0;
for (;;)
@@ -583,7 +583,7 @@
if (policy::to_bucket(this->bucket_count_, node_hash)
!= bucket_index)
return 0;
- if (node_hash == hash &&
+ if (node_hash == key_hash &&
this->key_eq()(k, this->get_key(
static_cast<node_pointer>(prev->next_)->value())))
break;
@@ -596,7 +596,7 @@
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);
+ this->fix_buckets(this_bucket, prev, end);
return this->delete_nodes(c_iterator(pos), c_iterator(end));
}
@@ -606,11 +606,11 @@
iterator next(r.node_);
++next;
- bucket_pointer bucket = this->get_bucket(
+ bucket_pointer this_bucket = this->get_bucket(
policy::to_bucket(this->bucket_count_, r.node_->hash_));
- previous_pointer prev = unlink_node(*bucket, r.node_);
+ previous_pointer prev = unlink_node(*this_bucket, r.node_);
- this->fix_buckets(bucket, prev, next.node_);
+ this->fix_buckets(this_bucket, prev, next.node_);
this->delete_node(r);
@@ -749,7 +749,7 @@
previous_pointer prev = dst.get_previous_start();
while (n.node_) {
- std::size_t hash = n.node_->hash_;
+ std::size_t key_hash = n.node_->hash_;
iterator group_end(
static_cast<node_pointer>(
static_cast<node_pointer>(n.node_->group_prev_)->next_
@@ -760,7 +760,7 @@
node_pointer first_node = a.release();
node_pointer end = first_node;
- first_node->hash_ = hash;
+ first_node->hash_ = key_hash;
prev->next_ = static_cast<link_pointer>(first_node);
++dst.size_;
@@ -769,7 +769,7 @@
a.construct_node();
a.construct_value2(*n);
end = a.release();
- end->hash_ = hash;
+ end->hash_ = key_hash;
add_after_node(end, first_node);
++dst.size_;
}
@@ -796,7 +796,7 @@
previous_pointer prev = dst.get_previous_start();
while (n.node_) {
- std::size_t hash = n.node_->hash_;
+ std::size_t key_hash = n.node_->hash_;
iterator group_end(
static_cast<node_pointer>(
static_cast<node_pointer>(n.node_->group_prev_)->next_
@@ -807,7 +807,7 @@
node_pointer first_node = a.release();
node_pointer end = first_node;
- first_node->hash_ = hash;
+ first_node->hash_ = key_hash;
prev->next_ = static_cast<link_pointer>(first_node);
++dst.size_;
@@ -816,7 +816,7 @@
a.construct_node();
a.construct_value2(boost::move(*n));
end = a.release();
- end->hash_ = hash;
+ end->hash_ = key_hash;
add_after_node(end, first_node);
++dst.size_;
}
Modified: trunk/boost/unordered/detail/table.hpp
==============================================================================
--- trunk/boost/unordered/detail/table.hpp (original)
+++ trunk/boost/unordered/detail/table.hpp 2012-05-07 06:57:35 EDT (Mon, 07 May 2012)
@@ -348,21 +348,21 @@
template <typename Key, typename Hash, typename Pred>
iterator generic_find_node(
Key const& k,
- Hash const& hash_function,
+ Hash const& hf,
Pred const& eq) const
{
if (!this->size_) return iterator();
return static_cast<table_impl const*>(this)->
- find_node_impl(policy::apply_hash(hash_function, k), k, eq);
+ find_node_impl(policy::apply_hash(hf, k), k, eq);
}
iterator find_node(
- std::size_t hash,
+ std::size_t key_hash,
key_type const& k) const
{
if (!this->size_) return iterator();
return static_cast<table_impl const*>(this)->
- find_node_impl(hash, k, this->key_eq());
+ find_node_impl(key_hash, k, this->key_eq());
}
iterator find_node(key_type const& k) const
Modified: trunk/boost/unordered/detail/unique.hpp
==============================================================================
--- trunk/boost/unordered/detail/unique.hpp (original)
+++ trunk/boost/unordered/detail/unique.hpp 2012-05-07 06:57:35 EDT (Mon, 07 May 2012)
@@ -253,12 +253,12 @@
template <class Key, class Pred>
iterator find_node_impl(
- std::size_t hash,
+ std::size_t key_hash,
Key const& k,
Pred const& eq) const
{
std::size_t bucket_index =
- policy::to_bucket(this->bucket_count_, hash);
+ policy::to_bucket(this->bucket_count_, key_hash);
iterator n = this->get_start(bucket_index);
for (;;)
@@ -266,7 +266,7 @@
if (!n.node_) return n;
std::size_t node_hash = n.node_->hash_;
- if (hash == node_hash)
+ if (key_hash == node_hash)
{
if (eq(k, this->get_key(*n)))
return n;
@@ -334,13 +334,13 @@
inline iterator add_node(
node_constructor& a,
- std::size_t hash)
+ std::size_t key_hash)
{
node_pointer n = a.release();
- n->hash_ = hash;
+ n->hash_ = key_hash;
bucket_pointer b = this->get_bucket(
- policy::to_bucket(this->bucket_count_, hash));
+ policy::to_bucket(this->bucket_count_, key_hash));
if (!b->next_)
{
@@ -370,8 +370,8 @@
{
typedef typename value_type::second_type mapped_type;
- std::size_t hash = this->hash(k);
- iterator pos = this->find_node(hash, k);
+ std::size_t key_hash = this->hash(k);
+ iterator pos = this->find_node(key_hash, k);
if (pos.node_) return *pos;
@@ -391,7 +391,7 @@
#endif
this->reserve_for_insert(this->size_ + 1);
- return *add_node(a, hash);
+ return *add_node(a, key_hash);
}
#if defined(BOOST_NO_RVALUE_REFERENCES)
@@ -431,8 +431,8 @@
emplace_return emplace_impl(key_type const& k,
BOOST_UNORDERED_EMPLACE_ARGS)
{
- std::size_t hash = this->hash(k);
- iterator pos = this->find_node(hash, k);
+ std::size_t key_hash = this->hash(k);
+ iterator pos = this->find_node(key_hash, k);
if (pos.node_) return emplace_return(pos, false);
@@ -445,21 +445,21 @@
// reserve has basic exception safety if the hash function
// throws, strong otherwise.
this->reserve_for_insert(this->size_ + 1);
- return emplace_return(this->add_node(a, hash), true);
+ return emplace_return(this->add_node(a, key_hash), true);
}
emplace_return emplace_impl_with_node(node_constructor& a)
{
key_type const& k = this->get_key(a.value());
- std::size_t hash = this->hash(k);
- iterator pos = this->find_node(hash, k);
+ std::size_t key_hash = this->hash(k);
+ iterator pos = this->find_node(key_hash, k);
if (pos.node_) return emplace_return(pos, false);
// reserve has basic exception safety if the hash function
// throws, strong otherwise.
this->reserve_for_insert(this->size_ + 1);
- return emplace_return(this->add_node(a, hash), true);
+ return emplace_return(this->add_node(a, key_hash), true);
}
template <BOOST_UNORDERED_EMPLACE_TEMPLATE>
@@ -515,12 +515,12 @@
void insert_range_empty(node_constructor& a, key_type const& k,
InputIt i, InputIt j)
{
- std::size_t hash = this->hash(k);
+ std::size_t key_hash = this->hash(k);
a.construct_node();
a.construct_value2(*i);
this->reserve_for_insert(this->size_ +
boost::unordered::detail::insert_size(i, j));
- this->add_node(a, hash);
+ this->add_node(a, key_hash);
}
template <class InputIt>
@@ -528,8 +528,8 @@
InputIt i, InputIt j)
{
// No side effects in this initial code
- std::size_t hash = this->hash(k);
- iterator pos = this->find_node(hash, k);
+ std::size_t key_hash = this->hash(k);
+ iterator pos = this->find_node(key_hash, k);
if (!pos.node_) {
a.construct_node();
@@ -540,7 +540,7 @@
boost::unordered::detail::insert_size(i, j));
// Nothing after this point can throw.
- this->add_node(a, hash);
+ this->add_node(a, key_hash);
}
}
@@ -565,12 +565,12 @@
{
if(!this->size_) return 0;
- std::size_t hash = this->hash(k);
+ std::size_t key_hash = this->hash(k);
std::size_t bucket_index =
- policy::to_bucket(this->bucket_count_, hash);
- bucket_pointer bucket = this->get_bucket(bucket_index);
+ policy::to_bucket(this->bucket_count_, key_hash);
+ bucket_pointer this_bucket = this->get_bucket(bucket_index);
- previous_pointer prev = bucket->next_;
+ previous_pointer prev = this_bucket->next_;
if (!prev) return 0;
for (;;)
@@ -581,7 +581,7 @@
if (policy::to_bucket(this->bucket_count_, node_hash)
!= bucket_index)
return 0;
- if (node_hash == hash &&
+ if (node_hash == key_hash &&
this->key_eq()(k, this->get_key(
static_cast<node_pointer>(prev->next_)->value())))
break;
@@ -591,7 +591,7 @@
node_pointer pos = static_cast<node_pointer>(prev->next_);
node_pointer end = static_cast<node_pointer>(pos->next_);
prev->next_ = pos->next_;
- this->fix_buckets(bucket, prev, end);
+ this->fix_buckets(this_bucket, prev, end);
return this->delete_nodes(c_iterator(pos), c_iterator(end));
}
@@ -601,11 +601,11 @@
iterator next(r.node_);
++next;
- bucket_pointer bucket = this->get_bucket(
+ bucket_pointer this_bucket = this->get_bucket(
policy::to_bucket(this->bucket_count_, r.node_->hash_));
- previous_pointer prev = unlink_node(*bucket, r.node_);
+ previous_pointer prev = unlink_node(*this_bucket, r.node_);
- this->fix_buckets(bucket, prev, next.node_);
+ this->fix_buckets(this_bucket, prev, next.node_);
this->delete_node(r);
Modified: trunk/libs/functional/hash/test/Jamfile.v2
==============================================================================
--- trunk/libs/functional/hash/test/Jamfile.v2 (original)
+++ trunk/libs/functional/hash/test/Jamfile.v2 2012-05-07 06:57:35 EDT (Mon, 07 May 2012)
@@ -10,8 +10,8 @@
<warnings>all
<toolset>intel:<warnings>on
<toolset>intel:<cxxflags>-strict-ansi
- <toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal"
- <toolset>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal"
+ <toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow"
+ <toolset>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow"
<toolset>msvc:<warnings-as-errors>on
#<toolset>gcc:<warnings-as-errors>on
#<toolset>darwin:<warnings-as-errors>on
Modified: trunk/libs/unordered/doc/changes.qbk
==============================================================================
--- trunk/libs/unordered/doc/changes.qbk (original)
+++ trunk/libs/unordered/doc/changes.qbk 2012-05-07 06:57:35 EDT (Mon, 07 May 2012)
@@ -178,10 +178,12 @@
[h2 Boost 1.50.0]
* Fix equality for `unordered_multiset` and `unordered_multimap`.
-* [@http://svn.boost.org/trac/boost/ticket/6771 Ticket 6771]:
+* [@https://svn.boost.org/trac/boost/ticket/6771 Ticket 6771]:
Avoid gcc's `-Wfloat-equal` warning.
-* [@http://svn.boost.org/trac/boost/ticket/6784 Ticket 6784]:
+* [@https://svn.boost.org/trac/boost/ticket/6784 Ticket 6784]:
Fix some Sun specific code.
+* [@https://svn.boost.org/trac/boost/ticket/6190 Ticket 6190]:
+ Avoid gcc's `-Wshadow` warning.
* Remove some of the smaller prime number of buckets, as they may make
collisions quite probable (e.g. multiples of 5 are very common because
we used base 10).
Modified: trunk/libs/unordered/test/exception/assign_exception_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/exception/assign_exception_tests.cpp (original)
+++ trunk/libs/unordered/test/exception/assign_exception_tests.cpp 2012-05-07 06:57:35 EDT (Mon, 07 May 2012)
@@ -11,7 +11,7 @@
#pragma warning(disable:4512) // assignment operator could not be generated
#endif
-test::seed_t seed(12847);
+test::seed_t initialize_seed(12847);
template <class T>
struct self_assign_base : public test::exception_base
Modified: trunk/libs/unordered/test/exception/constructor_exception_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/exception/constructor_exception_tests.cpp (original)
+++ trunk/libs/unordered/test/exception/constructor_exception_tests.cpp 2012-05-07 06:57:35 EDT (Mon, 07 May 2012)
@@ -9,7 +9,7 @@
template <typename T> inline void avoid_unused_warning(T const&) {}
-test::seed_t seed(91274);
+test::seed_t initialize_seed(91274);
struct objects
{
Modified: trunk/libs/unordered/test/exception/copy_exception_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/exception/copy_exception_tests.cpp (original)
+++ trunk/libs/unordered/test/exception/copy_exception_tests.cpp 2012-05-07 06:57:35 EDT (Mon, 07 May 2012)
@@ -8,7 +8,7 @@
template <typename T> inline void avoid_unused_warning(T const&) {}
-test::seed_t seed(73041);
+test::seed_t initialize_seed(73041);
template <class T>
struct copy_test1 : public test::exception_base
Modified: trunk/libs/unordered/test/exception/erase_exception_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/exception/erase_exception_tests.cpp (original)
+++ trunk/libs/unordered/test/exception/erase_exception_tests.cpp 2012-05-07 06:57:35 EDT (Mon, 07 May 2012)
@@ -8,7 +8,7 @@
#include "../helpers/invariants.hpp"
#include "../helpers/helpers.hpp"
-test::seed_t seed(835193);
+test::seed_t initialize_seed(835193);
template <class T>
struct erase_test_base : public test::exception_base
Modified: trunk/libs/unordered/test/exception/insert_exception_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/exception/insert_exception_tests.cpp (original)
+++ trunk/libs/unordered/test/exception/insert_exception_tests.cpp 2012-05-07 06:57:35 EDT (Mon, 07 May 2012)
@@ -11,7 +11,7 @@
#include <boost/utility.hpp>
#include <cmath>
-test::seed_t seed(747373);
+test::seed_t initialize_seed(747373);
template <class T>
struct insert_test_base : public test::exception_base
Modified: trunk/libs/unordered/test/exception/rehash_exception_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/exception/rehash_exception_tests.cpp (original)
+++ trunk/libs/unordered/test/exception/rehash_exception_tests.cpp 2012-05-07 06:57:35 EDT (Mon, 07 May 2012)
@@ -11,7 +11,7 @@
#include <iostream>
-test::seed_t seed(3298597);
+test::seed_t initialize_seed(3298597);
template <class T>
struct rehash_test_base : public test::exception_base
Modified: trunk/libs/unordered/test/exception/swap_exception_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/exception/swap_exception_tests.cpp (original)
+++ trunk/libs/unordered/test/exception/swap_exception_tests.cpp 2012-05-07 06:57:35 EDT (Mon, 07 May 2012)
@@ -11,7 +11,7 @@
#pragma warning(disable:4512) // assignment operator could not be generated
#endif
-test::seed_t seed(9387);
+test::seed_t initialize_seed(9387);
template <class T>
struct self_swap_base : public test::exception_base
Modified: trunk/libs/unordered/test/helpers/list.hpp
==============================================================================
--- trunk/libs/unordered/test/helpers/list.hpp (original)
+++ trunk/libs/unordered/test/helpers/list.hpp 2012-05-07 06:57:35 EDT (Mon, 07 May 2012)
@@ -219,14 +219,14 @@
data_.last_ptr_ = &data_.first_;
}
- void erase(const_iterator start, const_iterator end) {
+ void erase(const_iterator i, const_iterator j) {
node** ptr = &data_.first_;
- while(*ptr != start.ptr_) {
+ while(*ptr != i.ptr_) {
ptr = &(*ptr)->next_;
}
- while(*ptr != end.ptr_) {
+ while(*ptr != j.ptr_) {
node* to_delete = *ptr;
*ptr = (*ptr)->next_;
--data_.size_;
Modified: trunk/libs/unordered/test/helpers/tracker.hpp
==============================================================================
--- trunk/libs/unordered/test/helpers/tracker.hpp (original)
+++ trunk/libs/unordered/test/helpers/tracker.hpp 2012-05-07 06:57:35 EDT (Mon, 07 May 2012)
@@ -124,8 +124,8 @@
: base()
{}
- explicit ordered(key_compare const& compare)
- : base(compare)
+ explicit ordered(key_compare const& kc)
+ : base(kc)
{}
void compare(X const& x)
@@ -143,10 +143,10 @@
}
template <class It>
- void insert_range(It begin, It end) {
- while(begin != end) {
- this->insert(*begin);
- ++begin;
+ void insert_range(It b, It e) {
+ while(b != e) {
+ this->insert(*b);
+ ++b;
}
}
};
Modified: trunk/libs/unordered/test/unordered/assign_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/assign_tests.cpp (original)
+++ trunk/libs/unordered/test/unordered/assign_tests.cpp 2012-05-07 06:57:35 EDT (Mon, 07 May 2012)
@@ -22,7 +22,7 @@
namespace assign_tests {
-test::seed_t seed(96785);
+test::seed_t initialize_seed(96785);
template <class T>
void assign_tests1(T*,
Modified: trunk/libs/unordered/test/unordered/bucket_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/bucket_tests.cpp (original)
+++ trunk/libs/unordered/test/unordered/bucket_tests.cpp 2012-05-07 06:57:35 EDT (Mon, 07 May 2012)
@@ -21,7 +21,7 @@
namespace bucket_tests {
-test::seed_t seed(54635);
+test::seed_t initialize_seed(54635);
template <class X>
void tests(X* = 0, test::random_generator generator = test::default_generator)
Modified: trunk/libs/unordered/test/unordered/constructor_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/constructor_tests.cpp (original)
+++ trunk/libs/unordered/test/unordered/constructor_tests.cpp 2012-05-07 06:57:35 EDT (Mon, 07 May 2012)
@@ -18,7 +18,7 @@
namespace constructor_tests {
-test::seed_t seed(356730);
+test::seed_t initialize_seed(356730);
template <class T>
void constructor_tests1(T*,
Modified: trunk/libs/unordered/test/unordered/copy_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/copy_tests.cpp (original)
+++ trunk/libs/unordered/test/unordered/copy_tests.cpp 2012-05-07 06:57:35 EDT (Mon, 07 May 2012)
@@ -16,7 +16,7 @@
#include "../helpers/equivalent.hpp"
#include "../helpers/invariants.hpp"
-test::seed_t seed(9063);
+test::seed_t initialize_seed(9063);
namespace copy_tests
{
Modified: trunk/libs/unordered/test/unordered/erase_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/erase_tests.cpp (original)
+++ trunk/libs/unordered/test/unordered/erase_tests.cpp 2012-05-07 06:57:35 EDT (Mon, 07 May 2012)
@@ -21,7 +21,7 @@
namespace erase_tests
{
-test::seed_t seed(85638);
+test::seed_t initialize_seed(85638);
template <class Container>
void erase_tests1(Container*,
Modified: trunk/libs/unordered/test/unordered/find_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/find_tests.cpp (original)
+++ trunk/libs/unordered/test/unordered/find_tests.cpp 2012-05-07 06:57:35 EDT (Mon, 07 May 2012)
@@ -17,7 +17,7 @@
namespace find_tests
{
-test::seed_t seed(78937);
+test::seed_t initialize_seed(78937);
template <class X>
void find_tests1(X*, test::random_generator generator = test::default_generator)
Modified: trunk/libs/unordered/test/unordered/insert_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/insert_tests.cpp (original)
+++ trunk/libs/unordered/test/unordered/insert_tests.cpp 2012-05-07 06:57:35 EDT (Mon, 07 May 2012)
@@ -21,7 +21,7 @@
namespace insert_tests {
-test::seed_t seed(243432);
+test::seed_t initialize_seed(243432);
template <class X>
void unique_insert_tests1(X*,
Modified: trunk/libs/unordered/test/unordered/load_factor_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/load_factor_tests.cpp (original)
+++ trunk/libs/unordered/test/unordered/load_factor_tests.cpp 2012-05-07 06:57:35 EDT (Mon, 07 May 2012)
@@ -20,7 +20,7 @@
namespace load_factor_tests
{
-test::seed_t seed(783656);
+test::seed_t initialize_seed(783656);
template <class X>
void set_load_factor_tests(X* = 0)
Modified: trunk/libs/unordered/test/unordered/move_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/move_tests.cpp (original)
+++ trunk/libs/unordered/test/unordered/move_tests.cpp 2012-05-07 06:57:35 EDT (Mon, 07 May 2012)
@@ -22,7 +22,7 @@
namespace move_tests
{
- test::seed_t seed(98624);
+ test::seed_t initialize_seed(98624);
#if defined(BOOST_UNORDERED_USE_MOVE) || !defined(BOOST_NO_RVALUE_REFERENCES)
#define BOOST_UNORDERED_TEST_MOVING 1
#else
Modified: trunk/libs/unordered/test/unordered/rehash_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/rehash_tests.cpp (original)
+++ trunk/libs/unordered/test/unordered/rehash_tests.cpp 2012-05-07 06:57:35 EDT (Mon, 07 May 2012)
@@ -15,7 +15,7 @@
namespace rehash_tests
{
-test::seed_t seed(2974);
+test::seed_t initialize_seed(2974);
template <class X>
bool postcondition(X const& x, BOOST_DEDUCED_TYPENAME X::size_type n)
Modified: trunk/libs/unordered/test/unordered/swap_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/swap_tests.cpp (original)
+++ trunk/libs/unordered/test/unordered/swap_tests.cpp 2012-05-07 06:57:35 EDT (Mon, 07 May 2012)
@@ -25,7 +25,7 @@
namespace swap_tests
{
-test::seed_t seed(783472);
+test::seed_t initialize_seed(783472);
template <class X>
void swap_test_impl(X& x1, X& x2)
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