2006-03-19 22:24:06 +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-03-19 22:24:06 +00:00
|
|
|
|
|
|
|
|
// This test creates the containers with members that meet their minimum
|
|
|
|
|
// requirements. Makes sure everything compiles and is defined correctly.
|
|
|
|
|
|
2009-11-28 11:40:08 +00:00
|
|
|
#include "../helpers/prefix.hpp"
|
|
|
|
|
|
2006-03-19 22:24:06 +00:00
|
|
|
#include <boost/unordered_map.hpp>
|
|
|
|
|
|
|
|
|
|
#include <iostream>
|
2008-03-24 17:03:15 +00:00
|
|
|
#include "../helpers/test.hpp"
|
2006-03-19 22:24:06 +00:00
|
|
|
#include "../objects/minimal.hpp"
|
|
|
|
|
#include "./compile_tests.hpp"
|
|
|
|
|
|
2008-06-15 19:21:12 +00:00
|
|
|
// Explicit instantiation to catch compile-time errors
|
|
|
|
|
|
2011-08-21 19:19:12 +00:00
|
|
|
template class boost::unordered_map<
|
|
|
|
|
int,
|
|
|
|
|
int,
|
|
|
|
|
boost::hash<int>,
|
|
|
|
|
std::equal_to<int>,
|
|
|
|
|
test::minimal::allocator<std::pair<int const, int> > >;
|
|
|
|
|
template class boost::unordered_multimap<
|
|
|
|
|
int,
|
|
|
|
|
int,
|
|
|
|
|
boost::hash<int>,
|
|
|
|
|
std::equal_to<int>,
|
|
|
|
|
test::minimal::allocator<std::pair<int const, int> > >;
|
|
|
|
|
|
2008-06-15 19:21:12 +00:00
|
|
|
template class boost::unordered_map<
|
|
|
|
|
test::minimal::assignable,
|
|
|
|
|
test::minimal::default_copy_constructible,
|
|
|
|
|
test::minimal::hash<test::minimal::assignable>,
|
|
|
|
|
test::minimal::equal_to<test::minimal::assignable>,
|
|
|
|
|
test::minimal::allocator<test::minimal::assignable> >;
|
|
|
|
|
template class boost::unordered_multimap<
|
|
|
|
|
test::minimal::assignable,
|
|
|
|
|
test::minimal::copy_constructible,
|
|
|
|
|
test::minimal::hash<test::minimal::assignable>,
|
|
|
|
|
test::minimal::equal_to<test::minimal::assignable>,
|
|
|
|
|
test::minimal::allocator<test::minimal::assignable> >;
|
|
|
|
|
|
2008-03-24 17:03:15 +00:00
|
|
|
UNORDERED_AUTO_TEST(test0)
|
2006-03-19 22:24:06 +00:00
|
|
|
{
|
2011-08-21 19:19:12 +00:00
|
|
|
test::minimal::constructor_param x;
|
|
|
|
|
|
2006-03-19 22:24:06 +00:00
|
|
|
typedef std::pair<test::minimal::assignable const,
|
|
|
|
|
test::minimal::copy_constructible> value_type;
|
2011-08-21 19:19:12 +00:00
|
|
|
value_type value(x, x);
|
2006-03-19 22:24:06 +00:00
|
|
|
|
|
|
|
|
std::cout<<"Test unordered_map.\n";
|
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
|
|
|
|
|
|
|
|
boost::unordered_map<int, int> int_map;
|
|
|
|
|
|
2011-08-21 19:19:12 +00:00
|
|
|
boost::unordered_map<int, int,
|
|
|
|
|
boost::hash<int>, std::equal_to<int>,
|
|
|
|
|
test::minimal::cxx11_allocator<std::pair<int const, int> >
|
|
|
|
|
> int_map2;
|
|
|
|
|
|
2006-03-19 22:24:06 +00:00
|
|
|
boost::unordered_map<
|
|
|
|
|
test::minimal::assignable,
|
|
|
|
|
test::minimal::copy_constructible,
|
|
|
|
|
test::minimal::hash<test::minimal::assignable>,
|
|
|
|
|
test::minimal::equal_to<test::minimal::assignable>,
|
|
|
|
|
test::minimal::allocator<value_type> > 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
|
|
|
container_test(int_map, std::pair<int const, int>(0, 0));
|
2011-08-21 19:19:12 +00:00
|
|
|
container_test(int_map2, std::pair<int const, int>(0, 0));
|
2006-03-19 22:24:06 +00:00
|
|
|
container_test(map, value);
|
|
|
|
|
|
|
|
|
|
std::cout<<"Test unordered_multimap.\n";
|
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
|
|
|
|
|
|
|
|
boost::unordered_multimap<int, int> int_multimap;
|
|
|
|
|
|
2011-08-21 19:19:12 +00:00
|
|
|
boost::unordered_multimap<int, int,
|
|
|
|
|
boost::hash<int>, std::equal_to<int>,
|
|
|
|
|
test::minimal::cxx11_allocator<std::pair<int const, int> >
|
|
|
|
|
> int_multimap2;
|
|
|
|
|
|
2006-03-19 22:24:06 +00:00
|
|
|
boost::unordered_multimap<
|
|
|
|
|
test::minimal::assignable,
|
|
|
|
|
test::minimal::copy_constructible,
|
|
|
|
|
test::minimal::hash<test::minimal::assignable>,
|
|
|
|
|
test::minimal::equal_to<test::minimal::assignable>,
|
|
|
|
|
test::minimal::allocator<value_type> > multimap;
|
|
|
|
|
|
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
|
|
|
container_test(int_multimap, std::pair<int const, int>(0, 0));
|
2011-08-21 19:19:12 +00:00
|
|
|
container_test(int_multimap2, std::pair<int const, int>(0, 0));
|
2006-03-19 22:24:06 +00:00
|
|
|
container_test(multimap, value);
|
2008-01-06 17:13:15 +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
|
|
|
UNORDERED_AUTO_TEST(equality_tests) {
|
2011-08-21 19:19:12 +00:00
|
|
|
typedef std::pair<
|
|
|
|
|
test::minimal::copy_constructible_equality_comparable const,
|
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
|
|
|
test::minimal::copy_constructible> value_type;
|
|
|
|
|
|
|
|
|
|
boost::unordered_map<int, int> int_map;
|
|
|
|
|
|
2011-08-21 19:19:12 +00:00
|
|
|
boost::unordered_map<int, int,
|
|
|
|
|
boost::hash<int>, std::equal_to<int>,
|
|
|
|
|
test::minimal::cxx11_allocator<std::pair<int const, int> >
|
|
|
|
|
> int_map2;
|
|
|
|
|
|
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
|
|
|
boost::unordered_map<
|
|
|
|
|
test::minimal::copy_constructible_equality_comparable,
|
2011-08-21 19:19:12 +00:00
|
|
|
test::minimal::copy_constructible_equality_comparable,
|
|
|
|
|
test::minimal::hash<test::minimal::copy_constructible_equality_comparable>,
|
|
|
|
|
test::minimal::equal_to<test::minimal::copy_constructible_equality_comparable>,
|
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
|
|
|
test::minimal::allocator<value_type> > map;
|
|
|
|
|
|
|
|
|
|
equality_test(int_map);
|
2011-08-21 19:19:12 +00:00
|
|
|
equality_test(int_map2);
|
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
|
|
|
equality_test(map);
|
|
|
|
|
|
|
|
|
|
boost::unordered_multimap<int, int> int_multimap;
|
|
|
|
|
|
2011-08-21 19:19:12 +00:00
|
|
|
boost::unordered_multimap<int, int,
|
|
|
|
|
boost::hash<int>, std::equal_to<int>,
|
|
|
|
|
test::minimal::cxx11_allocator<std::pair<int const, int> >
|
|
|
|
|
> int_multimap2;
|
|
|
|
|
|
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
|
|
|
boost::unordered_multimap<
|
|
|
|
|
test::minimal::copy_constructible_equality_comparable,
|
2011-08-21 19:19:12 +00:00
|
|
|
test::minimal::copy_constructible_equality_comparable,
|
|
|
|
|
test::minimal::hash<test::minimal::copy_constructible_equality_comparable>,
|
|
|
|
|
test::minimal::equal_to<test::minimal::copy_constructible_equality_comparable>,
|
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
|
|
|
test::minimal::allocator<value_type> > multimap;
|
|
|
|
|
|
|
|
|
|
equality_test(int_multimap);
|
2011-08-21 19:19:12 +00:00
|
|
|
equality_test(int_multimap2);
|
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
|
|
|
equality_test(multimap);
|
|
|
|
|
}
|
|
|
|
|
|
2008-03-24 17:03:15 +00:00
|
|
|
UNORDERED_AUTO_TEST(test1) {
|
2008-01-06 17:13:15 +00:00
|
|
|
boost::hash<int> hash;
|
|
|
|
|
std::equal_to<int> equal_to;
|
|
|
|
|
int value = 0;
|
|
|
|
|
std::pair<int const, int> map_value(0, 0);
|
|
|
|
|
|
|
|
|
|
std::cout<<"Test unordered_map.\n";
|
|
|
|
|
|
|
|
|
|
boost::unordered_map<int, int> map;
|
|
|
|
|
|
2011-08-21 19:19:12 +00:00
|
|
|
boost::unordered_map<int, int,
|
|
|
|
|
boost::hash<int>, std::equal_to<int>,
|
|
|
|
|
test::minimal::cxx11_allocator<std::pair<int const, int> >
|
|
|
|
|
> map2;
|
|
|
|
|
|
2008-01-06 17:13:15 +00:00
|
|
|
unordered_unique_test(map, map_value);
|
|
|
|
|
unordered_map_test(map, value, value);
|
2011-08-21 19:19:12 +00:00
|
|
|
unordered_copyable_test(map, value, map_value, hash, equal_to);
|
2008-01-06 17:13:15 +00:00
|
|
|
unordered_map_functions(map, value, value);
|
|
|
|
|
|
2011-08-21 19:19:12 +00:00
|
|
|
unordered_unique_test(map2, map_value);
|
|
|
|
|
unordered_map_test(map2, value, value);
|
|
|
|
|
unordered_copyable_test(map2, value, map_value, hash, equal_to);
|
|
|
|
|
unordered_map_functions(map2, value, value);
|
|
|
|
|
|
2008-01-06 17:13:15 +00:00
|
|
|
std::cout<<"Test unordered_multimap.\n";
|
|
|
|
|
|
|
|
|
|
boost::unordered_multimap<int, int> multimap;
|
|
|
|
|
|
2011-08-21 19:19:12 +00:00
|
|
|
boost::unordered_multimap<int, int,
|
|
|
|
|
boost::hash<int>, std::equal_to<int>,
|
|
|
|
|
test::minimal::cxx11_allocator<std::pair<int const, int> >
|
|
|
|
|
> multimap2;
|
|
|
|
|
|
2008-01-06 17:13:15 +00:00
|
|
|
unordered_equivalent_test(multimap, map_value);
|
|
|
|
|
unordered_map_test(multimap, value, value);
|
2011-08-21 19:19:12 +00:00
|
|
|
unordered_copyable_test(multimap, value, map_value, hash, equal_to);
|
|
|
|
|
|
|
|
|
|
unordered_equivalent_test(multimap2, map_value);
|
|
|
|
|
unordered_map_test(multimap2, value, value);
|
|
|
|
|
unordered_copyable_test(multimap2, value, map_value, hash, equal_to);
|
2008-01-06 17:13:15 +00:00
|
|
|
}
|
|
|
|
|
|
2008-03-24 17:03:15 +00:00
|
|
|
UNORDERED_AUTO_TEST(test2)
|
2008-01-06 17:13:15 +00:00
|
|
|
{
|
2011-08-21 19:19:12 +00:00
|
|
|
test::minimal::constructor_param x;
|
|
|
|
|
|
|
|
|
|
test::minimal::assignable assignable(x);
|
|
|
|
|
test::minimal::copy_constructible copy_constructible(x);
|
|
|
|
|
test::minimal::hash<test::minimal::assignable> hash(x);
|
|
|
|
|
test::minimal::equal_to<test::minimal::assignable> equal_to(x);
|
2008-01-06 17:13:15 +00:00
|
|
|
|
|
|
|
|
typedef std::pair<test::minimal::assignable const,
|
|
|
|
|
test::minimal::copy_constructible> map_value_type;
|
|
|
|
|
map_value_type map_value(assignable, copy_constructible);
|
|
|
|
|
|
|
|
|
|
std::cout<<"Test unordered_map.\n";
|
|
|
|
|
|
|
|
|
|
boost::unordered_map<
|
|
|
|
|
test::minimal::assignable,
|
|
|
|
|
test::minimal::copy_constructible,
|
|
|
|
|
test::minimal::hash<test::minimal::assignable>,
|
|
|
|
|
test::minimal::equal_to<test::minimal::assignable>,
|
|
|
|
|
test::minimal::allocator<map_value_type> > map;
|
|
|
|
|
|
|
|
|
|
unordered_unique_test(map, map_value);
|
|
|
|
|
unordered_map_test(map, assignable, copy_constructible);
|
2011-08-21 19:19:12 +00:00
|
|
|
unordered_copyable_test(map, assignable, map_value, hash, equal_to);
|
2008-01-06 17:13:15 +00:00
|
|
|
|
|
|
|
|
boost::unordered_map<
|
|
|
|
|
test::minimal::assignable,
|
|
|
|
|
test::minimal::default_copy_constructible,
|
|
|
|
|
test::minimal::hash<test::minimal::assignable>,
|
|
|
|
|
test::minimal::equal_to<test::minimal::assignable>,
|
|
|
|
|
test::minimal::allocator<map_value_type> > map2;
|
|
|
|
|
|
|
|
|
|
test::minimal::default_copy_constructible default_copy_constructible;
|
|
|
|
|
|
|
|
|
|
unordered_map_functions(map2, assignable, default_copy_constructible);
|
|
|
|
|
|
|
|
|
|
std::cout<<"Test unordered_multimap.\n";
|
|
|
|
|
|
|
|
|
|
boost::unordered_multimap<
|
|
|
|
|
test::minimal::assignable,
|
|
|
|
|
test::minimal::copy_constructible,
|
|
|
|
|
test::minimal::hash<test::minimal::assignable>,
|
|
|
|
|
test::minimal::equal_to<test::minimal::assignable>,
|
|
|
|
|
test::minimal::allocator<map_value_type> > multimap;
|
|
|
|
|
|
|
|
|
|
unordered_equivalent_test(multimap, map_value);
|
|
|
|
|
unordered_map_test(multimap, assignable, copy_constructible);
|
2011-08-21 19:19:12 +00:00
|
|
|
unordered_copyable_test(multimap, assignable, map_value, hash, equal_to);
|
2008-01-06 17:13:15 +00:00
|
|
|
}
|
|
|
|
|
|
2008-03-24 17:03:15 +00:00
|
|
|
RUN_TESTS()
|