2006-05-17 17:19:16 +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-17 17:19:16 +00:00
|
|
|
|
2009-11-28 11:40:08 +00:00
|
|
|
#include "../helpers/prefix.hpp"
|
2006-05-17 17:19:16 +00:00
|
|
|
#include <boost/unordered_set.hpp>
|
|
|
|
|
#include <boost/unordered_map.hpp>
|
2012-05-03 22:05:21 +00:00
|
|
|
#include "../helpers/postfix.hpp"
|
|
|
|
|
|
2008-03-24 17:03:15 +00:00
|
|
|
#include "../helpers/test.hpp"
|
2006-05-17 17:19:16 +00:00
|
|
|
#include <algorithm>
|
|
|
|
|
#include <map>
|
Merge in support for equality operators for the unordered containers and
hopefully better cross-platform support.
Merged revisions 44778-44835,44837-44918 via svnmerge from
https://svn.boost.org/svn/boost/branches/unordered/trunk
........
r44778 | danieljames | 2008-04-26 17:15:44 +0100 (Sat, 26 Apr 2008) | 2 lines
Remove a trailing comma.
........
r44779 | danieljames | 2008-04-26 17:23:51 +0100 (Sat, 26 Apr 2008) | 1 line
Merge in support for equality operators.
........
r44780 | danieljames | 2008-04-26 17:28:44 +0100 (Sat, 26 Apr 2008) | 1 line
Use my own list container to avoid working around STL container bugs.
........
r44833 | danieljames | 2008-04-28 08:03:43 +0100 (Mon, 28 Apr 2008) | 1 line
Better equality tests.
........
r44834 | danieljames | 2008-04-28 08:04:03 +0100 (Mon, 28 Apr 2008) | 1 line
Remove a superfluous check.
........
r44835 | danieljames | 2008-04-28 08:04:21 +0100 (Mon, 28 Apr 2008) | 1 line
Add equality reference documentation.
........
r44916 | danieljames | 2008-04-30 08:16:52 +0100 (Wed, 30 Apr 2008) | 1 line
New version of list.hpp
........
r44917 | danieljames | 2008-04-30 08:18:31 +0100 (Wed, 30 Apr 2008) | 1 line
Support compilers without ADL in the compile tests.
........
r44918 | danieljames | 2008-04-30 08:25:20 +0100 (Wed, 30 Apr 2008) | 7 lines
Change the typedef of buffered functions as it was confusing MSVC 6.5
get_allocator wasn't compiling when the allocator workaround is used because it
couldn't cast from the wrapped allocator to an allocator of another type. So
use value_alloc_ when it's available (it's only unavailable on compilers with
C++0x support, which don't require the workaround).
........
[SVN r44919]
2008-04-30 07:57:04 +00:00
|
|
|
#include "../helpers/list.hpp"
|
2006-05-17 17:19:16 +00:00
|
|
|
#include "../helpers/tracker.hpp"
|
|
|
|
|
#include "../helpers/invariants.hpp"
|
|
|
|
|
|
|
|
|
|
#include <iostream>
|
|
|
|
|
|
|
|
|
|
template <class Container, class Iterator>
|
|
|
|
|
void test_equal_insertion(Iterator begin, Iterator end)
|
|
|
|
|
{
|
|
|
|
|
typedef test::ordered<Container> tracker;
|
|
|
|
|
|
|
|
|
|
Container x1;
|
|
|
|
|
tracker x2 = test::create_ordered(x1);
|
|
|
|
|
|
|
|
|
|
for(Iterator it = begin; it != end; ++it) {
|
|
|
|
|
x1.insert(*it);
|
|
|
|
|
x2.insert(*it);
|
|
|
|
|
x2.compare_key(x1, *it);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
x2.compare(x1);
|
|
|
|
|
test::check_equivalent_keys(x1);
|
|
|
|
|
}
|
|
|
|
|
|
2008-03-24 17:03:15 +00:00
|
|
|
UNORDERED_AUTO_TEST(set_tests)
|
2006-05-17 17:19:16 +00:00
|
|
|
{
|
|
|
|
|
int values[][5] = {
|
|
|
|
|
{1},
|
|
|
|
|
{54, 23},
|
|
|
|
|
{-13, 65},
|
|
|
|
|
{77, 77},
|
|
|
|
|
{986, 25, 986}
|
|
|
|
|
};
|
|
|
|
|
|
2010-01-08 05:39:54 +00:00
|
|
|
typedef boost::unordered_set<int> set;
|
|
|
|
|
typedef boost::unordered_multiset<int> multiset;
|
|
|
|
|
|
|
|
|
|
test_equal_insertion<set>(values[0], values[0] + 1);
|
|
|
|
|
test_equal_insertion<set>(values[1], values[1] + 2);
|
|
|
|
|
test_equal_insertion<set>(values[2], values[2] + 2);
|
|
|
|
|
test_equal_insertion<set>(values[3], values[3] + 2);
|
|
|
|
|
test_equal_insertion<set>(values[4], values[4] + 3);
|
|
|
|
|
|
|
|
|
|
test_equal_insertion<multiset>(values[0], values[0] + 1);
|
|
|
|
|
test_equal_insertion<multiset>(values[1], values[1] + 2);
|
|
|
|
|
test_equal_insertion<multiset>(values[2], values[2] + 2);
|
|
|
|
|
test_equal_insertion<multiset>(values[3], values[3] + 2);
|
|
|
|
|
test_equal_insertion<multiset>(values[4], values[4] + 3);
|
2006-05-17 17:19:16 +00:00
|
|
|
}
|
|
|
|
|
|
2008-03-24 17:03:15 +00:00
|
|
|
UNORDERED_AUTO_TEST(map_tests)
|
2006-05-17 17:19:16 +00:00
|
|
|
{
|
Merge in support for equality operators for the unordered containers and
hopefully better cross-platform support.
Merged revisions 44778-44835,44837-44918 via svnmerge from
https://svn.boost.org/svn/boost/branches/unordered/trunk
........
r44778 | danieljames | 2008-04-26 17:15:44 +0100 (Sat, 26 Apr 2008) | 2 lines
Remove a trailing comma.
........
r44779 | danieljames | 2008-04-26 17:23:51 +0100 (Sat, 26 Apr 2008) | 1 line
Merge in support for equality operators.
........
r44780 | danieljames | 2008-04-26 17:28:44 +0100 (Sat, 26 Apr 2008) | 1 line
Use my own list container to avoid working around STL container bugs.
........
r44833 | danieljames | 2008-04-28 08:03:43 +0100 (Mon, 28 Apr 2008) | 1 line
Better equality tests.
........
r44834 | danieljames | 2008-04-28 08:04:03 +0100 (Mon, 28 Apr 2008) | 1 line
Remove a superfluous check.
........
r44835 | danieljames | 2008-04-28 08:04:21 +0100 (Mon, 28 Apr 2008) | 1 line
Add equality reference documentation.
........
r44916 | danieljames | 2008-04-30 08:16:52 +0100 (Wed, 30 Apr 2008) | 1 line
New version of list.hpp
........
r44917 | danieljames | 2008-04-30 08:18:31 +0100 (Wed, 30 Apr 2008) | 1 line
Support compilers without ADL in the compile tests.
........
r44918 | danieljames | 2008-04-30 08:25:20 +0100 (Wed, 30 Apr 2008) | 7 lines
Change the typedef of buffered functions as it was confusing MSVC 6.5
get_allocator wasn't compiling when the allocator workaround is used because it
couldn't cast from the wrapped allocator to an allocator of another type. So
use value_alloc_ when it's available (it's only unavailable on compilers with
C++0x support, which don't require the workaround).
........
[SVN r44919]
2008-04-30 07:57:04 +00:00
|
|
|
typedef test::list<std::pair<int const, int> > values_type;
|
2006-05-17 17:19:16 +00:00
|
|
|
values_type v[5];
|
|
|
|
|
v[0].push_back(std::pair<int const, int>(1,1));
|
|
|
|
|
v[1].push_back(std::pair<int const, int>(28,34));
|
|
|
|
|
v[1].push_back(std::pair<int const, int>(16,58));
|
|
|
|
|
v[1].push_back(std::pair<int const, int>(-124, 62));
|
|
|
|
|
v[2].push_back(std::pair<int const, int>(432,12));
|
|
|
|
|
v[2].push_back(std::pair<int const, int>(9,13));
|
|
|
|
|
v[2].push_back(std::pair<int const, int>(432,24));
|
|
|
|
|
|
|
|
|
|
for(int i = 0; i < 5; ++i)
|
|
|
|
|
test_equal_insertion<boost::unordered_map<int, int> >(
|
|
|
|
|
v[i].begin(), v[i].end());
|
|
|
|
|
|
|
|
|
|
for(int i2 = 0; i2 < 5; ++i2)
|
|
|
|
|
test_equal_insertion<boost::unordered_multimap<int, int> >(
|
|
|
|
|
v[i2].begin(), v[i2].end());
|
|
|
|
|
}
|
|
|
|
|
|
2008-03-24 17:03:15 +00:00
|
|
|
RUN_TESTS()
|