2006-05-21 17:14:11 +00:00
|
|
|
|
2009-03-09 20:56:23 +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
|
|
|
|
2009-11-26 23:15:30 +00:00
|
|
|
#include "../helpers/prefix.hpp"
|
2012-04-08 15:29:15 +00:00
|
|
|
#include <boost/unordered_set.hpp>
|
|
|
|
#include <boost/unordered_map.hpp>
|
|
|
|
#include "../helpers/postfix.hpp"
|
2009-11-26 23:15:30 +00:00
|
|
|
|
2006-06-12 23:30:46 +00:00
|
|
|
#include <boost/config.hpp>
|
|
|
|
#include <algorithm>
|
|
|
|
#include <iterator>
|
2008-03-24 17:03:15 +00:00
|
|
|
#include "../helpers/test.hpp"
|
2006-05-21 17:14:11 +00:00
|
|
|
#include "../objects/test.hpp"
|
2011-08-14 18:53:29 +00:00
|
|
|
#include "../objects/cxx11_allocator.hpp"
|
2006-05-21 17:14:11 +00:00
|
|
|
#include "../helpers/random_values.hpp"
|
|
|
|
#include "../helpers/tracker.hpp"
|
|
|
|
#include "../helpers/invariants.hpp"
|
|
|
|
|
2011-08-14 21:03:18 +00:00
|
|
|
#if defined(BOOST_MSVC)
|
|
|
|
#pragma warning(disable:4127) // conditional expression is constant
|
|
|
|
#endif
|
|
|
|
|
2008-03-24 17:03:15 +00:00
|
|
|
namespace swap_tests
|
|
|
|
{
|
|
|
|
|
2012-05-07 10:57:35 +00:00
|
|
|
test::seed_t initialize_seed(783472);
|
2007-12-06 11:42:28 +00:00
|
|
|
|
2006-05-21 17:14:11 +00:00
|
|
|
template <class X>
|
|
|
|
void swap_test_impl(X& x1, X& x2)
|
|
|
|
{
|
|
|
|
test::ordered<X> tracker1 = test::create_ordered(x1);
|
|
|
|
test::ordered<X> tracker2 = test::create_ordered(x2);
|
2006-06-12 23:30:46 +00:00
|
|
|
tracker1.insert_range(x1.begin(), x1.end());
|
|
|
|
tracker2.insert_range(x2.begin(), x2.end());
|
2006-05-21 17:14:11 +00:00
|
|
|
x1.swap(x2);
|
|
|
|
tracker1.compare(x2);
|
|
|
|
tracker2.compare(x1);
|
|
|
|
}
|
|
|
|
|
|
|
|
template <class X>
|
2012-09-05 23:33:22 +00:00
|
|
|
void swap_tests1(X*, test::random_generator generator)
|
2006-05-21 17:14:11 +00:00
|
|
|
{
|
|
|
|
{
|
2011-08-14 18:52:43 +00:00
|
|
|
test::check_instances check_;
|
|
|
|
|
2006-05-21 17:14:11 +00:00
|
|
|
X x;
|
|
|
|
swap_test_impl(x, x);
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
2011-08-14 18:52:43 +00:00
|
|
|
test::check_instances check_;
|
|
|
|
|
2006-05-21 17:14:11 +00:00
|
|
|
X x,y;
|
|
|
|
swap_test_impl(x, y);
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
2011-08-14 18:52:43 +00:00
|
|
|
test::check_instances check_;
|
|
|
|
|
Merge test improvements, pdf documentation improvements, some implementation
tweaks.
Merged revisions 45747-46030 via svnmerge from
https://svn.boost.org/svn/boost/branches/unordered/trunk
................
r45747 | danieljames | 2008-05-25 18:03:30 +0100 (Sun, 25 May 2008) | 1 line
Remove /branches/unordered/dev from svnmerge tracking.
................
r45874 | danieljames | 2008-05-28 18:54:53 +0100 (Wed, 28 May 2008) | 1 line
Merge from trunk.
................
r45881 | danieljames | 2008-05-29 00:10:37 +0100 (Thu, 29 May 2008) | 2 lines
Make it possible to use a custom generator in more places.
................
r45882 | danieljames | 2008-05-29 00:10:56 +0100 (Thu, 29 May 2008) | 2 lines
Remove several unused parameters.
................
r45883 | danieljames | 2008-05-29 00:11:06 +0100 (Thu, 29 May 2008) | 2 lines
No need to run move_construct_tests1 from move_construct_tests2, already calling it directly.
................
r45884 | danieljames | 2008-05-29 00:11:15 +0100 (Thu, 29 May 2008) | 2 lines
Remove unused 'construct' as in trunk.
................
r45885 | danieljames | 2008-05-29 00:11:25 +0100 (Thu, 29 May 2008) | 2 lines
More consistent implementations of insert_impl.
................
r45886 | danieljames | 2008-05-29 00:11:34 +0100 (Thu, 29 May 2008) | 2 lines
No need to use the single argument version of methods when the variadic version is available. Frees up the non-variadic version for overloading to emulate variadic methods.
................
r45887 | danieljames | 2008-05-29 00:11:44 +0100 (Thu, 29 May 2008) | 2 lines
Add another test, mainly to avoid an unused parameter warning.
................
r45888 | danieljames | 2008-05-29 00:11:54 +0100 (Thu, 29 May 2008) | 2 lines
Adjust the pixels per inch of the buckets diagram so it'll fit on the page.
................
r45889 | danieljames | 2008-05-29 00:15:49 +0100 (Thu, 29 May 2008) | 1 line
Improve pdf output, thanks to John Maddock.
................
r45890 | danieljames | 2008-05-29 00:17:45 +0100 (Thu, 29 May 2008) | 1 line
Add an svg version of the bucket diagram.
................
r45891 | danieljames | 2008-05-29 00:18:11 +0100 (Thu, 29 May 2008) | 1 line
Remove the original dia buckets diagram, I'm not using it anymore.
................
r46025 | danieljames | 2008-06-01 18:39:51 +0100 (Sun, 01 Jun 2008) | 1 line
Initialise merging from doc.
................
r46030 | danieljames | 2008-06-01 18:54:36 +0100 (Sun, 01 Jun 2008) | 29 lines
Merge in documentation improvements from the doc branch.
Merged revisions 45892-46020 via svnmerge from
https://svn.boost.org/svn/boost/branches/doc
........
r45892 | danieljames | 2008-05-29 00:30:07 +0100 (Thu, 29 May 2008) | 1 line
Merge latest changes from unordered.
........
r46017 | danieljames | 2008-06-01 18:18:15 +0100 (Sun, 01 Jun 2008) | 2 lines
Use both PNG and SVG versions of the buckets diagram.
........
r46018 | danieljames | 2008-06-01 18:18:27 +0100 (Sun, 01 Jun 2008) | 2 lines
Improved function summary tables in unordered documenations.
........
r46019 | danieljames | 2008-06-01 18:18:39 +0100 (Sun, 01 Jun 2008) | 3 lines
I'd hacked the bibliography to avoid showing the title twice, but this was
causing problems when generating PDFs, so show the title twice.
........
r46020 | danieljames | 2008-06-01 18:18:52 +0100 (Sun, 01 Jun 2008) | 3 lines
Don't use the compact boostbook refernce style in the standalone documentation
as it is too wide for printing out.
........
................
[SVN r46031]
2008-06-01 18:00:53 +00:00
|
|
|
test::random_values<X> v(1000, generator);
|
2006-05-21 17:14:11 +00:00
|
|
|
X x, y(v.begin(), v.end());
|
|
|
|
swap_test_impl(x, y);
|
|
|
|
swap_test_impl(x, y);
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
2011-08-14 18:52:43 +00:00
|
|
|
test::check_instances check_;
|
|
|
|
|
Merge test improvements, pdf documentation improvements, some implementation
tweaks.
Merged revisions 45747-46030 via svnmerge from
https://svn.boost.org/svn/boost/branches/unordered/trunk
................
r45747 | danieljames | 2008-05-25 18:03:30 +0100 (Sun, 25 May 2008) | 1 line
Remove /branches/unordered/dev from svnmerge tracking.
................
r45874 | danieljames | 2008-05-28 18:54:53 +0100 (Wed, 28 May 2008) | 1 line
Merge from trunk.
................
r45881 | danieljames | 2008-05-29 00:10:37 +0100 (Thu, 29 May 2008) | 2 lines
Make it possible to use a custom generator in more places.
................
r45882 | danieljames | 2008-05-29 00:10:56 +0100 (Thu, 29 May 2008) | 2 lines
Remove several unused parameters.
................
r45883 | danieljames | 2008-05-29 00:11:06 +0100 (Thu, 29 May 2008) | 2 lines
No need to run move_construct_tests1 from move_construct_tests2, already calling it directly.
................
r45884 | danieljames | 2008-05-29 00:11:15 +0100 (Thu, 29 May 2008) | 2 lines
Remove unused 'construct' as in trunk.
................
r45885 | danieljames | 2008-05-29 00:11:25 +0100 (Thu, 29 May 2008) | 2 lines
More consistent implementations of insert_impl.
................
r45886 | danieljames | 2008-05-29 00:11:34 +0100 (Thu, 29 May 2008) | 2 lines
No need to use the single argument version of methods when the variadic version is available. Frees up the non-variadic version for overloading to emulate variadic methods.
................
r45887 | danieljames | 2008-05-29 00:11:44 +0100 (Thu, 29 May 2008) | 2 lines
Add another test, mainly to avoid an unused parameter warning.
................
r45888 | danieljames | 2008-05-29 00:11:54 +0100 (Thu, 29 May 2008) | 2 lines
Adjust the pixels per inch of the buckets diagram so it'll fit on the page.
................
r45889 | danieljames | 2008-05-29 00:15:49 +0100 (Thu, 29 May 2008) | 1 line
Improve pdf output, thanks to John Maddock.
................
r45890 | danieljames | 2008-05-29 00:17:45 +0100 (Thu, 29 May 2008) | 1 line
Add an svg version of the bucket diagram.
................
r45891 | danieljames | 2008-05-29 00:18:11 +0100 (Thu, 29 May 2008) | 1 line
Remove the original dia buckets diagram, I'm not using it anymore.
................
r46025 | danieljames | 2008-06-01 18:39:51 +0100 (Sun, 01 Jun 2008) | 1 line
Initialise merging from doc.
................
r46030 | danieljames | 2008-06-01 18:54:36 +0100 (Sun, 01 Jun 2008) | 29 lines
Merge in documentation improvements from the doc branch.
Merged revisions 45892-46020 via svnmerge from
https://svn.boost.org/svn/boost/branches/doc
........
r45892 | danieljames | 2008-05-29 00:30:07 +0100 (Thu, 29 May 2008) | 1 line
Merge latest changes from unordered.
........
r46017 | danieljames | 2008-06-01 18:18:15 +0100 (Sun, 01 Jun 2008) | 2 lines
Use both PNG and SVG versions of the buckets diagram.
........
r46018 | danieljames | 2008-06-01 18:18:27 +0100 (Sun, 01 Jun 2008) | 2 lines
Improved function summary tables in unordered documenations.
........
r46019 | danieljames | 2008-06-01 18:18:39 +0100 (Sun, 01 Jun 2008) | 3 lines
I'd hacked the bibliography to avoid showing the title twice, but this was
causing problems when generating PDFs, so show the title twice.
........
r46020 | danieljames | 2008-06-01 18:18:52 +0100 (Sun, 01 Jun 2008) | 3 lines
Don't use the compact boostbook refernce style in the standalone documentation
as it is too wide for printing out.
........
................
[SVN r46031]
2008-06-01 18:00:53 +00:00
|
|
|
test::random_values<X> vx(1000, generator), vy(1000, generator);
|
2006-05-21 17:14:11 +00:00
|
|
|
X x(vx.begin(), vx.end()), y(vy.begin(), vy.end());
|
|
|
|
swap_test_impl(x, y);
|
|
|
|
swap_test_impl(x, y);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
template <class X>
|
2012-09-05 23:33:22 +00:00
|
|
|
void swap_tests2(X* ptr, test::random_generator generator)
|
2006-05-21 17:14:11 +00:00
|
|
|
{
|
2012-09-05 23:33:22 +00:00
|
|
|
swap_tests1(ptr, generator);
|
2006-05-21 17:14:11 +00:00
|
|
|
|
2008-01-10 22:30:46 +00:00
|
|
|
typedef BOOST_DEDUCED_TYPENAME X::hasher hasher;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME X::key_equal key_equal;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME X::allocator_type allocator_type;
|
2006-05-21 17:14:11 +00:00
|
|
|
|
|
|
|
{
|
2011-08-14 18:52:43 +00:00
|
|
|
test::check_instances check_;
|
|
|
|
|
2006-05-21 17:14:11 +00:00
|
|
|
X x(0, hasher(1), key_equal(1));
|
|
|
|
X y(0, hasher(2), key_equal(2));
|
|
|
|
swap_test_impl(x, y);
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
2011-08-14 18:52:43 +00:00
|
|
|
test::check_instances check_;
|
|
|
|
|
Merge test improvements, pdf documentation improvements, some implementation
tweaks.
Merged revisions 45747-46030 via svnmerge from
https://svn.boost.org/svn/boost/branches/unordered/trunk
................
r45747 | danieljames | 2008-05-25 18:03:30 +0100 (Sun, 25 May 2008) | 1 line
Remove /branches/unordered/dev from svnmerge tracking.
................
r45874 | danieljames | 2008-05-28 18:54:53 +0100 (Wed, 28 May 2008) | 1 line
Merge from trunk.
................
r45881 | danieljames | 2008-05-29 00:10:37 +0100 (Thu, 29 May 2008) | 2 lines
Make it possible to use a custom generator in more places.
................
r45882 | danieljames | 2008-05-29 00:10:56 +0100 (Thu, 29 May 2008) | 2 lines
Remove several unused parameters.
................
r45883 | danieljames | 2008-05-29 00:11:06 +0100 (Thu, 29 May 2008) | 2 lines
No need to run move_construct_tests1 from move_construct_tests2, already calling it directly.
................
r45884 | danieljames | 2008-05-29 00:11:15 +0100 (Thu, 29 May 2008) | 2 lines
Remove unused 'construct' as in trunk.
................
r45885 | danieljames | 2008-05-29 00:11:25 +0100 (Thu, 29 May 2008) | 2 lines
More consistent implementations of insert_impl.
................
r45886 | danieljames | 2008-05-29 00:11:34 +0100 (Thu, 29 May 2008) | 2 lines
No need to use the single argument version of methods when the variadic version is available. Frees up the non-variadic version for overloading to emulate variadic methods.
................
r45887 | danieljames | 2008-05-29 00:11:44 +0100 (Thu, 29 May 2008) | 2 lines
Add another test, mainly to avoid an unused parameter warning.
................
r45888 | danieljames | 2008-05-29 00:11:54 +0100 (Thu, 29 May 2008) | 2 lines
Adjust the pixels per inch of the buckets diagram so it'll fit on the page.
................
r45889 | danieljames | 2008-05-29 00:15:49 +0100 (Thu, 29 May 2008) | 1 line
Improve pdf output, thanks to John Maddock.
................
r45890 | danieljames | 2008-05-29 00:17:45 +0100 (Thu, 29 May 2008) | 1 line
Add an svg version of the bucket diagram.
................
r45891 | danieljames | 2008-05-29 00:18:11 +0100 (Thu, 29 May 2008) | 1 line
Remove the original dia buckets diagram, I'm not using it anymore.
................
r46025 | danieljames | 2008-06-01 18:39:51 +0100 (Sun, 01 Jun 2008) | 1 line
Initialise merging from doc.
................
r46030 | danieljames | 2008-06-01 18:54:36 +0100 (Sun, 01 Jun 2008) | 29 lines
Merge in documentation improvements from the doc branch.
Merged revisions 45892-46020 via svnmerge from
https://svn.boost.org/svn/boost/branches/doc
........
r45892 | danieljames | 2008-05-29 00:30:07 +0100 (Thu, 29 May 2008) | 1 line
Merge latest changes from unordered.
........
r46017 | danieljames | 2008-06-01 18:18:15 +0100 (Sun, 01 Jun 2008) | 2 lines
Use both PNG and SVG versions of the buckets diagram.
........
r46018 | danieljames | 2008-06-01 18:18:27 +0100 (Sun, 01 Jun 2008) | 2 lines
Improved function summary tables in unordered documenations.
........
r46019 | danieljames | 2008-06-01 18:18:39 +0100 (Sun, 01 Jun 2008) | 3 lines
I'd hacked the bibliography to avoid showing the title twice, but this was
causing problems when generating PDFs, so show the title twice.
........
r46020 | danieljames | 2008-06-01 18:18:52 +0100 (Sun, 01 Jun 2008) | 3 lines
Don't use the compact boostbook refernce style in the standalone documentation
as it is too wide for printing out.
........
................
[SVN r46031]
2008-06-01 18:00:53 +00:00
|
|
|
test::random_values<X> v(1000, generator);
|
2006-05-21 17:14:11 +00:00
|
|
|
X x(v.begin(), v.end(), 0, hasher(1), key_equal(1));
|
|
|
|
X y(0, hasher(2), key_equal(2));
|
|
|
|
swap_test_impl(x, y);
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
2011-08-14 18:52:43 +00:00
|
|
|
test::check_instances check_;
|
|
|
|
|
Merge test improvements, pdf documentation improvements, some implementation
tweaks.
Merged revisions 45747-46030 via svnmerge from
https://svn.boost.org/svn/boost/branches/unordered/trunk
................
r45747 | danieljames | 2008-05-25 18:03:30 +0100 (Sun, 25 May 2008) | 1 line
Remove /branches/unordered/dev from svnmerge tracking.
................
r45874 | danieljames | 2008-05-28 18:54:53 +0100 (Wed, 28 May 2008) | 1 line
Merge from trunk.
................
r45881 | danieljames | 2008-05-29 00:10:37 +0100 (Thu, 29 May 2008) | 2 lines
Make it possible to use a custom generator in more places.
................
r45882 | danieljames | 2008-05-29 00:10:56 +0100 (Thu, 29 May 2008) | 2 lines
Remove several unused parameters.
................
r45883 | danieljames | 2008-05-29 00:11:06 +0100 (Thu, 29 May 2008) | 2 lines
No need to run move_construct_tests1 from move_construct_tests2, already calling it directly.
................
r45884 | danieljames | 2008-05-29 00:11:15 +0100 (Thu, 29 May 2008) | 2 lines
Remove unused 'construct' as in trunk.
................
r45885 | danieljames | 2008-05-29 00:11:25 +0100 (Thu, 29 May 2008) | 2 lines
More consistent implementations of insert_impl.
................
r45886 | danieljames | 2008-05-29 00:11:34 +0100 (Thu, 29 May 2008) | 2 lines
No need to use the single argument version of methods when the variadic version is available. Frees up the non-variadic version for overloading to emulate variadic methods.
................
r45887 | danieljames | 2008-05-29 00:11:44 +0100 (Thu, 29 May 2008) | 2 lines
Add another test, mainly to avoid an unused parameter warning.
................
r45888 | danieljames | 2008-05-29 00:11:54 +0100 (Thu, 29 May 2008) | 2 lines
Adjust the pixels per inch of the buckets diagram so it'll fit on the page.
................
r45889 | danieljames | 2008-05-29 00:15:49 +0100 (Thu, 29 May 2008) | 1 line
Improve pdf output, thanks to John Maddock.
................
r45890 | danieljames | 2008-05-29 00:17:45 +0100 (Thu, 29 May 2008) | 1 line
Add an svg version of the bucket diagram.
................
r45891 | danieljames | 2008-05-29 00:18:11 +0100 (Thu, 29 May 2008) | 1 line
Remove the original dia buckets diagram, I'm not using it anymore.
................
r46025 | danieljames | 2008-06-01 18:39:51 +0100 (Sun, 01 Jun 2008) | 1 line
Initialise merging from doc.
................
r46030 | danieljames | 2008-06-01 18:54:36 +0100 (Sun, 01 Jun 2008) | 29 lines
Merge in documentation improvements from the doc branch.
Merged revisions 45892-46020 via svnmerge from
https://svn.boost.org/svn/boost/branches/doc
........
r45892 | danieljames | 2008-05-29 00:30:07 +0100 (Thu, 29 May 2008) | 1 line
Merge latest changes from unordered.
........
r46017 | danieljames | 2008-06-01 18:18:15 +0100 (Sun, 01 Jun 2008) | 2 lines
Use both PNG and SVG versions of the buckets diagram.
........
r46018 | danieljames | 2008-06-01 18:18:27 +0100 (Sun, 01 Jun 2008) | 2 lines
Improved function summary tables in unordered documenations.
........
r46019 | danieljames | 2008-06-01 18:18:39 +0100 (Sun, 01 Jun 2008) | 3 lines
I'd hacked the bibliography to avoid showing the title twice, but this was
causing problems when generating PDFs, so show the title twice.
........
r46020 | danieljames | 2008-06-01 18:18:52 +0100 (Sun, 01 Jun 2008) | 3 lines
Don't use the compact boostbook refernce style in the standalone documentation
as it is too wide for printing out.
........
................
[SVN r46031]
2008-06-01 18:00:53 +00:00
|
|
|
test::random_values<X> vx(100, generator), vy(50, generator);
|
2006-05-21 17:14:11 +00:00
|
|
|
X x(vx.begin(), vx.end(), 0, hasher(1), key_equal(1));
|
|
|
|
X y(vy.begin(), vy.end(), 0, hasher(2), key_equal(2));
|
|
|
|
swap_test_impl(x, y);
|
|
|
|
swap_test_impl(x, y);
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
2011-08-14 18:53:29 +00:00
|
|
|
test::force_equal_allocator force_(
|
2011-08-15 20:23:29 +00:00
|
|
|
!allocator_type::is_propagate_on_swap);
|
2011-08-14 18:52:43 +00:00
|
|
|
test::check_instances check_;
|
|
|
|
|
Merge test improvements, pdf documentation improvements, some implementation
tweaks.
Merged revisions 45747-46030 via svnmerge from
https://svn.boost.org/svn/boost/branches/unordered/trunk
................
r45747 | danieljames | 2008-05-25 18:03:30 +0100 (Sun, 25 May 2008) | 1 line
Remove /branches/unordered/dev from svnmerge tracking.
................
r45874 | danieljames | 2008-05-28 18:54:53 +0100 (Wed, 28 May 2008) | 1 line
Merge from trunk.
................
r45881 | danieljames | 2008-05-29 00:10:37 +0100 (Thu, 29 May 2008) | 2 lines
Make it possible to use a custom generator in more places.
................
r45882 | danieljames | 2008-05-29 00:10:56 +0100 (Thu, 29 May 2008) | 2 lines
Remove several unused parameters.
................
r45883 | danieljames | 2008-05-29 00:11:06 +0100 (Thu, 29 May 2008) | 2 lines
No need to run move_construct_tests1 from move_construct_tests2, already calling it directly.
................
r45884 | danieljames | 2008-05-29 00:11:15 +0100 (Thu, 29 May 2008) | 2 lines
Remove unused 'construct' as in trunk.
................
r45885 | danieljames | 2008-05-29 00:11:25 +0100 (Thu, 29 May 2008) | 2 lines
More consistent implementations of insert_impl.
................
r45886 | danieljames | 2008-05-29 00:11:34 +0100 (Thu, 29 May 2008) | 2 lines
No need to use the single argument version of methods when the variadic version is available. Frees up the non-variadic version for overloading to emulate variadic methods.
................
r45887 | danieljames | 2008-05-29 00:11:44 +0100 (Thu, 29 May 2008) | 2 lines
Add another test, mainly to avoid an unused parameter warning.
................
r45888 | danieljames | 2008-05-29 00:11:54 +0100 (Thu, 29 May 2008) | 2 lines
Adjust the pixels per inch of the buckets diagram so it'll fit on the page.
................
r45889 | danieljames | 2008-05-29 00:15:49 +0100 (Thu, 29 May 2008) | 1 line
Improve pdf output, thanks to John Maddock.
................
r45890 | danieljames | 2008-05-29 00:17:45 +0100 (Thu, 29 May 2008) | 1 line
Add an svg version of the bucket diagram.
................
r45891 | danieljames | 2008-05-29 00:18:11 +0100 (Thu, 29 May 2008) | 1 line
Remove the original dia buckets diagram, I'm not using it anymore.
................
r46025 | danieljames | 2008-06-01 18:39:51 +0100 (Sun, 01 Jun 2008) | 1 line
Initialise merging from doc.
................
r46030 | danieljames | 2008-06-01 18:54:36 +0100 (Sun, 01 Jun 2008) | 29 lines
Merge in documentation improvements from the doc branch.
Merged revisions 45892-46020 via svnmerge from
https://svn.boost.org/svn/boost/branches/doc
........
r45892 | danieljames | 2008-05-29 00:30:07 +0100 (Thu, 29 May 2008) | 1 line
Merge latest changes from unordered.
........
r46017 | danieljames | 2008-06-01 18:18:15 +0100 (Sun, 01 Jun 2008) | 2 lines
Use both PNG and SVG versions of the buckets diagram.
........
r46018 | danieljames | 2008-06-01 18:18:27 +0100 (Sun, 01 Jun 2008) | 2 lines
Improved function summary tables in unordered documenations.
........
r46019 | danieljames | 2008-06-01 18:18:39 +0100 (Sun, 01 Jun 2008) | 3 lines
I'd hacked the bibliography to avoid showing the title twice, but this was
causing problems when generating PDFs, so show the title twice.
........
r46020 | danieljames | 2008-06-01 18:18:52 +0100 (Sun, 01 Jun 2008) | 3 lines
Don't use the compact boostbook refernce style in the standalone documentation
as it is too wide for printing out.
........
................
[SVN r46031]
2008-06-01 18:00:53 +00:00
|
|
|
test::random_values<X> vx(50, generator), vy(100, generator);
|
2006-05-21 17:14:11 +00:00
|
|
|
X x(vx.begin(), vx.end(), 0, hasher(), key_equal(), allocator_type(1));
|
|
|
|
X y(vy.begin(), vy.end(), 0, hasher(), key_equal(), allocator_type(2));
|
2011-08-14 18:53:29 +00:00
|
|
|
|
2011-08-15 20:23:29 +00:00
|
|
|
if (allocator_type::is_propagate_on_swap ||
|
2011-08-14 18:53:29 +00:00
|
|
|
x.get_allocator() == y.get_allocator())
|
|
|
|
{
|
|
|
|
swap_test_impl(x, y);
|
|
|
|
}
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
{
|
2011-08-14 18:53:29 +00:00
|
|
|
test::force_equal_allocator force_(
|
2011-08-15 20:23:29 +00:00
|
|
|
!allocator_type::is_propagate_on_swap);
|
2011-08-14 18:52:43 +00:00
|
|
|
test::check_instances check_;
|
|
|
|
|
Merge test improvements, pdf documentation improvements, some implementation
tweaks.
Merged revisions 45747-46030 via svnmerge from
https://svn.boost.org/svn/boost/branches/unordered/trunk
................
r45747 | danieljames | 2008-05-25 18:03:30 +0100 (Sun, 25 May 2008) | 1 line
Remove /branches/unordered/dev from svnmerge tracking.
................
r45874 | danieljames | 2008-05-28 18:54:53 +0100 (Wed, 28 May 2008) | 1 line
Merge from trunk.
................
r45881 | danieljames | 2008-05-29 00:10:37 +0100 (Thu, 29 May 2008) | 2 lines
Make it possible to use a custom generator in more places.
................
r45882 | danieljames | 2008-05-29 00:10:56 +0100 (Thu, 29 May 2008) | 2 lines
Remove several unused parameters.
................
r45883 | danieljames | 2008-05-29 00:11:06 +0100 (Thu, 29 May 2008) | 2 lines
No need to run move_construct_tests1 from move_construct_tests2, already calling it directly.
................
r45884 | danieljames | 2008-05-29 00:11:15 +0100 (Thu, 29 May 2008) | 2 lines
Remove unused 'construct' as in trunk.
................
r45885 | danieljames | 2008-05-29 00:11:25 +0100 (Thu, 29 May 2008) | 2 lines
More consistent implementations of insert_impl.
................
r45886 | danieljames | 2008-05-29 00:11:34 +0100 (Thu, 29 May 2008) | 2 lines
No need to use the single argument version of methods when the variadic version is available. Frees up the non-variadic version for overloading to emulate variadic methods.
................
r45887 | danieljames | 2008-05-29 00:11:44 +0100 (Thu, 29 May 2008) | 2 lines
Add another test, mainly to avoid an unused parameter warning.
................
r45888 | danieljames | 2008-05-29 00:11:54 +0100 (Thu, 29 May 2008) | 2 lines
Adjust the pixels per inch of the buckets diagram so it'll fit on the page.
................
r45889 | danieljames | 2008-05-29 00:15:49 +0100 (Thu, 29 May 2008) | 1 line
Improve pdf output, thanks to John Maddock.
................
r45890 | danieljames | 2008-05-29 00:17:45 +0100 (Thu, 29 May 2008) | 1 line
Add an svg version of the bucket diagram.
................
r45891 | danieljames | 2008-05-29 00:18:11 +0100 (Thu, 29 May 2008) | 1 line
Remove the original dia buckets diagram, I'm not using it anymore.
................
r46025 | danieljames | 2008-06-01 18:39:51 +0100 (Sun, 01 Jun 2008) | 1 line
Initialise merging from doc.
................
r46030 | danieljames | 2008-06-01 18:54:36 +0100 (Sun, 01 Jun 2008) | 29 lines
Merge in documentation improvements from the doc branch.
Merged revisions 45892-46020 via svnmerge from
https://svn.boost.org/svn/boost/branches/doc
........
r45892 | danieljames | 2008-05-29 00:30:07 +0100 (Thu, 29 May 2008) | 1 line
Merge latest changes from unordered.
........
r46017 | danieljames | 2008-06-01 18:18:15 +0100 (Sun, 01 Jun 2008) | 2 lines
Use both PNG and SVG versions of the buckets diagram.
........
r46018 | danieljames | 2008-06-01 18:18:27 +0100 (Sun, 01 Jun 2008) | 2 lines
Improved function summary tables in unordered documenations.
........
r46019 | danieljames | 2008-06-01 18:18:39 +0100 (Sun, 01 Jun 2008) | 3 lines
I'd hacked the bibliography to avoid showing the title twice, but this was
causing problems when generating PDFs, so show the title twice.
........
r46020 | danieljames | 2008-06-01 18:18:52 +0100 (Sun, 01 Jun 2008) | 3 lines
Don't use the compact boostbook refernce style in the standalone documentation
as it is too wide for printing out.
........
................
[SVN r46031]
2008-06-01 18:00:53 +00:00
|
|
|
test::random_values<X> vx(100, generator), vy(100, generator);
|
2010-01-04 22:49:39 +00:00
|
|
|
X x(vx.begin(), vx.end(), 0, hasher(1), key_equal(1),
|
|
|
|
allocator_type(1));
|
|
|
|
X y(vy.begin(), vy.end(), 0, hasher(2), key_equal(2),
|
|
|
|
allocator_type(2));
|
2011-08-14 18:53:29 +00:00
|
|
|
|
2011-08-15 20:23:29 +00:00
|
|
|
if (allocator_type::is_propagate_on_swap ||
|
2011-08-14 18:53:29 +00:00
|
|
|
x.get_allocator() == y.get_allocator())
|
|
|
|
{
|
|
|
|
swap_test_impl(x, y);
|
|
|
|
swap_test_impl(x, y);
|
|
|
|
}
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-07-08 11:55:35 +00:00
|
|
|
boost::unordered_map<test::object, test::object,
|
|
|
|
test::hash, test::equal_to,
|
|
|
|
std::allocator<test::object> >* test_map_std_alloc;
|
|
|
|
|
2010-01-04 22:49:39 +00:00
|
|
|
boost::unordered_set<test::object,
|
2011-08-14 18:53:29 +00:00
|
|
|
test::hash, test::equal_to,
|
2012-07-08 11:55:35 +00:00
|
|
|
test::allocator1<test::object> >* test_set;
|
2010-01-04 22:49:39 +00:00
|
|
|
boost::unordered_multiset<test::object,
|
2011-08-14 18:53:29 +00:00
|
|
|
test::hash, test::equal_to,
|
2012-07-08 11:55:35 +00:00
|
|
|
test::allocator2<test::object> >* test_multiset;
|
2010-01-04 22:49:39 +00:00
|
|
|
boost::unordered_map<test::object, test::object,
|
2011-08-14 18:53:29 +00:00
|
|
|
test::hash, test::equal_to,
|
2012-07-08 11:55:35 +00:00
|
|
|
test::allocator1<test::object> >* test_map;
|
2010-01-04 22:49:39 +00:00
|
|
|
boost::unordered_multimap<test::object, test::object,
|
2011-08-14 18:53:29 +00:00
|
|
|
test::hash, test::equal_to,
|
2012-07-08 11:55:35 +00:00
|
|
|
test::allocator2<test::object> >* test_multimap;
|
2008-03-24 17:03:15 +00:00
|
|
|
|
2011-08-14 18:53:29 +00:00
|
|
|
boost::unordered_set<test::object,
|
|
|
|
test::hash, test::equal_to,
|
|
|
|
test::cxx11_allocator<test::object, test::propagate_swap> >*
|
|
|
|
test_set_prop_swap;
|
|
|
|
boost::unordered_multiset<test::object,
|
|
|
|
test::hash, test::equal_to,
|
|
|
|
test::cxx11_allocator<test::object, test::propagate_swap> >*
|
|
|
|
test_multiset_prop_swap;
|
|
|
|
boost::unordered_map<test::object, test::object,
|
|
|
|
test::hash, test::equal_to,
|
|
|
|
test::cxx11_allocator<test::object, test::propagate_swap> >*
|
|
|
|
test_map_prop_swap;
|
|
|
|
boost::unordered_multimap<test::object, test::object,
|
|
|
|
test::hash, test::equal_to,
|
|
|
|
test::cxx11_allocator<test::object, test::propagate_swap> >*
|
|
|
|
test_multimap_prop_swap;
|
2008-03-24 17:03:15 +00:00
|
|
|
|
2011-08-14 18:53:29 +00:00
|
|
|
boost::unordered_set<test::object,
|
|
|
|
test::hash, test::equal_to,
|
|
|
|
test::cxx11_allocator<test::object, test::no_propagate_swap> >*
|
|
|
|
test_set_no_prop_swap;
|
|
|
|
boost::unordered_multiset<test::object,
|
|
|
|
test::hash, test::equal_to,
|
|
|
|
test::cxx11_allocator<test::object, test::no_propagate_swap> >*
|
|
|
|
test_multiset_no_prop_swap;
|
|
|
|
boost::unordered_map<test::object, test::object,
|
|
|
|
test::hash, test::equal_to,
|
|
|
|
test::cxx11_allocator<test::object, test::no_propagate_swap> >*
|
|
|
|
test_map_no_prop_swap;
|
|
|
|
boost::unordered_multimap<test::object, test::object,
|
|
|
|
test::hash, test::equal_to,
|
|
|
|
test::cxx11_allocator<test::object, test::no_propagate_swap> >*
|
|
|
|
test_multimap_no_prop_swap;
|
|
|
|
|
2011-08-15 20:23:29 +00:00
|
|
|
template <typename T>
|
|
|
|
bool is_propagate(T*)
|
|
|
|
{
|
|
|
|
return T::allocator_type::is_propagate_on_swap;
|
|
|
|
}
|
|
|
|
|
2012-09-05 23:33:22 +00:00
|
|
|
using test::default_generator;
|
|
|
|
using test::generate_collisions;
|
2016-10-06 17:06:32 +01:00
|
|
|
using test::limited_range;
|
2012-09-05 23:33:22 +00:00
|
|
|
|
2011-08-15 20:23:29 +00:00
|
|
|
UNORDERED_AUTO_TEST(check_traits)
|
|
|
|
{
|
|
|
|
BOOST_TEST(!is_propagate(test_set));
|
|
|
|
BOOST_TEST(is_propagate(test_set_prop_swap));
|
|
|
|
BOOST_TEST(!is_propagate(test_set_no_prop_swap));
|
|
|
|
}
|
|
|
|
|
2011-08-14 18:53:29 +00:00
|
|
|
UNORDERED_TEST(swap_tests1, (
|
2012-09-05 23:33:22 +00:00
|
|
|
(test_map_std_alloc)
|
|
|
|
(test_set)(test_multiset)(test_map)(test_multimap)
|
|
|
|
(test_set_prop_swap)(test_multiset_prop_swap)(test_map_prop_swap)(test_multimap_prop_swap)
|
|
|
|
(test_set_no_prop_swap)(test_multiset_no_prop_swap)(test_map_no_prop_swap)(test_multimap_no_prop_swap)
|
|
|
|
)
|
2016-10-06 17:06:32 +01:00
|
|
|
((default_generator)(generate_collisions)(limited_range))
|
2012-09-05 23:33:22 +00:00
|
|
|
)
|
2011-08-14 18:53:29 +00:00
|
|
|
|
|
|
|
UNORDERED_TEST(swap_tests2, (
|
2012-09-05 23:33:22 +00:00
|
|
|
(test_set)(test_multiset)(test_map)(test_multimap)
|
|
|
|
(test_set_prop_swap)(test_multiset_prop_swap)(test_map_prop_swap)(test_multimap_prop_swap)
|
|
|
|
(test_set_no_prop_swap)(test_multiset_no_prop_swap)(test_map_no_prop_swap)(test_multimap_no_prop_swap)
|
|
|
|
)
|
2016-10-06 17:06:32 +01:00
|
|
|
((default_generator)(generate_collisions)(limited_range))
|
2012-09-05 23:33:22 +00:00
|
|
|
)
|
2008-03-24 17:03:15 +00:00
|
|
|
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
2008-03-24 17:03:15 +00:00
|
|
|
RUN_TESTS()
|