2006-05-17 17:09:47 +00:00
|
|
|
|
2008-03-27 23:38:01 +00:00
|
|
|
// Copyright 2005-2008 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:09:47 +00:00
|
|
|
|
2007-08-14 09:55:30 +00:00
|
|
|
#if defined(BOOST_MSVC)
|
|
|
|
#pragma warning(push)
|
|
|
|
#pragma warning(disable:4100) // unreferenced formal parameter
|
|
|
|
#endif
|
|
|
|
|
2006-03-19 22:24:06 +00:00
|
|
|
#include <boost/concept_check.hpp>
|
2007-08-14 09:55:30 +00:00
|
|
|
|
|
|
|
#if defined(BOOST_MSVC)
|
|
|
|
#pragma warning(pop)
|
|
|
|
#endif
|
|
|
|
|
2006-03-19 22:24:06 +00:00
|
|
|
#include <boost/mpl/assert.hpp>
|
|
|
|
#include <boost/mpl/bool.hpp>
|
|
|
|
#include <boost/type_traits/is_same.hpp>
|
|
|
|
#include <boost/type_traits/is_convertible.hpp>
|
|
|
|
#include <boost/iterator/iterator_traits.hpp>
|
|
|
|
#include <boost/limits.hpp>
|
|
|
|
#include "../helpers/check_return_type.hpp"
|
|
|
|
|
|
|
|
typedef long double comparison_type;
|
|
|
|
|
|
|
|
template <class T> void sink(T const&) {}
|
Merge support for emplace for compilers with rvalue references and variadic templates arguments, and better use of C++0x allocators.
Merged revisions 44058-44075,44078-44084,44086-44108,44110-44365,44367,44369-44414,44416-44419,44421-44457,44467-44469,44471-44511,44513-44535,44537-44737 via svnmerge from
https://svn.boost.org/svn/boost/branches/unordered/trunk
................
r44467 | danieljames | 2008-04-16 18:35:56 +0100 (Wed, 16 Apr 2008) | 2 lines
Add C++-0x support to the test allocators.
................
r44468 | danieljames | 2008-04-16 18:36:06 +0100 (Wed, 16 Apr 2008) | 2 lines
Add a C++-0x node_constructor.
................
r44469 | danieljames | 2008-04-16 18:36:16 +0100 (Wed, 16 Apr 2008) | 2 lines
C++-0x constructor for node.
................
r44516 | danieljames | 2008-04-17 21:41:48 +0100 (Thu, 17 Apr 2008) | 16 lines
Merge in my work so far on implementing emplace for compilers with variadic
template & rvalue references.
Merged revisions 44059-44062 via svnmerge from
https://svn.boost.org/svn/boost/branches/unordered/dev
........
r44059 | danieljames | 2008-04-05 17:41:25 +0100 (Sat, 05 Apr 2008) | 1 line
First stab at implementing emplace - only for compilers with variadic template & rvalue references.
........
r44062 | danieljames | 2008-04-05 19:12:09 +0100 (Sat, 05 Apr 2008) | 1 line
Better variable template arguments, need to add proper support to BoostBook.
........
................
r44616 | danieljames | 2008-04-20 13:30:19 +0100 (Sun, 20 Apr 2008) | 1 line
Merge with trunk, fixes tabs.
................
r44618 | danieljames | 2008-04-20 13:42:38 +0100 (Sun, 20 Apr 2008) | 2 lines
Some extra compile tests.
................
r44619 | danieljames | 2008-04-20 13:42:50 +0100 (Sun, 20 Apr 2008) | 2 lines
Fix an error message.
................
r44703 | danieljames | 2008-04-21 20:19:50 +0100 (Mon, 21 Apr 2008) | 15 lines
Merge latest changes from trunk.
Merged revisions 44616-44702 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r44650 | danieljames | 2008-04-20 22:08:57 +0100 (Sun, 20 Apr 2008) | 1 line
Update an include.
........
r44697 | danieljames | 2008-04-21 16:55:40 +0100 (Mon, 21 Apr 2008) | 1 line
Factor out the code for choosing the bucket count, and which bucket that hash values map to make it easier to experiment with alternative policies.
........
................
r44733 | danieljames | 2008-04-23 07:55:43 +0100 (Wed, 23 Apr 2008) | 2 lines
Remove 'reserve_extra'.
................
r44734 | danieljames | 2008-04-23 07:55:55 +0100 (Wed, 23 Apr 2008) | 2 lines
More unnecessary copy tests - showing some weakness in the emplace implementation.
................
r44735 | danieljames | 2008-04-23 07:56:06 +0100 (Wed, 23 Apr 2008) | 2 lines
More tests.
................
r44736 | danieljames | 2008-04-23 07:56:19 +0100 (Wed, 23 Apr 2008) | 2 lines
Comment out a test which requires a C++0x std::pair.
................
r44737 | danieljames | 2008-04-23 07:56:35 +0100 (Wed, 23 Apr 2008) | 2 lines
Avoid creating unnecessary copies in unordered_set::emplace and unordered_map::emplace.
................
[SVN r44738]
2008-04-23 07:09:58 +00:00
|
|
|
template <class T> T rvalue(T const& v) { return v; }
|
2006-03-19 22:24:06 +00:00
|
|
|
|
|
|
|
template <class X, class T>
|
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
|
|
|
void container_test(X& r, T const&)
|
2006-03-19 22:24:06 +00:00
|
|
|
{
|
2008-01-10 22:30:46 +00:00
|
|
|
typedef BOOST_DEDUCED_TYPENAME X::iterator iterator;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME X::const_iterator const_iterator;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME X::difference_type difference_type;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME X::size_type size_type;
|
2006-03-19 22:24:06 +00:00
|
|
|
|
2008-01-10 22:30:46 +00:00
|
|
|
typedef BOOST_DEDUCED_TYPENAME boost::iterator_value<iterator>::type iterator_value_type;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME boost::iterator_value<const_iterator>::type const_iterator_value_type;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME boost::iterator_difference<iterator>::type iterator_difference_type;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME boost::iterator_difference<const_iterator>::type const_iterator_difference_type;
|
2006-03-19 22:24:06 +00:00
|
|
|
|
2008-01-10 22:30:46 +00:00
|
|
|
typedef BOOST_DEDUCED_TYPENAME X::value_type value_type;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME X::reference reference;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME X::const_reference const_reference;
|
2006-03-19 22:24:06 +00:00
|
|
|
|
|
|
|
// value_type
|
|
|
|
|
|
|
|
BOOST_MPL_ASSERT((boost::is_same<T, value_type>));
|
|
|
|
boost::function_requires<boost::CopyConstructibleConcept<X> >();
|
|
|
|
|
|
|
|
// reference_type / const_reference_type
|
|
|
|
|
|
|
|
BOOST_MPL_ASSERT((boost::is_same<T&, reference>));
|
|
|
|
BOOST_MPL_ASSERT((boost::is_same<T const&, const_reference>));
|
|
|
|
|
|
|
|
// iterator
|
|
|
|
|
|
|
|
boost::function_requires<boost::InputIteratorConcept<iterator> >();
|
|
|
|
BOOST_MPL_ASSERT((boost::is_same<T, iterator_value_type>));
|
|
|
|
BOOST_MPL_ASSERT((boost::is_convertible<iterator, const_iterator>));
|
|
|
|
|
|
|
|
// const_iterator
|
|
|
|
|
|
|
|
boost::function_requires<boost::InputIteratorConcept<const_iterator> >();
|
|
|
|
BOOST_MPL_ASSERT((boost::is_same<T, const_iterator_value_type>));
|
|
|
|
|
|
|
|
// difference_type
|
|
|
|
|
|
|
|
BOOST_MPL_ASSERT((boost::mpl::bool_<
|
|
|
|
std::numeric_limits<difference_type>::is_signed>));
|
|
|
|
BOOST_MPL_ASSERT((boost::mpl::bool_<
|
|
|
|
std::numeric_limits<difference_type>::is_integer>));
|
|
|
|
BOOST_MPL_ASSERT((boost::is_same<difference_type,
|
|
|
|
iterator_difference_type>));
|
|
|
|
BOOST_MPL_ASSERT((boost::is_same<difference_type,
|
|
|
|
const_iterator_difference_type>));
|
|
|
|
|
|
|
|
// size_type
|
|
|
|
|
|
|
|
BOOST_MPL_ASSERT_NOT((boost::mpl::bool_<
|
|
|
|
std::numeric_limits<size_type>::is_signed>));
|
|
|
|
BOOST_MPL_ASSERT((boost::mpl::bool_<
|
|
|
|
std::numeric_limits<size_type>::is_integer>));
|
|
|
|
|
|
|
|
// size_type can represent any non-negative value type of difference_type
|
|
|
|
// I'm not sure about either of these tests...
|
|
|
|
size_type max_diff((std::numeric_limits<difference_type>::max)());
|
|
|
|
difference_type converted_diff(max_diff);
|
2008-04-17 07:39:24 +00:00
|
|
|
BOOST_CHECK((std::numeric_limits<difference_type>::max)()
|
2006-03-19 22:24:06 +00:00
|
|
|
== converted_diff);
|
|
|
|
|
2008-04-17 07:39:24 +00:00
|
|
|
BOOST_CHECK(
|
2006-03-19 22:24:06 +00:00
|
|
|
static_cast<comparison_type>(
|
|
|
|
(std::numeric_limits<size_type>::max)()) >
|
|
|
|
static_cast<comparison_type>(
|
|
|
|
(std::numeric_limits<difference_type>::max)()));
|
|
|
|
|
|
|
|
// I don't test the runtime post-conditions here.
|
|
|
|
X u;
|
2008-04-17 07:39:24 +00:00
|
|
|
BOOST_CHECK(u.size() == 0);
|
|
|
|
BOOST_CHECK(X().size() == 0);
|
2006-03-19 22:24:06 +00:00
|
|
|
|
|
|
|
X a,b;
|
|
|
|
|
|
|
|
sink(X(a));
|
|
|
|
X u2(a);
|
|
|
|
X u3 = a;
|
|
|
|
|
|
|
|
X* ptr = new X();
|
|
|
|
X& a1 = *ptr;
|
|
|
|
(&a1)->~X();
|
|
|
|
|
|
|
|
X const a_const;
|
|
|
|
test::check_return_type<iterator>::equals(a.begin());
|
|
|
|
test::check_return_type<const_iterator>::equals(a_const.begin());
|
2006-05-17 17:09:47 +00:00
|
|
|
test::check_return_type<const_iterator>::equals(a.cbegin());
|
|
|
|
test::check_return_type<const_iterator>::equals(a_const.cbegin());
|
2006-03-19 22:24:06 +00:00
|
|
|
test::check_return_type<iterator>::equals(a.end());
|
|
|
|
test::check_return_type<const_iterator>::equals(a_const.end());
|
2006-05-17 17:09:47 +00:00
|
|
|
test::check_return_type<const_iterator>::equals(a.cend());
|
|
|
|
test::check_return_type<const_iterator>::equals(a_const.cend());
|
2006-03-19 22:24:06 +00:00
|
|
|
|
2007-12-19 22:42:12 +00:00
|
|
|
a.swap(b);
|
|
|
|
test::check_return_type<X>::equals_ref(r = a);
|
|
|
|
test::check_return_type<size_type>::equals(a.size());
|
|
|
|
test::check_return_type<size_type>::equals(a.max_size());
|
|
|
|
test::check_return_type<bool>::convertible(a.empty());
|
2008-04-17 07:42:47 +00:00
|
|
|
|
|
|
|
// Allocator
|
|
|
|
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME X::allocator_type allocator_type;
|
|
|
|
test::check_return_type<allocator_type>::equals(a_const.get_allocator());
|
2006-03-19 22:24:06 +00:00
|
|
|
}
|
2008-01-06 17:13:15 +00:00
|
|
|
|
|
|
|
template <class X, class Key>
|
|
|
|
void unordered_set_test(X&, Key const&)
|
|
|
|
{
|
2008-01-10 22:30:46 +00:00
|
|
|
typedef BOOST_DEDUCED_TYPENAME X::value_type value_type;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME X::key_type key_type;
|
2008-01-06 17:13:15 +00:00
|
|
|
|
|
|
|
BOOST_MPL_ASSERT((boost::is_same<value_type, key_type>));
|
|
|
|
}
|
|
|
|
|
|
|
|
template <class X, class Key, class T>
|
Merge support for emplace for compilers with rvalue references and variadic templates arguments, and better use of C++0x allocators.
Merged revisions 44058-44075,44078-44084,44086-44108,44110-44365,44367,44369-44414,44416-44419,44421-44457,44467-44469,44471-44511,44513-44535,44537-44737 via svnmerge from
https://svn.boost.org/svn/boost/branches/unordered/trunk
................
r44467 | danieljames | 2008-04-16 18:35:56 +0100 (Wed, 16 Apr 2008) | 2 lines
Add C++-0x support to the test allocators.
................
r44468 | danieljames | 2008-04-16 18:36:06 +0100 (Wed, 16 Apr 2008) | 2 lines
Add a C++-0x node_constructor.
................
r44469 | danieljames | 2008-04-16 18:36:16 +0100 (Wed, 16 Apr 2008) | 2 lines
C++-0x constructor for node.
................
r44516 | danieljames | 2008-04-17 21:41:48 +0100 (Thu, 17 Apr 2008) | 16 lines
Merge in my work so far on implementing emplace for compilers with variadic
template & rvalue references.
Merged revisions 44059-44062 via svnmerge from
https://svn.boost.org/svn/boost/branches/unordered/dev
........
r44059 | danieljames | 2008-04-05 17:41:25 +0100 (Sat, 05 Apr 2008) | 1 line
First stab at implementing emplace - only for compilers with variadic template & rvalue references.
........
r44062 | danieljames | 2008-04-05 19:12:09 +0100 (Sat, 05 Apr 2008) | 1 line
Better variable template arguments, need to add proper support to BoostBook.
........
................
r44616 | danieljames | 2008-04-20 13:30:19 +0100 (Sun, 20 Apr 2008) | 1 line
Merge with trunk, fixes tabs.
................
r44618 | danieljames | 2008-04-20 13:42:38 +0100 (Sun, 20 Apr 2008) | 2 lines
Some extra compile tests.
................
r44619 | danieljames | 2008-04-20 13:42:50 +0100 (Sun, 20 Apr 2008) | 2 lines
Fix an error message.
................
r44703 | danieljames | 2008-04-21 20:19:50 +0100 (Mon, 21 Apr 2008) | 15 lines
Merge latest changes from trunk.
Merged revisions 44616-44702 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r44650 | danieljames | 2008-04-20 22:08:57 +0100 (Sun, 20 Apr 2008) | 1 line
Update an include.
........
r44697 | danieljames | 2008-04-21 16:55:40 +0100 (Mon, 21 Apr 2008) | 1 line
Factor out the code for choosing the bucket count, and which bucket that hash values map to make it easier to experiment with alternative policies.
........
................
r44733 | danieljames | 2008-04-23 07:55:43 +0100 (Wed, 23 Apr 2008) | 2 lines
Remove 'reserve_extra'.
................
r44734 | danieljames | 2008-04-23 07:55:55 +0100 (Wed, 23 Apr 2008) | 2 lines
More unnecessary copy tests - showing some weakness in the emplace implementation.
................
r44735 | danieljames | 2008-04-23 07:56:06 +0100 (Wed, 23 Apr 2008) | 2 lines
More tests.
................
r44736 | danieljames | 2008-04-23 07:56:19 +0100 (Wed, 23 Apr 2008) | 2 lines
Comment out a test which requires a C++0x std::pair.
................
r44737 | danieljames | 2008-04-23 07:56:35 +0100 (Wed, 23 Apr 2008) | 2 lines
Avoid creating unnecessary copies in unordered_set::emplace and unordered_map::emplace.
................
[SVN r44738]
2008-04-23 07:09:58 +00:00
|
|
|
void unordered_map_test(X& r, Key const& k, T const& v)
|
2008-01-06 17:13:15 +00:00
|
|
|
{
|
2008-01-10 22:30:46 +00:00
|
|
|
typedef BOOST_DEDUCED_TYPENAME X::value_type value_type;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME X::key_type key_type;
|
2008-01-06 17:13:15 +00:00
|
|
|
BOOST_MPL_ASSERT((boost::is_same<value_type, std::pair<key_type const, T> >));
|
Merge support for emplace for compilers with rvalue references and variadic templates arguments, and better use of C++0x allocators.
Merged revisions 44058-44075,44078-44084,44086-44108,44110-44365,44367,44369-44414,44416-44419,44421-44457,44467-44469,44471-44511,44513-44535,44537-44737 via svnmerge from
https://svn.boost.org/svn/boost/branches/unordered/trunk
................
r44467 | danieljames | 2008-04-16 18:35:56 +0100 (Wed, 16 Apr 2008) | 2 lines
Add C++-0x support to the test allocators.
................
r44468 | danieljames | 2008-04-16 18:36:06 +0100 (Wed, 16 Apr 2008) | 2 lines
Add a C++-0x node_constructor.
................
r44469 | danieljames | 2008-04-16 18:36:16 +0100 (Wed, 16 Apr 2008) | 2 lines
C++-0x constructor for node.
................
r44516 | danieljames | 2008-04-17 21:41:48 +0100 (Thu, 17 Apr 2008) | 16 lines
Merge in my work so far on implementing emplace for compilers with variadic
template & rvalue references.
Merged revisions 44059-44062 via svnmerge from
https://svn.boost.org/svn/boost/branches/unordered/dev
........
r44059 | danieljames | 2008-04-05 17:41:25 +0100 (Sat, 05 Apr 2008) | 1 line
First stab at implementing emplace - only for compilers with variadic template & rvalue references.
........
r44062 | danieljames | 2008-04-05 19:12:09 +0100 (Sat, 05 Apr 2008) | 1 line
Better variable template arguments, need to add proper support to BoostBook.
........
................
r44616 | danieljames | 2008-04-20 13:30:19 +0100 (Sun, 20 Apr 2008) | 1 line
Merge with trunk, fixes tabs.
................
r44618 | danieljames | 2008-04-20 13:42:38 +0100 (Sun, 20 Apr 2008) | 2 lines
Some extra compile tests.
................
r44619 | danieljames | 2008-04-20 13:42:50 +0100 (Sun, 20 Apr 2008) | 2 lines
Fix an error message.
................
r44703 | danieljames | 2008-04-21 20:19:50 +0100 (Mon, 21 Apr 2008) | 15 lines
Merge latest changes from trunk.
Merged revisions 44616-44702 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r44650 | danieljames | 2008-04-20 22:08:57 +0100 (Sun, 20 Apr 2008) | 1 line
Update an include.
........
r44697 | danieljames | 2008-04-21 16:55:40 +0100 (Mon, 21 Apr 2008) | 1 line
Factor out the code for choosing the bucket count, and which bucket that hash values map to make it easier to experiment with alternative policies.
........
................
r44733 | danieljames | 2008-04-23 07:55:43 +0100 (Wed, 23 Apr 2008) | 2 lines
Remove 'reserve_extra'.
................
r44734 | danieljames | 2008-04-23 07:55:55 +0100 (Wed, 23 Apr 2008) | 2 lines
More unnecessary copy tests - showing some weakness in the emplace implementation.
................
r44735 | danieljames | 2008-04-23 07:56:06 +0100 (Wed, 23 Apr 2008) | 2 lines
More tests.
................
r44736 | danieljames | 2008-04-23 07:56:19 +0100 (Wed, 23 Apr 2008) | 2 lines
Comment out a test which requires a C++0x std::pair.
................
r44737 | danieljames | 2008-04-23 07:56:35 +0100 (Wed, 23 Apr 2008) | 2 lines
Avoid creating unnecessary copies in unordered_set::emplace and unordered_map::emplace.
................
[SVN r44738]
2008-04-23 07:09:58 +00:00
|
|
|
|
|
|
|
#if defined(BOOST_HAS_RVALUE_REFS) && defined(BOOST_HAS_VARIADIC_TMPL)
|
|
|
|
Key k_lvalue(k);
|
|
|
|
T v_lvalue(v);
|
|
|
|
|
|
|
|
r.emplace(k, v);
|
|
|
|
r.emplace(k_lvalue, v_lvalue);
|
|
|
|
r.emplace(rvalue(k), rvalue(v));
|
|
|
|
#endif
|
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
|
|
|
template <class X>
|
|
|
|
void equality_test(X& r)
|
|
|
|
{
|
|
|
|
X const a = r, b = r;
|
|
|
|
|
|
|
|
test::check_return_type<bool>::equals(a == b);
|
|
|
|
test::check_return_type<bool>::equals(a != b);
|
|
|
|
#if defined(BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP)
|
|
|
|
test::check_return_type<std::size_t>::equals(boost::hash_value(a));
|
|
|
|
#else
|
|
|
|
test::check_return_type<std::size_t>::equals(hash_value(a));
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2008-01-06 17:13:15 +00:00
|
|
|
template <class X, class T>
|
|
|
|
void unordered_unique_test(X& r, T const& t)
|
|
|
|
{
|
2008-01-10 22:30:46 +00:00
|
|
|
typedef BOOST_DEDUCED_TYPENAME X::iterator iterator;
|
2008-01-06 17:13:15 +00:00
|
|
|
test::check_return_type<std::pair<iterator, bool> >::equals(r.insert(t));
|
Merge support for emplace for compilers with rvalue references and variadic templates arguments, and better use of C++0x allocators.
Merged revisions 44058-44075,44078-44084,44086-44108,44110-44365,44367,44369-44414,44416-44419,44421-44457,44467-44469,44471-44511,44513-44535,44537-44737 via svnmerge from
https://svn.boost.org/svn/boost/branches/unordered/trunk
................
r44467 | danieljames | 2008-04-16 18:35:56 +0100 (Wed, 16 Apr 2008) | 2 lines
Add C++-0x support to the test allocators.
................
r44468 | danieljames | 2008-04-16 18:36:06 +0100 (Wed, 16 Apr 2008) | 2 lines
Add a C++-0x node_constructor.
................
r44469 | danieljames | 2008-04-16 18:36:16 +0100 (Wed, 16 Apr 2008) | 2 lines
C++-0x constructor for node.
................
r44516 | danieljames | 2008-04-17 21:41:48 +0100 (Thu, 17 Apr 2008) | 16 lines
Merge in my work so far on implementing emplace for compilers with variadic
template & rvalue references.
Merged revisions 44059-44062 via svnmerge from
https://svn.boost.org/svn/boost/branches/unordered/dev
........
r44059 | danieljames | 2008-04-05 17:41:25 +0100 (Sat, 05 Apr 2008) | 1 line
First stab at implementing emplace - only for compilers with variadic template & rvalue references.
........
r44062 | danieljames | 2008-04-05 19:12:09 +0100 (Sat, 05 Apr 2008) | 1 line
Better variable template arguments, need to add proper support to BoostBook.
........
................
r44616 | danieljames | 2008-04-20 13:30:19 +0100 (Sun, 20 Apr 2008) | 1 line
Merge with trunk, fixes tabs.
................
r44618 | danieljames | 2008-04-20 13:42:38 +0100 (Sun, 20 Apr 2008) | 2 lines
Some extra compile tests.
................
r44619 | danieljames | 2008-04-20 13:42:50 +0100 (Sun, 20 Apr 2008) | 2 lines
Fix an error message.
................
r44703 | danieljames | 2008-04-21 20:19:50 +0100 (Mon, 21 Apr 2008) | 15 lines
Merge latest changes from trunk.
Merged revisions 44616-44702 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r44650 | danieljames | 2008-04-20 22:08:57 +0100 (Sun, 20 Apr 2008) | 1 line
Update an include.
........
r44697 | danieljames | 2008-04-21 16:55:40 +0100 (Mon, 21 Apr 2008) | 1 line
Factor out the code for choosing the bucket count, and which bucket that hash values map to make it easier to experiment with alternative policies.
........
................
r44733 | danieljames | 2008-04-23 07:55:43 +0100 (Wed, 23 Apr 2008) | 2 lines
Remove 'reserve_extra'.
................
r44734 | danieljames | 2008-04-23 07:55:55 +0100 (Wed, 23 Apr 2008) | 2 lines
More unnecessary copy tests - showing some weakness in the emplace implementation.
................
r44735 | danieljames | 2008-04-23 07:56:06 +0100 (Wed, 23 Apr 2008) | 2 lines
More tests.
................
r44736 | danieljames | 2008-04-23 07:56:19 +0100 (Wed, 23 Apr 2008) | 2 lines
Comment out a test which requires a C++0x std::pair.
................
r44737 | danieljames | 2008-04-23 07:56:35 +0100 (Wed, 23 Apr 2008) | 2 lines
Avoid creating unnecessary copies in unordered_set::emplace and unordered_map::emplace.
................
[SVN r44738]
2008-04-23 07:09:58 +00:00
|
|
|
#if defined(BOOST_HAS_RVALUE_REFS) && defined(BOOST_HAS_VARIADIC_TMPL)
|
|
|
|
test::check_return_type<std::pair<iterator, bool> >::equals(r.emplace(t));
|
|
|
|
#endif
|
2008-01-06 17:13:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
template <class X, class T>
|
|
|
|
void unordered_equivalent_test(X& r, T const& t)
|
|
|
|
{
|
2008-01-10 22:30:46 +00:00
|
|
|
typedef BOOST_DEDUCED_TYPENAME X::iterator iterator;
|
2008-01-06 17:13:15 +00:00
|
|
|
test::check_return_type<iterator>::equals(r.insert(t));
|
Merge support for emplace for compilers with rvalue references and variadic templates arguments, and better use of C++0x allocators.
Merged revisions 44058-44075,44078-44084,44086-44108,44110-44365,44367,44369-44414,44416-44419,44421-44457,44467-44469,44471-44511,44513-44535,44537-44737 via svnmerge from
https://svn.boost.org/svn/boost/branches/unordered/trunk
................
r44467 | danieljames | 2008-04-16 18:35:56 +0100 (Wed, 16 Apr 2008) | 2 lines
Add C++-0x support to the test allocators.
................
r44468 | danieljames | 2008-04-16 18:36:06 +0100 (Wed, 16 Apr 2008) | 2 lines
Add a C++-0x node_constructor.
................
r44469 | danieljames | 2008-04-16 18:36:16 +0100 (Wed, 16 Apr 2008) | 2 lines
C++-0x constructor for node.
................
r44516 | danieljames | 2008-04-17 21:41:48 +0100 (Thu, 17 Apr 2008) | 16 lines
Merge in my work so far on implementing emplace for compilers with variadic
template & rvalue references.
Merged revisions 44059-44062 via svnmerge from
https://svn.boost.org/svn/boost/branches/unordered/dev
........
r44059 | danieljames | 2008-04-05 17:41:25 +0100 (Sat, 05 Apr 2008) | 1 line
First stab at implementing emplace - only for compilers with variadic template & rvalue references.
........
r44062 | danieljames | 2008-04-05 19:12:09 +0100 (Sat, 05 Apr 2008) | 1 line
Better variable template arguments, need to add proper support to BoostBook.
........
................
r44616 | danieljames | 2008-04-20 13:30:19 +0100 (Sun, 20 Apr 2008) | 1 line
Merge with trunk, fixes tabs.
................
r44618 | danieljames | 2008-04-20 13:42:38 +0100 (Sun, 20 Apr 2008) | 2 lines
Some extra compile tests.
................
r44619 | danieljames | 2008-04-20 13:42:50 +0100 (Sun, 20 Apr 2008) | 2 lines
Fix an error message.
................
r44703 | danieljames | 2008-04-21 20:19:50 +0100 (Mon, 21 Apr 2008) | 15 lines
Merge latest changes from trunk.
Merged revisions 44616-44702 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r44650 | danieljames | 2008-04-20 22:08:57 +0100 (Sun, 20 Apr 2008) | 1 line
Update an include.
........
r44697 | danieljames | 2008-04-21 16:55:40 +0100 (Mon, 21 Apr 2008) | 1 line
Factor out the code for choosing the bucket count, and which bucket that hash values map to make it easier to experiment with alternative policies.
........
................
r44733 | danieljames | 2008-04-23 07:55:43 +0100 (Wed, 23 Apr 2008) | 2 lines
Remove 'reserve_extra'.
................
r44734 | danieljames | 2008-04-23 07:55:55 +0100 (Wed, 23 Apr 2008) | 2 lines
More unnecessary copy tests - showing some weakness in the emplace implementation.
................
r44735 | danieljames | 2008-04-23 07:56:06 +0100 (Wed, 23 Apr 2008) | 2 lines
More tests.
................
r44736 | danieljames | 2008-04-23 07:56:19 +0100 (Wed, 23 Apr 2008) | 2 lines
Comment out a test which requires a C++0x std::pair.
................
r44737 | danieljames | 2008-04-23 07:56:35 +0100 (Wed, 23 Apr 2008) | 2 lines
Avoid creating unnecessary copies in unordered_set::emplace and unordered_map::emplace.
................
[SVN r44738]
2008-04-23 07:09:58 +00:00
|
|
|
#if defined(BOOST_HAS_RVALUE_REFS) && defined(BOOST_HAS_VARIADIC_TMPL)
|
|
|
|
test::check_return_type<iterator>::equals(r.emplace(t));
|
|
|
|
#endif
|
2008-01-06 17:13:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
template <class X, class Key, class T>
|
|
|
|
void unordered_map_functions(X&, Key const& k, T const&)
|
|
|
|
{
|
2008-01-10 22:30:46 +00:00
|
|
|
typedef BOOST_DEDUCED_TYPENAME X::mapped_type mapped_type;
|
2008-01-06 17:13:15 +00:00
|
|
|
|
|
|
|
X a;
|
|
|
|
test::check_return_type<mapped_type>::equals_ref(a[k]);
|
|
|
|
test::check_return_type<mapped_type>::equals_ref(a.at(k));
|
|
|
|
|
|
|
|
X const b = a;
|
|
|
|
test::check_return_type<mapped_type const>::equals_ref(b.at(k));
|
|
|
|
}
|
|
|
|
|
|
|
|
template <class X, class Key, class T, class Hash, class Pred>
|
|
|
|
void unordered_test(X&, Key& k, T& t, Hash& hf, Pred& eq)
|
|
|
|
{
|
2008-01-10 22:30:46 +00:00
|
|
|
typedef BOOST_DEDUCED_TYPENAME X::key_type key_type;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME X::hasher hasher;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME X::key_equal key_equal;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME X::size_type size_type;
|
|
|
|
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME X::iterator iterator;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME X::const_iterator const_iterator;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME X::local_iterator local_iterator;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME X::const_local_iterator const_local_iterator;
|
|
|
|
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME boost::BOOST_ITERATOR_CATEGORY<iterator>::type iterator_category;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME boost::iterator_difference<iterator>::type iterator_difference;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME boost::iterator_pointer<iterator>::type iterator_pointer;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME boost::iterator_reference<iterator>::type iterator_reference;
|
|
|
|
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME boost::BOOST_ITERATOR_CATEGORY<local_iterator>::type local_iterator_category;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME boost::iterator_difference<local_iterator>::type local_iterator_difference;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME boost::iterator_pointer<local_iterator>::type local_iterator_pointer;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME boost::iterator_reference<local_iterator>::type local_iterator_reference;
|
|
|
|
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME boost::BOOST_ITERATOR_CATEGORY<const_iterator>::type const_iterator_category;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME boost::iterator_difference<const_iterator>::type const_iterator_difference;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME boost::iterator_pointer<const_iterator>::type const_iterator_pointer;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME boost::iterator_reference<const_iterator>::type const_iterator_reference;
|
|
|
|
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME boost::BOOST_ITERATOR_CATEGORY<const_local_iterator>::type const_local_iterator_category;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME boost::iterator_difference<const_local_iterator>::type const_local_iterator_difference;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME boost::iterator_pointer<const_local_iterator>::type const_local_iterator_pointer;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME boost::iterator_reference<const_local_iterator>::type const_local_iterator_reference;
|
2008-01-06 17:13:15 +00:00
|
|
|
|
|
|
|
BOOST_MPL_ASSERT((boost::is_same<Key, key_type>));
|
|
|
|
boost::function_requires<boost::CopyConstructibleConcept<key_type> >();
|
|
|
|
boost::function_requires<boost::AssignableConcept<key_type> >();
|
|
|
|
|
|
|
|
BOOST_MPL_ASSERT((boost::is_same<Hash, hasher>));
|
|
|
|
test::check_return_type<std::size_t>::equals(hf(k));
|
|
|
|
|
|
|
|
BOOST_MPL_ASSERT((boost::is_same<Pred, key_equal>));
|
|
|
|
test::check_return_type<bool>::convertible(eq(k, k));
|
|
|
|
|
|
|
|
boost::function_requires<boost::InputIteratorConcept<local_iterator> >();
|
|
|
|
BOOST_MPL_ASSERT((boost::is_same<local_iterator_category, iterator_category>));
|
|
|
|
BOOST_MPL_ASSERT((boost::is_same<local_iterator_difference, iterator_difference>));
|
|
|
|
BOOST_MPL_ASSERT((boost::is_same<local_iterator_pointer, iterator_pointer>));
|
|
|
|
BOOST_MPL_ASSERT((boost::is_same<local_iterator_reference, iterator_reference>));
|
|
|
|
|
|
|
|
boost::function_requires<boost::InputIteratorConcept<const_local_iterator> >();
|
|
|
|
BOOST_MPL_ASSERT((boost::is_same<const_local_iterator_category, const_iterator_category>));
|
|
|
|
BOOST_MPL_ASSERT((boost::is_same<const_local_iterator_difference, const_iterator_difference>));
|
|
|
|
BOOST_MPL_ASSERT((boost::is_same<const_local_iterator_pointer, const_iterator_pointer>));
|
|
|
|
BOOST_MPL_ASSERT((boost::is_same<const_local_iterator_reference, const_iterator_reference>));
|
|
|
|
|
|
|
|
X(10, hf, eq);
|
|
|
|
X a(10, hf, eq);
|
|
|
|
X(10, hf);
|
|
|
|
X a2(10, hf);
|
|
|
|
X(10);
|
|
|
|
X a3(10);
|
|
|
|
X();
|
|
|
|
X a4;
|
|
|
|
|
2008-01-10 22:30:46 +00:00
|
|
|
BOOST_DEDUCED_TYPENAME X::value_type* i = 0;
|
|
|
|
BOOST_DEDUCED_TYPENAME X::value_type* j = 0;
|
2008-01-06 17:13:15 +00:00
|
|
|
|
|
|
|
X(i, j, 10, hf, eq);
|
|
|
|
X a5(i, j, 10, hf, eq);
|
|
|
|
X(i, j, 10, hf);
|
|
|
|
X a6(i, j, 10, hf);
|
|
|
|
X(i, j, 10);
|
|
|
|
X a7(i, j, 10);
|
|
|
|
X(i, j);
|
|
|
|
X a8(i, j);
|
|
|
|
|
|
|
|
X const b;
|
|
|
|
sink(X(b));
|
|
|
|
X a9(b);
|
|
|
|
a = b;
|
|
|
|
|
|
|
|
test::check_return_type<hasher>::equals(b.hash_function());
|
|
|
|
test::check_return_type<key_equal>::equals(b.key_eq());
|
|
|
|
|
|
|
|
const_iterator q = a.cbegin();
|
|
|
|
test::check_return_type<iterator>::equals(a.insert(q, t));
|
Merge support for emplace for compilers with rvalue references and variadic templates arguments, and better use of C++0x allocators.
Merged revisions 44058-44075,44078-44084,44086-44108,44110-44365,44367,44369-44414,44416-44419,44421-44457,44467-44469,44471-44511,44513-44535,44537-44737 via svnmerge from
https://svn.boost.org/svn/boost/branches/unordered/trunk
................
r44467 | danieljames | 2008-04-16 18:35:56 +0100 (Wed, 16 Apr 2008) | 2 lines
Add C++-0x support to the test allocators.
................
r44468 | danieljames | 2008-04-16 18:36:06 +0100 (Wed, 16 Apr 2008) | 2 lines
Add a C++-0x node_constructor.
................
r44469 | danieljames | 2008-04-16 18:36:16 +0100 (Wed, 16 Apr 2008) | 2 lines
C++-0x constructor for node.
................
r44516 | danieljames | 2008-04-17 21:41:48 +0100 (Thu, 17 Apr 2008) | 16 lines
Merge in my work so far on implementing emplace for compilers with variadic
template & rvalue references.
Merged revisions 44059-44062 via svnmerge from
https://svn.boost.org/svn/boost/branches/unordered/dev
........
r44059 | danieljames | 2008-04-05 17:41:25 +0100 (Sat, 05 Apr 2008) | 1 line
First stab at implementing emplace - only for compilers with variadic template & rvalue references.
........
r44062 | danieljames | 2008-04-05 19:12:09 +0100 (Sat, 05 Apr 2008) | 1 line
Better variable template arguments, need to add proper support to BoostBook.
........
................
r44616 | danieljames | 2008-04-20 13:30:19 +0100 (Sun, 20 Apr 2008) | 1 line
Merge with trunk, fixes tabs.
................
r44618 | danieljames | 2008-04-20 13:42:38 +0100 (Sun, 20 Apr 2008) | 2 lines
Some extra compile tests.
................
r44619 | danieljames | 2008-04-20 13:42:50 +0100 (Sun, 20 Apr 2008) | 2 lines
Fix an error message.
................
r44703 | danieljames | 2008-04-21 20:19:50 +0100 (Mon, 21 Apr 2008) | 15 lines
Merge latest changes from trunk.
Merged revisions 44616-44702 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r44650 | danieljames | 2008-04-20 22:08:57 +0100 (Sun, 20 Apr 2008) | 1 line
Update an include.
........
r44697 | danieljames | 2008-04-21 16:55:40 +0100 (Mon, 21 Apr 2008) | 1 line
Factor out the code for choosing the bucket count, and which bucket that hash values map to make it easier to experiment with alternative policies.
........
................
r44733 | danieljames | 2008-04-23 07:55:43 +0100 (Wed, 23 Apr 2008) | 2 lines
Remove 'reserve_extra'.
................
r44734 | danieljames | 2008-04-23 07:55:55 +0100 (Wed, 23 Apr 2008) | 2 lines
More unnecessary copy tests - showing some weakness in the emplace implementation.
................
r44735 | danieljames | 2008-04-23 07:56:06 +0100 (Wed, 23 Apr 2008) | 2 lines
More tests.
................
r44736 | danieljames | 2008-04-23 07:56:19 +0100 (Wed, 23 Apr 2008) | 2 lines
Comment out a test which requires a C++0x std::pair.
................
r44737 | danieljames | 2008-04-23 07:56:35 +0100 (Wed, 23 Apr 2008) | 2 lines
Avoid creating unnecessary copies in unordered_set::emplace and unordered_map::emplace.
................
[SVN r44738]
2008-04-23 07:09:58 +00:00
|
|
|
#if defined(BOOST_HAS_RVALUE_REFS) && defined(BOOST_HAS_VARIADIC_TMPL)
|
|
|
|
test::check_return_type<iterator>::equals(a.emplace(q, t));
|
|
|
|
#endif
|
2008-01-06 17:13:15 +00:00
|
|
|
|
|
|
|
a.insert(i, j);
|
|
|
|
test::check_return_type<size_type>::equals(a.erase(k));
|
|
|
|
|
2008-04-17 07:39:24 +00:00
|
|
|
BOOST_CHECK(a.empty());
|
2008-01-06 17:13:15 +00:00
|
|
|
if(a.empty()) {
|
|
|
|
a.insert(t);
|
|
|
|
q = a.cbegin();
|
|
|
|
test::check_return_type<iterator>::equals(a.erase(q));
|
|
|
|
}
|
|
|
|
|
|
|
|
const_iterator q1 = a.cbegin(), q2 = a.cend();
|
|
|
|
test::check_return_type<iterator>::equals(a.erase(q1, q2));
|
|
|
|
|
|
|
|
a.clear();
|
|
|
|
|
|
|
|
test::check_return_type<iterator>::equals(a.find(k));
|
|
|
|
test::check_return_type<const_iterator>::equals(b.find(k));
|
|
|
|
test::check_return_type<size_type>::equals(b.count(k));
|
|
|
|
test::check_return_type<std::pair<iterator, iterator> >::equals(
|
|
|
|
a.equal_range(k));
|
|
|
|
test::check_return_type<std::pair<const_iterator, const_iterator> >::equals(
|
|
|
|
b.equal_range(k));
|
|
|
|
test::check_return_type<size_type>::equals(b.bucket_count());
|
|
|
|
test::check_return_type<size_type>::equals(b.max_bucket_count());
|
|
|
|
test::check_return_type<size_type>::equals(b.bucket(k));
|
|
|
|
test::check_return_type<size_type>::equals(b.bucket_size(0));
|
|
|
|
|
|
|
|
test::check_return_type<local_iterator>::equals(a.begin(0));
|
|
|
|
test::check_return_type<const_local_iterator>::equals(b.begin(0));
|
|
|
|
test::check_return_type<local_iterator>::equals(a.end(0));
|
|
|
|
test::check_return_type<const_local_iterator>::equals(b.end(0));
|
|
|
|
|
|
|
|
test::check_return_type<const_local_iterator>::equals(a.cbegin(0));
|
|
|
|
test::check_return_type<const_local_iterator>::equals(b.cbegin(0));
|
|
|
|
test::check_return_type<const_local_iterator>::equals(a.cend(0));
|
|
|
|
test::check_return_type<const_local_iterator>::equals(b.cend(0));
|
|
|
|
|
|
|
|
test::check_return_type<float>::equals(b.load_factor());
|
|
|
|
test::check_return_type<float>::equals(b.max_load_factor());
|
|
|
|
a.max_load_factor((float) 2.0);
|
|
|
|
a.rehash(100);
|
|
|
|
}
|