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

Merge in a few small changes to unordered.

Browse Source 
Merged revisions 45277-45280 via svnmerge from 
https://svn.boost.org/svn/boost/branches/unordered/trunk

........
  r45277 | danieljames | 2008-05-11 14:09:05 +0100 (Sun, 11 May 2008) | 2 lines
  
  Put the prime number list into a template so that they (hopefully) only get included once.
........
  r45278 | danieljames | 2008-05-11 14:12:27 +0100 (Sun, 11 May 2008) | 2 lines
  
  Add a quick explanation for an odd looking constructor.
........
  r45279 | danieljames | 2008-05-11 14:12:37 +0100 (Sun, 11 May 2008) | 2 lines
  
  No need to include the exception objects in helpers/strong.hpp. Now helpers on depend on the forwarding header from the objects.
........
  r45280 | danieljames | 2008-05-11 14:14:31 +0100 (Sun, 11 May 2008) | 1 line
  
  Instead of comparing potentially dangling pointers in move_tests check if any objects have been constructed.
........


[SVN r45574]
This commit is contained in:
Daniel James
2008-05-20 15:24:20 +00:00
parent 18e46ae624
commit 0be8004724
6 changed files with 113 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/unordered/move_tests.cpp
+17 -17
View File
@@ -23,15 +23,15 @@ namespace move_tests
template<class T>
T create(test::random_values<T> const& v,
BOOST_DEDUCED_TYPENAME T::value_type const*& first) {
test::object_count& count) {
T x(v.begin(), v.end());
first = &*x.begin();
count = test::global_object_count;
return x;
}
template<class T>
T create(test::random_values<T> const& v,
BOOST_DEDUCED_TYPENAME T::value_type const*& first,
test::object_count& count,
BOOST_DEDUCED_TYPENAME T::hasher hf,
BOOST_DEDUCED_TYPENAME T::key_equal eq,
BOOST_DEDUCED_TYPENAME T::allocator_type al,
@@ -39,7 +39,7 @@ namespace move_tests
T x(0, hf, eq, al);
x.max_load_factor(mlf);
x.insert(v.begin(), v.end());
first = &*x.begin();
count = test::global_object_count;
return x;
}
@@ -62,9 +62,9 @@ namespace move_tests
{
test::random_values<T> v(1000);
BOOST_DEDUCED_TYPENAME T::value_type const* first = 0;
T y(create(v, first));
BOOST_CHECK(first == &*y.begin());
test::object_count count;
T y(create(v, count));
BOOST_CHECK(count == test::global_object_count);
test::check_container(y, v);
test::check_equivalent_keys(y);
}
@@ -75,10 +75,10 @@ namespace move_tests
{
{
test::random_values<T> v(500);
BOOST_DEDUCED_TYPENAME T::value_type const* first = 0;
test::object_count count;
T y;
y = create(v, first);
BOOST_CHECK(first == &*y.begin());
y = create(v, count);
BOOST_CHECK(count == test::global_object_count);
test::check_container(y, v);
test::check_equivalent_keys(y);
}
@@ -95,12 +95,12 @@ namespace move_tests
BOOST_DEDUCED_TYPENAME T::allocator_type al(1);
BOOST_DEDUCED_TYPENAME T::allocator_type al2(2);
BOOST_DEDUCED_TYPENAME T::value_type const* first;
test::object_count count;
{
test::random_values<T> v(500);
T y(create(v, first, hf, eq, al, 0.5));
BOOST_CHECK(first == &*y.begin());
T y(create(v, count, hf, eq, al, 0.5));
BOOST_CHECK(count == test::global_object_count);
test::check_container(y, v);
BOOST_CHECK(test::equivalent(y.hash_function(), hf));
BOOST_CHECK(test::equivalent(y.key_eq(), eq));
@@ -112,8 +112,8 @@ namespace move_tests
{
// TODO: To do this correctly requires the fancy new allocator stuff.
test::random_values<T> v(500);
T y(create(v, first, hf, eq, al, 2.0), al2);
BOOST_CHECK(first != &*y.begin());
T y(create(v, count, hf, eq, al, 2.0), al2);
BOOST_CHECK(count != test::global_object_count);
test::check_container(y, v);
BOOST_CHECK(test::equivalent(y.hash_function(), hf));
BOOST_CHECK(test::equivalent(y.key_eq(), eq));
@@ -124,8 +124,8 @@ namespace move_tests
{
test::random_values<T> v(25);
T y(create(v, first, hf, eq, al, 1.0), al);
BOOST_CHECK(first == &*y.begin());
T y(create(v, count, hf, eq, al, 1.0), al);
BOOST_CHECK(count == test::global_object_count);
test::check_container(y, v);
BOOST_CHECK(test::equivalent(y.hash_function(), hf));
BOOST_CHECK(test::equivalent(y.key_eq(), eq));
test/unordered/unnecessary_copy_tests.cpp
+13 -1
View File
@@ -15,7 +15,19 @@ namespace unnecessary_copy_tests
static int moves;
count_copies() : tag_(0) { ++copies; }
explicit count_copies(int tag) : tag_(tag) { ++copies; }
count_copies(count_copies const&, count_copies const& x) : tag_(x.tag_) { ++copies; }
// This bizarre constructor is an attempt to confuse emplace.
//
// unordered_map<count_copies, count_copies> x:
// x.emplace(count_copies(1), count_copies(2));
// x.emplace(count_copies(1), count_copies(2), count_copies(3));
//
// The first emplace should use the single argument constructor twice.
// The second emplace should use the single argument contructor for
// the key, and this constructor for the value.
count_copies(count_copies const&, count_copies const& x)
: tag_(x.tag_) { ++copies; }
count_copies(count_copies const& x) : tag_(x.tag_) { ++copies; }
#if defined(BOOST_HAS_RVALUE_REFS)
count_copies(count_copies&& x) : tag_(x.tag_) {