2006-05-21 17:14:11 +00:00
|
|
|
|
Merge hash and unordered changes.
Remove deprecated headers, move hash_fwd.hpp into hash subdirectory. And
several minor internal changes.
Mostly minor internal details.
Merged revisions 51262-51263,51407-51409,51504-51505,51644-51646,51667 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r51262 | danieljames | 2009-02-15 19:32:04 +0000 (Sun, 15 Feb 2009) | 1 line
Use the new 'boost:' links for the hash, unordered and quickbook documentation.
........
r51263 | danieljames | 2009-02-15 19:32:19 +0000 (Sun, 15 Feb 2009) | 2 lines
Don't copy images for the standalone hash and unordered documentation, was only
really required before the libraries were integrated into boost.
........
r51407 | danieljames | 2009-02-22 23:49:51 +0000 (Sun, 22 Feb 2009) | 1 line
Fix the hash dirname.
........
r51408 | danieljames | 2009-02-22 23:50:04 +0000 (Sun, 22 Feb 2009) | 1 line
Make copy_buckets and move_buckets member functions - so that calling them is a bit simpler.
........
r51409 | danieljames | 2009-02-22 23:50:20 +0000 (Sun, 22 Feb 2009) | 1 line
Move some of the data structure classes out of hash table data.
........
r51504 | danieljames | 2009-03-01 14:15:09 +0000 (Sun, 01 Mar 2009) | 1 line
Add missing return for operator=.
........
r51505 | danieljames | 2009-03-01 14:15:39 +0000 (Sun, 01 Mar 2009) | 3 lines
Make the sort stable.
Doesn't really matter, but it might as well be.
........
r51644 | danieljames | 2009-03-08 09:44:51 +0000 (Sun, 08 Mar 2009) | 1 line
Detab.
........
r51645 | danieljames | 2009-03-08 09:45:11 +0000 (Sun, 08 Mar 2009) | 4 lines
Move hash_fwd into the hash subdirectory.
I should have done this in the last release. But now all of the hash
implementation is in the hash subdirectory.
........
r51646 | danieljames | 2009-03-08 09:45:30 +0000 (Sun, 08 Mar 2009) | 3 lines
Remove deprecated headers.
Fixes #2412.
........
r51667 | danieljames | 2009-03-09 20:56:23 +0000 (Mon, 09 Mar 2009) | 1 line
Update copyright dates in hash and unordered.
........
[SVN r51729]
2009-03-11 22:51:09 +00:00
|
|
|
// Copyright 2006-2009 Daniel James.
|
2006-07-01 22:31:26 +00:00
|
|
|
// Distributed under the Boost Software License, Version 1.0. (See accompanying
|
|
|
|
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
2006-05-21 17:14:11 +00:00
|
|
|
|
|
|
|
#include "./containers.hpp"
|
|
|
|
#include "../helpers/random_values.hpp"
|
|
|
|
#include "../helpers/invariants.hpp"
|
|
|
|
|
2007-12-06 11:42:28 +00:00
|
|
|
test::seed_t seed(9387);
|
|
|
|
|
2006-05-21 17:14:11 +00:00
|
|
|
template <class T>
|
|
|
|
struct self_swap_base : public test::exception_base
|
|
|
|
{
|
|
|
|
test::random_values<T> values;
|
|
|
|
self_swap_base(int count = 0) : values(count) {}
|
|
|
|
|
|
|
|
typedef T data_type;
|
|
|
|
T init() const { return T(values.begin(), values.end()); }
|
|
|
|
void run(T& x) const { x.swap(x); }
|
|
|
|
void check(T const& x) const {
|
|
|
|
std::string scope(test::scope);
|
|
|
|
|
|
|
|
#if BOOST_UNORDERED_SWAP_METHOD != 2
|
Merge latest changes for unordered. Improved compatability and a few tweaks.
Merged revisions 53127,53253,53256,53311,53314,53316-53318 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r53127 | danieljames | 2009-05-20 07:43:38 +0100 (Wed, 20 May 2009) | 1 line
Better configuration for boost.unordered.
........
r53253 | danieljames | 2009-05-25 20:14:07 +0100 (Mon, 25 May 2009) | 3 lines
Add explicit destructors to the unordered containers. Refs #2908.
Isn't really needed but it doesn't hurt.
........
r53256 | danieljames | 2009-05-25 20:45:23 +0100 (Mon, 25 May 2009) | 1 line
Unordered change log for explicit destructors.
........
r53311 | danieljames | 2009-05-27 18:42:01 +0100 (Wed, 27 May 2009) | 1 line
Missing changelog entry.
........
r53314 | danieljames | 2009-05-27 18:44:09 +0100 (Wed, 27 May 2009) | 1 line
Use lightweight_test for unordered.
........
r53316 | danieljames | 2009-05-27 19:19:32 +0100 (Wed, 27 May 2009) | 1 line
Some workarounds for old versions of Borland.
........
r53317 | danieljames | 2009-05-27 19:32:22 +0100 (Wed, 27 May 2009) | 1 line
Fix a change accidentally included in the last commit.
........
r53318 | danieljames | 2009-05-27 19:32:38 +0100 (Wed, 27 May 2009) | 1 line
Remove an unused function.
........
[SVN r53465]
2009-05-30 17:34:12 +00:00
|
|
|
BOOST_TEST(
|
2006-05-21 17:14:11 +00:00
|
|
|
scope == "hash::operator(hash)" ||
|
|
|
|
scope == "hash::operator=(hash)" ||
|
|
|
|
scope == "equal_to::operator(equal_to)" ||
|
|
|
|
scope == "equal_to::operator=(equal_to)");
|
|
|
|
#endif
|
|
|
|
|
|
|
|
test::check_equivalent_keys(x);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
template <class T>
|
|
|
|
struct self_swap_test1 : self_swap_base<T> {};
|
|
|
|
|
|
|
|
template <class T>
|
|
|
|
struct self_swap_test2 : self_swap_base<T>
|
|
|
|
{
|
|
|
|
self_swap_test2() : self_swap_base<T>(100) {}
|
|
|
|
};
|
|
|
|
|
|
|
|
template <class T>
|
|
|
|
struct swap_base : public test::exception_base
|
|
|
|
{
|
|
|
|
const test::random_values<T> x_values, y_values;
|
|
|
|
const T initial_x, initial_y;
|
|
|
|
|
2008-02-05 20:57:02 +00:00
|
|
|
typedef BOOST_DEDUCED_TYPENAME T::hasher hasher;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME T::key_equal key_equal;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME T::allocator_type allocator_type;
|
|
|
|
|
2006-05-21 17:14:11 +00:00
|
|
|
swap_base(unsigned int count1, unsigned int count2, int tag1, int tag2)
|
|
|
|
: x_values(count1), y_values(count2),
|
2008-02-05 20:57:02 +00:00
|
|
|
initial_x(x_values.begin(), x_values.end(), 0, hasher(tag1),
|
|
|
|
key_equal(tag1), allocator_type(tag1)),
|
|
|
|
initial_y(y_values.begin(), y_values.end(), 0, hasher(tag2),
|
|
|
|
key_equal(tag2), allocator_type(tag2))
|
2006-05-21 17:14:11 +00:00
|
|
|
{}
|
|
|
|
|
|
|
|
struct data_type {
|
|
|
|
data_type(T const& x, T const& y)
|
|
|
|
: x(x), y(y) {}
|
|
|
|
|
|
|
|
T x, y;
|
|
|
|
};
|
|
|
|
|
|
|
|
data_type init() const { return data_type(initial_x, initial_y); }
|
|
|
|
void run(data_type& d) const {
|
|
|
|
try {
|
|
|
|
d.x.swap(d.y);
|
|
|
|
} catch (std::runtime_error) {}
|
|
|
|
}
|
|
|
|
void check(data_type const& d) const {
|
2007-01-10 00:06:55 +00:00
|
|
|
std::string scope(test::scope);
|
|
|
|
|
|
|
|
#if BOOST_UNORDERED_SWAP_METHOD != 2
|
Merge latest changes for unordered. Improved compatability and a few tweaks.
Merged revisions 53127,53253,53256,53311,53314,53316-53318 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r53127 | danieljames | 2009-05-20 07:43:38 +0100 (Wed, 20 May 2009) | 1 line
Better configuration for boost.unordered.
........
r53253 | danieljames | 2009-05-25 20:14:07 +0100 (Mon, 25 May 2009) | 3 lines
Add explicit destructors to the unordered containers. Refs #2908.
Isn't really needed but it doesn't hurt.
........
r53256 | danieljames | 2009-05-25 20:45:23 +0100 (Mon, 25 May 2009) | 1 line
Unordered change log for explicit destructors.
........
r53311 | danieljames | 2009-05-27 18:42:01 +0100 (Wed, 27 May 2009) | 1 line
Missing changelog entry.
........
r53314 | danieljames | 2009-05-27 18:44:09 +0100 (Wed, 27 May 2009) | 1 line
Use lightweight_test for unordered.
........
r53316 | danieljames | 2009-05-27 19:19:32 +0100 (Wed, 27 May 2009) | 1 line
Some workarounds for old versions of Borland.
........
r53317 | danieljames | 2009-05-27 19:32:22 +0100 (Wed, 27 May 2009) | 1 line
Fix a change accidentally included in the last commit.
........
r53318 | danieljames | 2009-05-27 19:32:38 +0100 (Wed, 27 May 2009) | 1 line
Remove an unused function.
........
[SVN r53465]
2009-05-30 17:34:12 +00:00
|
|
|
BOOST_TEST(
|
2007-01-10 00:06:55 +00:00
|
|
|
scope == "hash::operator(hash)" ||
|
|
|
|
scope == "hash::operator=(hash)" ||
|
|
|
|
scope == "equal_to::operator(equal_to)" ||
|
|
|
|
scope == "equal_to::operator=(equal_to)");
|
|
|
|
#endif
|
|
|
|
|
2006-05-21 17:14:11 +00:00
|
|
|
test::check_equivalent_keys(d.x);
|
|
|
|
test::check_equivalent_keys(d.y);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
template <class T>
|
|
|
|
struct swap_test1 : swap_base<T>
|
|
|
|
{
|
|
|
|
swap_test1() : swap_base<T>(0, 0, 0, 0) {}
|
|
|
|
};
|
|
|
|
|
|
|
|
template <class T>
|
|
|
|
struct swap_test2 : swap_base<T>
|
|
|
|
{
|
|
|
|
swap_test2() : swap_base<T>(60, 0, 0, 0) {}
|
|
|
|
};
|
|
|
|
|
|
|
|
template <class T>
|
|
|
|
struct swap_test3 : swap_base<T>
|
|
|
|
{
|
|
|
|
swap_test3() : swap_base<T>(0, 60, 0, 0) {}
|
|
|
|
};
|
|
|
|
|
|
|
|
template <class T>
|
|
|
|
struct swap_test4 : swap_base<T>
|
|
|
|
{
|
|
|
|
swap_test4() : swap_base<T>(10, 10, 1, 2) {}
|
|
|
|
};
|
|
|
|
|
|
|
|
RUN_EXCEPTION_TESTS(
|
|
|
|
(self_swap_test1)(self_swap_test2)
|
|
|
|
(swap_test1)(swap_test2)(swap_test3)(swap_test4),
|
|
|
|
CONTAINER_SEQ)
|