2008-09-18 11:30:59 +00:00
|
|
|
|
|
|
|
// Copyright (C) 2003-2004 Jeremy B. Maitin-Shepard.
|
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 (C) 2005-2009 Daniel James.
|
2008-09-18 11:30:59 +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)
|
|
|
|
|
|
|
|
// See http://www.boost.org/libs/unordered for documentation
|
|
|
|
|
|
|
|
#ifndef BOOST_UNORDERED_UNORDERED_MAP_HPP_INCLUDED
|
|
|
|
#define BOOST_UNORDERED_UNORDERED_MAP_HPP_INCLUDED
|
|
|
|
|
|
|
|
#if defined(_MSC_VER) && (_MSC_VER >= 1020)
|
|
|
|
# pragma once
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <boost/unordered/unordered_map_fwd.hpp>
|
|
|
|
#include <boost/functional/hash.hpp>
|
|
|
|
#include <boost/unordered/detail/hash_table.hpp>
|
|
|
|
|
|
|
|
#if !defined(BOOST_HAS_RVALUE_REFS)
|
|
|
|
#include <boost/unordered/detail/move.hpp>
|
|
|
|
#endif
|
|
|
|
|
Merge latest changes for unordered. Improved compatability and a few tweaks.
Merged revisions 53127,53253,53256,53311,53314,53316-53318 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r53127 | danieljames | 2009-05-20 07:43:38 +0100 (Wed, 20 May 2009) | 1 line
Better configuration for boost.unordered.
........
r53253 | danieljames | 2009-05-25 20:14:07 +0100 (Mon, 25 May 2009) | 3 lines
Add explicit destructors to the unordered containers. Refs #2908.
Isn't really needed but it doesn't hurt.
........
r53256 | danieljames | 2009-05-25 20:45:23 +0100 (Mon, 25 May 2009) | 1 line
Unordered change log for explicit destructors.
........
r53311 | danieljames | 2009-05-27 18:42:01 +0100 (Wed, 27 May 2009) | 1 line
Missing changelog entry.
........
r53314 | danieljames | 2009-05-27 18:44:09 +0100 (Wed, 27 May 2009) | 1 line
Use lightweight_test for unordered.
........
r53316 | danieljames | 2009-05-27 19:19:32 +0100 (Wed, 27 May 2009) | 1 line
Some workarounds for old versions of Borland.
........
r53317 | danieljames | 2009-05-27 19:32:22 +0100 (Wed, 27 May 2009) | 1 line
Fix a change accidentally included in the last commit.
........
r53318 | danieljames | 2009-05-27 19:32:38 +0100 (Wed, 27 May 2009) | 1 line
Remove an unused function.
........
[SVN r53465]
2009-05-30 17:34:12 +00:00
|
|
|
#if !defined(BOOST_NO_0X_HDR_INITIALIZER_LIST)
|
|
|
|
#include <initializer_list>
|
|
|
|
#endif
|
|
|
|
|
Merged revisions 49661-49662,49666,49669,49735,49756,49770,49811 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r49661 | danieljames | 2008-11-09 12:03:45 +0000 (Sun, 09 Nov 2008) | 1 line
Move hash detail headers out of boost/functional/detail.
........
r49662 | danieljames | 2008-11-09 12:11:50 +0000 (Sun, 09 Nov 2008) | 1 line
Add a forwarding header for container_fwd.hpp
........
r49666 | danieljames | 2008-11-09 19:12:05 +0000 (Sun, 09 Nov 2008) | 1 line
Avoid comparing default initialised iterators in position_iterator.
........
r49669 | danieljames | 2008-11-09 21:57:38 +0000 (Sun, 09 Nov 2008) | 2 lines
Add link to the header to the synopsis in reference documentation.
Refs #2214
........
r49735 | danieljames | 2008-11-14 12:51:00 +0000 (Fri, 14 Nov 2008) | 1 line
Explicitly specify the template parameters in the unordered container friend, in order to avoid some warnings.
........
r49756 | danieljames | 2008-11-14 16:11:16 +0000 (Fri, 14 Nov 2008) | 1 line
Use pragmas to suppress a Visual C++ warning.
........
r49770 | danieljames | 2008-11-15 13:07:29 +0000 (Sat, 15 Nov 2008) | 1 line
Use the new swap library.
........
r49811 | danieljames | 2008-11-16 23:10:00 +0000 (Sun, 16 Nov 2008) | 1 line
Fix a typo.
........
[SVN r49855]
2008-11-20 22:53:20 +00:00
|
|
|
#if defined(BOOST_MSVC)
|
|
|
|
#pragma warning(push)
|
|
|
|
#if BOOST_MSVC >= 1400
|
|
|
|
#pragma warning(disable:4396) //the inline specifier cannot be used when a
|
|
|
|
// friend declaration refers to a specialization
|
|
|
|
// of a function template
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
2008-09-18 11:30:59 +00:00
|
|
|
namespace boost
|
|
|
|
{
|
|
|
|
template <class Key, class T, class Hash, class Pred, class Alloc>
|
|
|
|
class unordered_map
|
|
|
|
{
|
Merge latest changes for unordered. Improved compatability and a few tweaks.
Merged revisions 53127,53253,53256,53311,53314,53316-53318 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r53127 | danieljames | 2009-05-20 07:43:38 +0100 (Wed, 20 May 2009) | 1 line
Better configuration for boost.unordered.
........
r53253 | danieljames | 2009-05-25 20:14:07 +0100 (Mon, 25 May 2009) | 3 lines
Add explicit destructors to the unordered containers. Refs #2908.
Isn't really needed but it doesn't hurt.
........
r53256 | danieljames | 2009-05-25 20:45:23 +0100 (Mon, 25 May 2009) | 1 line
Unordered change log for explicit destructors.
........
r53311 | danieljames | 2009-05-27 18:42:01 +0100 (Wed, 27 May 2009) | 1 line
Missing changelog entry.
........
r53314 | danieljames | 2009-05-27 18:44:09 +0100 (Wed, 27 May 2009) | 1 line
Use lightweight_test for unordered.
........
r53316 | danieljames | 2009-05-27 19:19:32 +0100 (Wed, 27 May 2009) | 1 line
Some workarounds for old versions of Borland.
........
r53317 | danieljames | 2009-05-27 19:32:22 +0100 (Wed, 27 May 2009) | 1 line
Fix a change accidentally included in the last commit.
........
r53318 | danieljames | 2009-05-27 19:32:38 +0100 (Wed, 27 May 2009) | 1 line
Remove an unused function.
........
[SVN r53465]
2009-05-30 17:34:12 +00:00
|
|
|
#if BOOST_WORKAROUND(__BORLANDC__, < 0x0582)
|
|
|
|
public:
|
|
|
|
#endif
|
2008-09-18 11:30:59 +00:00
|
|
|
typedef boost::unordered_detail::hash_types_unique_keys<
|
|
|
|
std::pair<const Key, T>, Key, Hash, Pred, Alloc
|
|
|
|
> implementation;
|
|
|
|
|
|
|
|
BOOST_DEDUCED_TYPENAME implementation::hash_table base;
|
|
|
|
|
|
|
|
public:
|
|
|
|
|
|
|
|
// types
|
|
|
|
|
|
|
|
typedef Key key_type;
|
|
|
|
typedef std::pair<const Key, T> value_type;
|
|
|
|
typedef T mapped_type;
|
|
|
|
typedef Hash hasher;
|
|
|
|
typedef Pred key_equal;
|
|
|
|
|
|
|
|
typedef Alloc allocator_type;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME allocator_type::pointer pointer;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME allocator_type::const_pointer const_pointer;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME allocator_type::reference reference;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME allocator_type::const_reference const_reference;
|
|
|
|
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME implementation::size_type size_type;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME implementation::difference_type difference_type;
|
|
|
|
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME implementation::iterator iterator;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME implementation::const_iterator const_iterator;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME implementation::local_iterator local_iterator;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME implementation::const_local_iterator const_local_iterator;
|
|
|
|
|
|
|
|
// construct/destroy/copy
|
|
|
|
|
|
|
|
explicit unordered_map(
|
|
|
|
size_type n = boost::unordered_detail::default_initial_bucket_count,
|
|
|
|
const hasher &hf = hasher(),
|
|
|
|
const key_equal &eql = key_equal(),
|
|
|
|
const allocator_type &a = allocator_type())
|
|
|
|
: base(n, hf, eql, a)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
explicit unordered_map(allocator_type const& a)
|
|
|
|
: base(boost::unordered_detail::default_initial_bucket_count,
|
|
|
|
hasher(), key_equal(), a)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
unordered_map(unordered_map const& other, allocator_type const& a)
|
|
|
|
: base(other.base, a)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
template <class InputIterator>
|
|
|
|
unordered_map(InputIterator f, InputIterator l)
|
|
|
|
: base(f, l, boost::unordered_detail::default_initial_bucket_count,
|
|
|
|
hasher(), key_equal(), allocator_type())
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
template <class InputIterator>
|
|
|
|
unordered_map(InputIterator f, InputIterator l,
|
|
|
|
size_type n,
|
|
|
|
const hasher &hf = hasher(),
|
|
|
|
const key_equal &eql = key_equal(),
|
|
|
|
const allocator_type &a = allocator_type())
|
|
|
|
: base(f, l, n, hf, eql, a)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
Merge latest changes for unordered. Improved compatability and a few tweaks.
Merged revisions 53127,53253,53256,53311,53314,53316-53318 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r53127 | danieljames | 2009-05-20 07:43:38 +0100 (Wed, 20 May 2009) | 1 line
Better configuration for boost.unordered.
........
r53253 | danieljames | 2009-05-25 20:14:07 +0100 (Mon, 25 May 2009) | 3 lines
Add explicit destructors to the unordered containers. Refs #2908.
Isn't really needed but it doesn't hurt.
........
r53256 | danieljames | 2009-05-25 20:45:23 +0100 (Mon, 25 May 2009) | 1 line
Unordered change log for explicit destructors.
........
r53311 | danieljames | 2009-05-27 18:42:01 +0100 (Wed, 27 May 2009) | 1 line
Missing changelog entry.
........
r53314 | danieljames | 2009-05-27 18:44:09 +0100 (Wed, 27 May 2009) | 1 line
Use lightweight_test for unordered.
........
r53316 | danieljames | 2009-05-27 19:19:32 +0100 (Wed, 27 May 2009) | 1 line
Some workarounds for old versions of Borland.
........
r53317 | danieljames | 2009-05-27 19:32:22 +0100 (Wed, 27 May 2009) | 1 line
Fix a change accidentally included in the last commit.
........
r53318 | danieljames | 2009-05-27 19:32:38 +0100 (Wed, 27 May 2009) | 1 line
Remove an unused function.
........
[SVN r53465]
2009-05-30 17:34:12 +00:00
|
|
|
~unordered_map() {}
|
|
|
|
|
2008-09-18 11:30:59 +00:00
|
|
|
#if defined(BOOST_HAS_RVALUE_REFS)
|
|
|
|
unordered_map(unordered_map&& other)
|
|
|
|
: base(other.base, boost::unordered_detail::move_tag())
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
unordered_map(unordered_map&& other, allocator_type const& a)
|
|
|
|
: base(other.base, a, boost::unordered_detail::move_tag())
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
unordered_map& operator=(unordered_map&& x)
|
|
|
|
{
|
|
|
|
base.move(x.base);
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
unordered_map(boost::unordered_detail::move_from<unordered_map<Key, T, Hash, Pred, Alloc> > other)
|
|
|
|
: base(other.source.base, boost::unordered_detail::move_tag())
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
#if !BOOST_WORKAROUND(__BORLANDC__, < 0x0593)
|
|
|
|
unordered_map& operator=(unordered_map x)
|
|
|
|
{
|
|
|
|
base.move(x.base);
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
Merge latest changes for unordered. Improved compatability and a few tweaks.
Merged revisions 53127,53253,53256,53311,53314,53316-53318 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r53127 | danieljames | 2009-05-20 07:43:38 +0100 (Wed, 20 May 2009) | 1 line
Better configuration for boost.unordered.
........
r53253 | danieljames | 2009-05-25 20:14:07 +0100 (Mon, 25 May 2009) | 3 lines
Add explicit destructors to the unordered containers. Refs #2908.
Isn't really needed but it doesn't hurt.
........
r53256 | danieljames | 2009-05-25 20:45:23 +0100 (Mon, 25 May 2009) | 1 line
Unordered change log for explicit destructors.
........
r53311 | danieljames | 2009-05-27 18:42:01 +0100 (Wed, 27 May 2009) | 1 line
Missing changelog entry.
........
r53314 | danieljames | 2009-05-27 18:44:09 +0100 (Wed, 27 May 2009) | 1 line
Use lightweight_test for unordered.
........
r53316 | danieljames | 2009-05-27 19:19:32 +0100 (Wed, 27 May 2009) | 1 line
Some workarounds for old versions of Borland.
........
r53317 | danieljames | 2009-05-27 19:32:22 +0100 (Wed, 27 May 2009) | 1 line
Fix a change accidentally included in the last commit.
........
r53318 | danieljames | 2009-05-27 19:32:38 +0100 (Wed, 27 May 2009) | 1 line
Remove an unused function.
........
[SVN r53465]
2009-05-30 17:34:12 +00:00
|
|
|
#if !defined(BOOST_NO_0X_HDR_INITIALIZER_LIST)
|
Merge latest hash and unordered developments, and add support for initialiser
lists to config.
Merged revisions 49338,49924-49927,49955,50029,50118 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r49338 | danieljames | 2008-10-15 10:44:41 +0100 (Wed, 15 Oct 2008) | 2 lines
Revert [49229], it fixes the same problem as [48674].
........
r49924 | danieljames | 2008-11-24 22:55:14 +0000 (Mon, 24 Nov 2008) | 1 line
Extra tests for equality with different hash functions.
........
r49925 | danieljames | 2008-11-24 22:55:47 +0000 (Mon, 24 Nov 2008) | 1 line
Document operator==/operator!= as undefined if the equality predicates aren't equivalent.
........
r49926 | danieljames | 2008-11-24 22:56:04 +0000 (Mon, 24 Nov 2008) | 1 line
Use a larger prime number list.
........
r49927 | danieljames | 2008-11-24 23:15:55 +0000 (Mon, 24 Nov 2008) | 1 line
Use aligned storage for the value.
........
r49955 | danieljames | 2008-11-27 11:42:13 +0000 (Thu, 27 Nov 2008) | 1 line
Wild stab at getting destruction working on more compilers.
........
r50029 | danieljames | 2008-11-29 21:47:55 +0000 (Sat, 29 Nov 2008) | 1 line
Workaround another in-place destruction.
........
r50118 | danieljames | 2008-12-04 21:30:19 +0000 (Thu, 04 Dec 2008) | 1 line
Add support for initializer lists to config and the unordered containers.
........
[SVN r50451]
2009-01-03 23:18:33 +00:00
|
|
|
unordered_map(std::initializer_list<value_type> list,
|
|
|
|
size_type n = boost::unordered_detail::default_initial_bucket_count,
|
|
|
|
const hasher &hf = hasher(),
|
|
|
|
const key_equal &eql = key_equal(),
|
|
|
|
const allocator_type &a = allocator_type())
|
|
|
|
: base(list.begin(), list.end(), n, hf, eql, a)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
unordered_map& operator=(std::initializer_list<value_type> list)
|
|
|
|
{
|
|
|
|
base.data_.clear();
|
|
|
|
base.insert_range(list.begin(), list.end());
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2008-09-18 11:30:59 +00:00
|
|
|
private:
|
|
|
|
|
|
|
|
BOOST_DEDUCED_TYPENAME implementation::iterator_base const&
|
|
|
|
get(const_iterator const& it)
|
|
|
|
{
|
|
|
|
return boost::unordered_detail::iterator_access::get(it);
|
|
|
|
}
|
|
|
|
|
|
|
|
public:
|
|
|
|
|
|
|
|
allocator_type get_allocator() const
|
|
|
|
{
|
|
|
|
return base.get_allocator();
|
|
|
|
}
|
|
|
|
|
|
|
|
// size and capacity
|
|
|
|
|
|
|
|
bool empty() const
|
|
|
|
{
|
|
|
|
return base.empty();
|
|
|
|
}
|
|
|
|
|
|
|
|
size_type size() const
|
|
|
|
{
|
|
|
|
return base.size();
|
|
|
|
}
|
|
|
|
|
|
|
|
size_type max_size() const
|
|
|
|
{
|
|
|
|
return base.max_size();
|
|
|
|
}
|
|
|
|
|
|
|
|
// iterators
|
|
|
|
|
|
|
|
iterator begin()
|
|
|
|
{
|
|
|
|
return iterator(base.data_.begin());
|
|
|
|
}
|
|
|
|
|
|
|
|
const_iterator begin() const
|
|
|
|
{
|
|
|
|
return const_iterator(base.data_.begin());
|
|
|
|
}
|
|
|
|
|
|
|
|
iterator end()
|
|
|
|
{
|
|
|
|
return iterator(base.data_.end());
|
|
|
|
}
|
|
|
|
|
|
|
|
const_iterator end() const
|
|
|
|
{
|
|
|
|
return const_iterator(base.data_.end());
|
|
|
|
}
|
|
|
|
|
|
|
|
const_iterator cbegin() const
|
|
|
|
{
|
|
|
|
return const_iterator(base.data_.begin());
|
|
|
|
}
|
|
|
|
|
|
|
|
const_iterator cend() const
|
|
|
|
{
|
|
|
|
return const_iterator(base.data_.end());
|
|
|
|
}
|
|
|
|
|
|
|
|
// modifiers
|
|
|
|
|
Merge latest changes for unordered. Improved compatability and a few tweaks.
Merged revisions 53127,53253,53256,53311,53314,53316-53318 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r53127 | danieljames | 2009-05-20 07:43:38 +0100 (Wed, 20 May 2009) | 1 line
Better configuration for boost.unordered.
........
r53253 | danieljames | 2009-05-25 20:14:07 +0100 (Mon, 25 May 2009) | 3 lines
Add explicit destructors to the unordered containers. Refs #2908.
Isn't really needed but it doesn't hurt.
........
r53256 | danieljames | 2009-05-25 20:45:23 +0100 (Mon, 25 May 2009) | 1 line
Unordered change log for explicit destructors.
........
r53311 | danieljames | 2009-05-27 18:42:01 +0100 (Wed, 27 May 2009) | 1 line
Missing changelog entry.
........
r53314 | danieljames | 2009-05-27 18:44:09 +0100 (Wed, 27 May 2009) | 1 line
Use lightweight_test for unordered.
........
r53316 | danieljames | 2009-05-27 19:19:32 +0100 (Wed, 27 May 2009) | 1 line
Some workarounds for old versions of Borland.
........
r53317 | danieljames | 2009-05-27 19:32:22 +0100 (Wed, 27 May 2009) | 1 line
Fix a change accidentally included in the last commit.
........
r53318 | danieljames | 2009-05-27 19:32:38 +0100 (Wed, 27 May 2009) | 1 line
Remove an unused function.
........
[SVN r53465]
2009-05-30 17:34:12 +00:00
|
|
|
#if defined(BOOST_UNORDERED_STD_FORWARD)
|
2008-09-18 11:30:59 +00:00
|
|
|
template <class... Args>
|
|
|
|
std::pair<iterator, bool> emplace(Args&&... args)
|
|
|
|
{
|
|
|
|
return boost::unordered_detail::pair_cast<iterator, bool>(
|
Second try at merging emplace support.
Note that the previously rolled back commit was [53257], not [52357].
Merged revisions 52393-52394,52397,52884-52885,53255 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r52393 | danieljames | 2009-04-14 18:23:37 +0100 (Tue, 14 Apr 2009) | 2 lines
Implement full extract_key for compilers without SFINAE and variadic
templates.
........
r52394 | danieljames | 2009-04-14 18:23:51 +0100 (Tue, 14 Apr 2009) | 1 line
Use emplace instead of insert in the backend as it's more appropriate.
........
r52397 | danieljames | 2009-04-14 18:51:34 +0100 (Tue, 14 Apr 2009) | 1 line
Add stream output to the count test helper for unordered.
........
r52884 | danieljames | 2009-05-10 22:24:41 +0100 (Sun, 10 May 2009) | 19 lines
Cherrypick some unordered container changes from sandbox. Not including
anything which depends on the new move library.
------------------------------------------------------------------------
r52746 | danieljames | 2009-05-03 11:12:30 +0100 (Sun, 03 May 2009) | 1 line
Merge latest unordered container changes.
------------------------------------------------------------------------
r52747 | danieljames | 2009-05-03 11:15:35 +0100 (Sun, 03 May 2009) | 4 lines
Put the C++0x emplace implementations before the non-C++0x versions.
I'm going to change the non-C++0x to be macro heavy emulations of the
C++0x versions, so this will put the readable version first.
------------------------------------------------------------------------
r52748 | danieljames | 2009-05-03 11:15:44 +0100 (Sun, 03 May 2009) | 1 line
Refactor the unordered implementation a tad, to make implementing emplace less painful.
------------------------------------------------------------------------
........
r52885 | danieljames | 2009-05-10 22:25:09 +0100 (Sun, 10 May 2009) | 1 line
Merge emplace support for sandbox - but without move support.
........
r53255 | danieljames | 2009-05-25 20:45:06 +0100 (Mon, 25 May 2009) | 1 line
Unordered change log.
........
[SVN r53328]
2009-05-27 21:31:08 +00:00
|
|
|
base.emplace(std::forward<Args>(args)...));
|
2008-09-18 11:30:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
template <class... Args>
|
|
|
|
iterator emplace_hint(const_iterator hint, Args&&... args)
|
|
|
|
{
|
Second try at merging emplace support.
Note that the previously rolled back commit was [53257], not [52357].
Merged revisions 52393-52394,52397,52884-52885,53255 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r52393 | danieljames | 2009-04-14 18:23:37 +0100 (Tue, 14 Apr 2009) | 2 lines
Implement full extract_key for compilers without SFINAE and variadic
templates.
........
r52394 | danieljames | 2009-04-14 18:23:51 +0100 (Tue, 14 Apr 2009) | 1 line
Use emplace instead of insert in the backend as it's more appropriate.
........
r52397 | danieljames | 2009-04-14 18:51:34 +0100 (Tue, 14 Apr 2009) | 1 line
Add stream output to the count test helper for unordered.
........
r52884 | danieljames | 2009-05-10 22:24:41 +0100 (Sun, 10 May 2009) | 19 lines
Cherrypick some unordered container changes from sandbox. Not including
anything which depends on the new move library.
------------------------------------------------------------------------
r52746 | danieljames | 2009-05-03 11:12:30 +0100 (Sun, 03 May 2009) | 1 line
Merge latest unordered container changes.
------------------------------------------------------------------------
r52747 | danieljames | 2009-05-03 11:15:35 +0100 (Sun, 03 May 2009) | 4 lines
Put the C++0x emplace implementations before the non-C++0x versions.
I'm going to change the non-C++0x to be macro heavy emulations of the
C++0x versions, so this will put the readable version first.
------------------------------------------------------------------------
r52748 | danieljames | 2009-05-03 11:15:44 +0100 (Sun, 03 May 2009) | 1 line
Refactor the unordered implementation a tad, to make implementing emplace less painful.
------------------------------------------------------------------------
........
r52885 | danieljames | 2009-05-10 22:25:09 +0100 (Sun, 10 May 2009) | 1 line
Merge emplace support for sandbox - but without move support.
........
r53255 | danieljames | 2009-05-25 20:45:06 +0100 (Mon, 25 May 2009) | 1 line
Unordered change log.
........
[SVN r53328]
2009-05-27 21:31:08 +00:00
|
|
|
return iterator(base.emplace_hint(get(hint), std::forward<Args>(args)...));
|
2008-09-18 11:30:59 +00:00
|
|
|
}
|
Second try at merging emplace support.
Note that the previously rolled back commit was [53257], not [52357].
Merged revisions 52393-52394,52397,52884-52885,53255 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r52393 | danieljames | 2009-04-14 18:23:37 +0100 (Tue, 14 Apr 2009) | 2 lines
Implement full extract_key for compilers without SFINAE and variadic
templates.
........
r52394 | danieljames | 2009-04-14 18:23:51 +0100 (Tue, 14 Apr 2009) | 1 line
Use emplace instead of insert in the backend as it's more appropriate.
........
r52397 | danieljames | 2009-04-14 18:51:34 +0100 (Tue, 14 Apr 2009) | 1 line
Add stream output to the count test helper for unordered.
........
r52884 | danieljames | 2009-05-10 22:24:41 +0100 (Sun, 10 May 2009) | 19 lines
Cherrypick some unordered container changes from sandbox. Not including
anything which depends on the new move library.
------------------------------------------------------------------------
r52746 | danieljames | 2009-05-03 11:12:30 +0100 (Sun, 03 May 2009) | 1 line
Merge latest unordered container changes.
------------------------------------------------------------------------
r52747 | danieljames | 2009-05-03 11:15:35 +0100 (Sun, 03 May 2009) | 4 lines
Put the C++0x emplace implementations before the non-C++0x versions.
I'm going to change the non-C++0x to be macro heavy emulations of the
C++0x versions, so this will put the readable version first.
------------------------------------------------------------------------
r52748 | danieljames | 2009-05-03 11:15:44 +0100 (Sun, 03 May 2009) | 1 line
Refactor the unordered implementation a tad, to make implementing emplace less painful.
------------------------------------------------------------------------
........
r52885 | danieljames | 2009-05-10 22:25:09 +0100 (Sun, 10 May 2009) | 1 line
Merge emplace support for sandbox - but without move support.
........
r53255 | danieljames | 2009-05-25 20:45:06 +0100 (Mon, 25 May 2009) | 1 line
Unordered change log.
........
[SVN r53328]
2009-05-27 21:31:08 +00:00
|
|
|
#else
|
|
|
|
|
|
|
|
std::pair<iterator, bool> emplace(value_type const& v = value_type())
|
|
|
|
{
|
|
|
|
return boost::unordered_detail::pair_cast<iterator, bool>(
|
|
|
|
base.emplace(v));
|
|
|
|
}
|
|
|
|
|
|
|
|
iterator emplace_hint(const_iterator hint, value_type const& v = value_type())
|
|
|
|
{
|
|
|
|
return iterator(base.emplace_hint(get(hint), v));
|
|
|
|
}
|
|
|
|
|
|
|
|
#define BOOST_UNORDERED_EMPLACE(z, n, _) \
|
|
|
|
template < \
|
|
|
|
BOOST_UNORDERED_TEMPLATE_ARGS(z, n) \
|
|
|
|
> \
|
|
|
|
std::pair<iterator, bool> emplace( \
|
|
|
|
BOOST_UNORDERED_FUNCTION_PARAMS(z, n) \
|
|
|
|
) \
|
|
|
|
{ \
|
|
|
|
return boost::unordered_detail::pair_cast<iterator, bool>( \
|
|
|
|
base.emplace( \
|
|
|
|
BOOST_UNORDERED_CALL_PARAMS(z, n) \
|
|
|
|
)); \
|
|
|
|
} \
|
|
|
|
\
|
|
|
|
template < \
|
|
|
|
BOOST_UNORDERED_TEMPLATE_ARGS(z, n) \
|
|
|
|
> \
|
|
|
|
iterator emplace_hint(const_iterator hint, \
|
|
|
|
BOOST_UNORDERED_FUNCTION_PARAMS(z, n) \
|
|
|
|
) \
|
|
|
|
{ \
|
|
|
|
return iterator(base.emplace_hint(get(hint), \
|
|
|
|
BOOST_UNORDERED_CALL_PARAMS(z, n) \
|
|
|
|
)); \
|
|
|
|
}
|
|
|
|
|
|
|
|
BOOST_PP_REPEAT_FROM_TO(1, BOOST_UNORDERED_EMPLACE_LIMIT,
|
|
|
|
BOOST_UNORDERED_EMPLACE, _)
|
|
|
|
|
|
|
|
#undef BOOST_UNORDERED_EMPLACE
|
|
|
|
|
2008-09-18 11:30:59 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
std::pair<iterator, bool> insert(const value_type& obj)
|
|
|
|
{
|
|
|
|
return boost::unordered_detail::pair_cast<iterator, bool>(
|
Second try at merging emplace support.
Note that the previously rolled back commit was [53257], not [52357].
Merged revisions 52393-52394,52397,52884-52885,53255 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r52393 | danieljames | 2009-04-14 18:23:37 +0100 (Tue, 14 Apr 2009) | 2 lines
Implement full extract_key for compilers without SFINAE and variadic
templates.
........
r52394 | danieljames | 2009-04-14 18:23:51 +0100 (Tue, 14 Apr 2009) | 1 line
Use emplace instead of insert in the backend as it's more appropriate.
........
r52397 | danieljames | 2009-04-14 18:51:34 +0100 (Tue, 14 Apr 2009) | 1 line
Add stream output to the count test helper for unordered.
........
r52884 | danieljames | 2009-05-10 22:24:41 +0100 (Sun, 10 May 2009) | 19 lines
Cherrypick some unordered container changes from sandbox. Not including
anything which depends on the new move library.
------------------------------------------------------------------------
r52746 | danieljames | 2009-05-03 11:12:30 +0100 (Sun, 03 May 2009) | 1 line
Merge latest unordered container changes.
------------------------------------------------------------------------
r52747 | danieljames | 2009-05-03 11:15:35 +0100 (Sun, 03 May 2009) | 4 lines
Put the C++0x emplace implementations before the non-C++0x versions.
I'm going to change the non-C++0x to be macro heavy emulations of the
C++0x versions, so this will put the readable version first.
------------------------------------------------------------------------
r52748 | danieljames | 2009-05-03 11:15:44 +0100 (Sun, 03 May 2009) | 1 line
Refactor the unordered implementation a tad, to make implementing emplace less painful.
------------------------------------------------------------------------
........
r52885 | danieljames | 2009-05-10 22:25:09 +0100 (Sun, 10 May 2009) | 1 line
Merge emplace support for sandbox - but without move support.
........
r53255 | danieljames | 2009-05-25 20:45:06 +0100 (Mon, 25 May 2009) | 1 line
Unordered change log.
........
[SVN r53328]
2009-05-27 21:31:08 +00:00
|
|
|
base.emplace(obj));
|
2008-09-18 11:30:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
iterator insert(const_iterator hint, const value_type& obj)
|
|
|
|
{
|
Second try at merging emplace support.
Note that the previously rolled back commit was [53257], not [52357].
Merged revisions 52393-52394,52397,52884-52885,53255 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r52393 | danieljames | 2009-04-14 18:23:37 +0100 (Tue, 14 Apr 2009) | 2 lines
Implement full extract_key for compilers without SFINAE and variadic
templates.
........
r52394 | danieljames | 2009-04-14 18:23:51 +0100 (Tue, 14 Apr 2009) | 1 line
Use emplace instead of insert in the backend as it's more appropriate.
........
r52397 | danieljames | 2009-04-14 18:51:34 +0100 (Tue, 14 Apr 2009) | 1 line
Add stream output to the count test helper for unordered.
........
r52884 | danieljames | 2009-05-10 22:24:41 +0100 (Sun, 10 May 2009) | 19 lines
Cherrypick some unordered container changes from sandbox. Not including
anything which depends on the new move library.
------------------------------------------------------------------------
r52746 | danieljames | 2009-05-03 11:12:30 +0100 (Sun, 03 May 2009) | 1 line
Merge latest unordered container changes.
------------------------------------------------------------------------
r52747 | danieljames | 2009-05-03 11:15:35 +0100 (Sun, 03 May 2009) | 4 lines
Put the C++0x emplace implementations before the non-C++0x versions.
I'm going to change the non-C++0x to be macro heavy emulations of the
C++0x versions, so this will put the readable version first.
------------------------------------------------------------------------
r52748 | danieljames | 2009-05-03 11:15:44 +0100 (Sun, 03 May 2009) | 1 line
Refactor the unordered implementation a tad, to make implementing emplace less painful.
------------------------------------------------------------------------
........
r52885 | danieljames | 2009-05-10 22:25:09 +0100 (Sun, 10 May 2009) | 1 line
Merge emplace support for sandbox - but without move support.
........
r53255 | danieljames | 2009-05-25 20:45:06 +0100 (Mon, 25 May 2009) | 1 line
Unordered change log.
........
[SVN r53328]
2009-05-27 21:31:08 +00:00
|
|
|
return iterator(base.emplace_hint(get(hint), obj));
|
2008-09-18 11:30:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
template <class InputIterator>
|
|
|
|
void insert(InputIterator first, InputIterator last)
|
|
|
|
{
|
|
|
|
base.insert_range(first, last);
|
|
|
|
}
|
|
|
|
|
|
|
|
iterator erase(const_iterator position)
|
|
|
|
{
|
|
|
|
return iterator(base.data_.erase(get(position)));
|
|
|
|
}
|
|
|
|
|
|
|
|
size_type erase(const key_type& k)
|
|
|
|
{
|
|
|
|
return base.erase_key(k);
|
|
|
|
}
|
|
|
|
|
|
|
|
iterator erase(const_iterator first, const_iterator last)
|
|
|
|
{
|
|
|
|
return iterator(base.data_.erase_range(get(first), get(last)));
|
|
|
|
}
|
|
|
|
|
|
|
|
void clear()
|
|
|
|
{
|
|
|
|
base.data_.clear();
|
|
|
|
}
|
|
|
|
|
|
|
|
void swap(unordered_map& other)
|
|
|
|
{
|
|
|
|
base.swap(other.base);
|
|
|
|
}
|
|
|
|
|
|
|
|
// observers
|
|
|
|
|
|
|
|
hasher hash_function() const
|
|
|
|
{
|
|
|
|
return base.hash_function();
|
|
|
|
}
|
|
|
|
|
|
|
|
key_equal key_eq() const
|
|
|
|
{
|
|
|
|
return base.key_eq();
|
|
|
|
}
|
|
|
|
|
|
|
|
mapped_type& operator[](const key_type &k)
|
|
|
|
{
|
|
|
|
return base[k].second;
|
|
|
|
}
|
|
|
|
|
|
|
|
mapped_type& at(const key_type& k)
|
|
|
|
{
|
|
|
|
return base.at(k).second;
|
|
|
|
}
|
|
|
|
|
|
|
|
mapped_type const& at(const key_type& k) const
|
|
|
|
{
|
|
|
|
return base.at(k).second;
|
|
|
|
}
|
|
|
|
|
|
|
|
// lookup
|
|
|
|
|
|
|
|
iterator find(const key_type& k)
|
|
|
|
{
|
|
|
|
return iterator(base.find(k));
|
|
|
|
}
|
|
|
|
|
|
|
|
const_iterator find(const key_type& k) const
|
|
|
|
{
|
|
|
|
return const_iterator(base.find(k));
|
|
|
|
}
|
|
|
|
|
|
|
|
size_type count(const key_type& k) const
|
|
|
|
{
|
|
|
|
return base.count(k);
|
|
|
|
}
|
|
|
|
|
|
|
|
std::pair<iterator, iterator>
|
|
|
|
equal_range(const key_type& k)
|
|
|
|
{
|
|
|
|
return boost::unordered_detail::pair_cast<iterator, iterator>(
|
|
|
|
base.equal_range(k));
|
|
|
|
}
|
|
|
|
|
|
|
|
std::pair<const_iterator, const_iterator>
|
|
|
|
equal_range(const key_type& k) const
|
|
|
|
{
|
|
|
|
return boost::unordered_detail::pair_cast<const_iterator, const_iterator>(
|
|
|
|
base.equal_range(k));
|
|
|
|
}
|
|
|
|
|
|
|
|
// bucket interface
|
|
|
|
|
|
|
|
size_type bucket_count() const
|
|
|
|
{
|
|
|
|
return base.bucket_count();
|
|
|
|
}
|
|
|
|
|
|
|
|
size_type max_bucket_count() const
|
|
|
|
{
|
|
|
|
return base.max_bucket_count();
|
|
|
|
}
|
|
|
|
|
|
|
|
size_type bucket_size(size_type n) const
|
|
|
|
{
|
|
|
|
return base.data_.bucket_size(n);
|
|
|
|
}
|
|
|
|
|
|
|
|
size_type bucket(const key_type& k) const
|
|
|
|
{
|
|
|
|
return base.bucket(k);
|
|
|
|
}
|
|
|
|
|
|
|
|
local_iterator begin(size_type n)
|
|
|
|
{
|
|
|
|
return local_iterator(base.data_.begin(n));
|
|
|
|
}
|
|
|
|
|
|
|
|
const_local_iterator begin(size_type n) const
|
|
|
|
{
|
|
|
|
return const_local_iterator(base.data_.begin(n));
|
|
|
|
}
|
|
|
|
|
|
|
|
local_iterator end(size_type n)
|
|
|
|
{
|
|
|
|
return local_iterator(base.data_.end(n));
|
|
|
|
}
|
|
|
|
|
|
|
|
const_local_iterator end(size_type n) const
|
|
|
|
{
|
|
|
|
return const_local_iterator(base.data_.end(n));
|
|
|
|
}
|
|
|
|
|
|
|
|
const_local_iterator cbegin(size_type n) const
|
|
|
|
{
|
|
|
|
return const_local_iterator(base.data_.begin(n));
|
|
|
|
}
|
|
|
|
|
|
|
|
const_local_iterator cend(size_type n) const
|
|
|
|
{
|
|
|
|
return const_local_iterator(base.data_.end(n));
|
|
|
|
}
|
|
|
|
|
|
|
|
// hash policy
|
|
|
|
|
|
|
|
float load_factor() const
|
|
|
|
{
|
|
|
|
return base.load_factor();
|
|
|
|
}
|
|
|
|
|
|
|
|
float max_load_factor() const
|
|
|
|
{
|
|
|
|
return base.max_load_factor();
|
|
|
|
}
|
|
|
|
|
|
|
|
void max_load_factor(float m)
|
|
|
|
{
|
|
|
|
base.max_load_factor(m);
|
|
|
|
}
|
|
|
|
|
|
|
|
void rehash(size_type n)
|
|
|
|
{
|
|
|
|
base.rehash(n);
|
|
|
|
}
|
|
|
|
|
|
|
|
#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
|
|
|
|
friend bool operator==(unordered_map const&, unordered_map const&);
|
|
|
|
friend bool operator!=(unordered_map const&, unordered_map const&);
|
Merge latest changes for unordered. Improved compatability and a few tweaks.
Merged revisions 53127,53253,53256,53311,53314,53316-53318 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r53127 | danieljames | 2009-05-20 07:43:38 +0100 (Wed, 20 May 2009) | 1 line
Better configuration for boost.unordered.
........
r53253 | danieljames | 2009-05-25 20:14:07 +0100 (Mon, 25 May 2009) | 3 lines
Add explicit destructors to the unordered containers. Refs #2908.
Isn't really needed but it doesn't hurt.
........
r53256 | danieljames | 2009-05-25 20:45:23 +0100 (Mon, 25 May 2009) | 1 line
Unordered change log for explicit destructors.
........
r53311 | danieljames | 2009-05-27 18:42:01 +0100 (Wed, 27 May 2009) | 1 line
Missing changelog entry.
........
r53314 | danieljames | 2009-05-27 18:44:09 +0100 (Wed, 27 May 2009) | 1 line
Use lightweight_test for unordered.
........
r53316 | danieljames | 2009-05-27 19:19:32 +0100 (Wed, 27 May 2009) | 1 line
Some workarounds for old versions of Borland.
........
r53317 | danieljames | 2009-05-27 19:32:22 +0100 (Wed, 27 May 2009) | 1 line
Fix a change accidentally included in the last commit.
........
r53318 | danieljames | 2009-05-27 19:32:38 +0100 (Wed, 27 May 2009) | 1 line
Remove an unused function.
........
[SVN r53465]
2009-05-30 17:34:12 +00:00
|
|
|
#elif !BOOST_WORKAROUND(__BORLANDC__, < 0x0582)
|
Merged revisions 49661-49662,49666,49669,49735,49756,49770,49811 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r49661 | danieljames | 2008-11-09 12:03:45 +0000 (Sun, 09 Nov 2008) | 1 line
Move hash detail headers out of boost/functional/detail.
........
r49662 | danieljames | 2008-11-09 12:11:50 +0000 (Sun, 09 Nov 2008) | 1 line
Add a forwarding header for container_fwd.hpp
........
r49666 | danieljames | 2008-11-09 19:12:05 +0000 (Sun, 09 Nov 2008) | 1 line
Avoid comparing default initialised iterators in position_iterator.
........
r49669 | danieljames | 2008-11-09 21:57:38 +0000 (Sun, 09 Nov 2008) | 2 lines
Add link to the header to the synopsis in reference documentation.
Refs #2214
........
r49735 | danieljames | 2008-11-14 12:51:00 +0000 (Fri, 14 Nov 2008) | 1 line
Explicitly specify the template parameters in the unordered container friend, in order to avoid some warnings.
........
r49756 | danieljames | 2008-11-14 16:11:16 +0000 (Fri, 14 Nov 2008) | 1 line
Use pragmas to suppress a Visual C++ warning.
........
r49770 | danieljames | 2008-11-15 13:07:29 +0000 (Sat, 15 Nov 2008) | 1 line
Use the new swap library.
........
r49811 | danieljames | 2008-11-16 23:10:00 +0000 (Sun, 16 Nov 2008) | 1 line
Fix a typo.
........
[SVN r49855]
2008-11-20 22:53:20 +00:00
|
|
|
friend bool operator==<Key, T, Hash, Pred, Alloc>(unordered_map const&, unordered_map const&);
|
|
|
|
friend bool operator!=<Key, T, Hash, Pred, Alloc>(unordered_map const&, unordered_map const&);
|
2008-09-18 11:30:59 +00:00
|
|
|
#endif
|
|
|
|
}; // class template unordered_map
|
|
|
|
|
|
|
|
template <class K, class T, class H, class P, class A>
|
|
|
|
inline bool operator==(unordered_map<K, T, H, P, A> const& m1,
|
|
|
|
unordered_map<K, T, H, P, A> const& m2)
|
|
|
|
{
|
|
|
|
return boost::unordered_detail::equals(m1.base, m2.base);
|
|
|
|
}
|
|
|
|
|
|
|
|
template <class K, class T, class H, class P, class A>
|
|
|
|
inline bool operator!=(unordered_map<K, T, H, P, A> const& m1,
|
|
|
|
unordered_map<K, T, H, P, A> const& m2)
|
|
|
|
{
|
|
|
|
return !boost::unordered_detail::equals(m1.base, m2.base);
|
|
|
|
}
|
|
|
|
|
|
|
|
template <class K, class T, class H, class P, class A>
|
|
|
|
inline void swap(unordered_map<K, T, H, P, A> &m1,
|
|
|
|
unordered_map<K, T, H, P, A> &m2)
|
|
|
|
{
|
|
|
|
m1.swap(m2);
|
|
|
|
}
|
|
|
|
|
|
|
|
template <class Key, class T, class Hash, class Pred, class Alloc>
|
|
|
|
class unordered_multimap
|
|
|
|
{
|
Merge latest changes for unordered. Improved compatability and a few tweaks.
Merged revisions 53127,53253,53256,53311,53314,53316-53318 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r53127 | danieljames | 2009-05-20 07:43:38 +0100 (Wed, 20 May 2009) | 1 line
Better configuration for boost.unordered.
........
r53253 | danieljames | 2009-05-25 20:14:07 +0100 (Mon, 25 May 2009) | 3 lines
Add explicit destructors to the unordered containers. Refs #2908.
Isn't really needed but it doesn't hurt.
........
r53256 | danieljames | 2009-05-25 20:45:23 +0100 (Mon, 25 May 2009) | 1 line
Unordered change log for explicit destructors.
........
r53311 | danieljames | 2009-05-27 18:42:01 +0100 (Wed, 27 May 2009) | 1 line
Missing changelog entry.
........
r53314 | danieljames | 2009-05-27 18:44:09 +0100 (Wed, 27 May 2009) | 1 line
Use lightweight_test for unordered.
........
r53316 | danieljames | 2009-05-27 19:19:32 +0100 (Wed, 27 May 2009) | 1 line
Some workarounds for old versions of Borland.
........
r53317 | danieljames | 2009-05-27 19:32:22 +0100 (Wed, 27 May 2009) | 1 line
Fix a change accidentally included in the last commit.
........
r53318 | danieljames | 2009-05-27 19:32:38 +0100 (Wed, 27 May 2009) | 1 line
Remove an unused function.
........
[SVN r53465]
2009-05-30 17:34:12 +00:00
|
|
|
#if BOOST_WORKAROUND(__BORLANDC__, < 0x0582)
|
|
|
|
public:
|
|
|
|
#endif
|
2008-09-18 11:30:59 +00:00
|
|
|
typedef boost::unordered_detail::hash_types_equivalent_keys<
|
|
|
|
std::pair<const Key, T>, Key, Hash, Pred, Alloc
|
|
|
|
> implementation;
|
|
|
|
|
|
|
|
BOOST_DEDUCED_TYPENAME implementation::hash_table base;
|
|
|
|
|
|
|
|
public:
|
|
|
|
|
|
|
|
// types
|
|
|
|
|
|
|
|
typedef Key key_type;
|
|
|
|
typedef std::pair<const Key, T> value_type;
|
|
|
|
typedef T mapped_type;
|
|
|
|
typedef Hash hasher;
|
|
|
|
typedef Pred key_equal;
|
|
|
|
|
|
|
|
typedef Alloc allocator_type;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME allocator_type::pointer pointer;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME allocator_type::const_pointer const_pointer;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME allocator_type::reference reference;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME allocator_type::const_reference const_reference;
|
|
|
|
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME implementation::size_type size_type;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME implementation::difference_type difference_type;
|
|
|
|
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME implementation::iterator iterator;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME implementation::const_iterator const_iterator;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME implementation::local_iterator local_iterator;
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME implementation::const_local_iterator const_local_iterator;
|
|
|
|
|
|
|
|
// construct/destroy/copy
|
|
|
|
|
|
|
|
explicit unordered_multimap(
|
|
|
|
size_type n = boost::unordered_detail::default_initial_bucket_count,
|
|
|
|
const hasher &hf = hasher(),
|
|
|
|
const key_equal &eql = key_equal(),
|
|
|
|
const allocator_type &a = allocator_type())
|
|
|
|
: base(n, hf, eql, a)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
explicit unordered_multimap(allocator_type const& a)
|
|
|
|
: base(boost::unordered_detail::default_initial_bucket_count,
|
|
|
|
hasher(), key_equal(), a)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
unordered_multimap(unordered_multimap const& other, allocator_type const& a)
|
|
|
|
: base(other.base, a)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
template <class InputIterator>
|
|
|
|
unordered_multimap(InputIterator f, InputIterator l)
|
|
|
|
: base(f, l, boost::unordered_detail::default_initial_bucket_count,
|
|
|
|
hasher(), key_equal(), allocator_type())
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
template <class InputIterator>
|
|
|
|
unordered_multimap(InputIterator f, InputIterator l,
|
|
|
|
size_type n,
|
|
|
|
const hasher &hf = hasher(),
|
|
|
|
const key_equal &eql = key_equal(),
|
|
|
|
const allocator_type &a = allocator_type())
|
|
|
|
: base(f, l, n, hf, eql, a)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
Merge latest changes for unordered. Improved compatability and a few tweaks.
Merged revisions 53127,53253,53256,53311,53314,53316-53318 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r53127 | danieljames | 2009-05-20 07:43:38 +0100 (Wed, 20 May 2009) | 1 line
Better configuration for boost.unordered.
........
r53253 | danieljames | 2009-05-25 20:14:07 +0100 (Mon, 25 May 2009) | 3 lines
Add explicit destructors to the unordered containers. Refs #2908.
Isn't really needed but it doesn't hurt.
........
r53256 | danieljames | 2009-05-25 20:45:23 +0100 (Mon, 25 May 2009) | 1 line
Unordered change log for explicit destructors.
........
r53311 | danieljames | 2009-05-27 18:42:01 +0100 (Wed, 27 May 2009) | 1 line
Missing changelog entry.
........
r53314 | danieljames | 2009-05-27 18:44:09 +0100 (Wed, 27 May 2009) | 1 line
Use lightweight_test for unordered.
........
r53316 | danieljames | 2009-05-27 19:19:32 +0100 (Wed, 27 May 2009) | 1 line
Some workarounds for old versions of Borland.
........
r53317 | danieljames | 2009-05-27 19:32:22 +0100 (Wed, 27 May 2009) | 1 line
Fix a change accidentally included in the last commit.
........
r53318 | danieljames | 2009-05-27 19:32:38 +0100 (Wed, 27 May 2009) | 1 line
Remove an unused function.
........
[SVN r53465]
2009-05-30 17:34:12 +00:00
|
|
|
~unordered_multimap() {}
|
|
|
|
|
2008-09-18 11:30:59 +00:00
|
|
|
#if defined(BOOST_HAS_RVALUE_REFS)
|
|
|
|
unordered_multimap(unordered_multimap&& other)
|
|
|
|
: base(other.base, boost::unordered_detail::move_tag())
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
unordered_multimap(unordered_multimap&& other, allocator_type const& a)
|
|
|
|
: base(other.base, a, boost::unordered_detail::move_tag())
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
unordered_multimap& operator=(unordered_multimap&& x)
|
|
|
|
{
|
|
|
|
base.move(x.base);
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
unordered_multimap(boost::unordered_detail::move_from<unordered_multimap<Key, T, Hash, Pred, Alloc> > other)
|
|
|
|
: base(other.source.base, boost::unordered_detail::move_tag())
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
#if !BOOST_WORKAROUND(__BORLANDC__, < 0x0593)
|
|
|
|
unordered_multimap& operator=(unordered_multimap x)
|
|
|
|
{
|
|
|
|
base.move(x.base);
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
Merge latest changes for unordered. Improved compatability and a few tweaks.
Merged revisions 53127,53253,53256,53311,53314,53316-53318 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r53127 | danieljames | 2009-05-20 07:43:38 +0100 (Wed, 20 May 2009) | 1 line
Better configuration for boost.unordered.
........
r53253 | danieljames | 2009-05-25 20:14:07 +0100 (Mon, 25 May 2009) | 3 lines
Add explicit destructors to the unordered containers. Refs #2908.
Isn't really needed but it doesn't hurt.
........
r53256 | danieljames | 2009-05-25 20:45:23 +0100 (Mon, 25 May 2009) | 1 line
Unordered change log for explicit destructors.
........
r53311 | danieljames | 2009-05-27 18:42:01 +0100 (Wed, 27 May 2009) | 1 line
Missing changelog entry.
........
r53314 | danieljames | 2009-05-27 18:44:09 +0100 (Wed, 27 May 2009) | 1 line
Use lightweight_test for unordered.
........
r53316 | danieljames | 2009-05-27 19:19:32 +0100 (Wed, 27 May 2009) | 1 line
Some workarounds for old versions of Borland.
........
r53317 | danieljames | 2009-05-27 19:32:22 +0100 (Wed, 27 May 2009) | 1 line
Fix a change accidentally included in the last commit.
........
r53318 | danieljames | 2009-05-27 19:32:38 +0100 (Wed, 27 May 2009) | 1 line
Remove an unused function.
........
[SVN r53465]
2009-05-30 17:34:12 +00:00
|
|
|
#if !defined(BOOST_NO_0X_HDR_INITIALIZER_LIST)
|
Merge latest hash and unordered developments, and add support for initialiser
lists to config.
Merged revisions 49338,49924-49927,49955,50029,50118 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r49338 | danieljames | 2008-10-15 10:44:41 +0100 (Wed, 15 Oct 2008) | 2 lines
Revert [49229], it fixes the same problem as [48674].
........
r49924 | danieljames | 2008-11-24 22:55:14 +0000 (Mon, 24 Nov 2008) | 1 line
Extra tests for equality with different hash functions.
........
r49925 | danieljames | 2008-11-24 22:55:47 +0000 (Mon, 24 Nov 2008) | 1 line
Document operator==/operator!= as undefined if the equality predicates aren't equivalent.
........
r49926 | danieljames | 2008-11-24 22:56:04 +0000 (Mon, 24 Nov 2008) | 1 line
Use a larger prime number list.
........
r49927 | danieljames | 2008-11-24 23:15:55 +0000 (Mon, 24 Nov 2008) | 1 line
Use aligned storage for the value.
........
r49955 | danieljames | 2008-11-27 11:42:13 +0000 (Thu, 27 Nov 2008) | 1 line
Wild stab at getting destruction working on more compilers.
........
r50029 | danieljames | 2008-11-29 21:47:55 +0000 (Sat, 29 Nov 2008) | 1 line
Workaround another in-place destruction.
........
r50118 | danieljames | 2008-12-04 21:30:19 +0000 (Thu, 04 Dec 2008) | 1 line
Add support for initializer lists to config and the unordered containers.
........
[SVN r50451]
2009-01-03 23:18:33 +00:00
|
|
|
unordered_multimap(std::initializer_list<value_type> list,
|
|
|
|
size_type n = boost::unordered_detail::default_initial_bucket_count,
|
|
|
|
const hasher &hf = hasher(),
|
|
|
|
const key_equal &eql = key_equal(),
|
|
|
|
const allocator_type &a = allocator_type())
|
|
|
|
: base(list.begin(), list.end(), n, hf, eql, a)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
unordered_multimap& operator=(std::initializer_list<value_type> list)
|
|
|
|
{
|
|
|
|
base.data_.clear();
|
|
|
|
base.insert_range(list.begin(), list.end());
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2008-09-18 11:30:59 +00:00
|
|
|
|
|
|
|
private:
|
|
|
|
|
|
|
|
BOOST_DEDUCED_TYPENAME implementation::iterator_base const&
|
|
|
|
get(const_iterator const& it)
|
|
|
|
{
|
|
|
|
return boost::unordered_detail::iterator_access::get(it);
|
|
|
|
}
|
|
|
|
|
|
|
|
public:
|
|
|
|
|
|
|
|
allocator_type get_allocator() const
|
|
|
|
{
|
|
|
|
return base.get_allocator();
|
|
|
|
}
|
|
|
|
|
|
|
|
// size and capacity
|
|
|
|
|
|
|
|
bool empty() const
|
|
|
|
{
|
|
|
|
return base.empty();
|
|
|
|
}
|
|
|
|
|
|
|
|
size_type size() const
|
|
|
|
{
|
|
|
|
return base.size();
|
|
|
|
}
|
|
|
|
|
|
|
|
size_type max_size() const
|
|
|
|
{
|
|
|
|
return base.max_size();
|
|
|
|
}
|
|
|
|
|
|
|
|
// iterators
|
|
|
|
|
|
|
|
iterator begin()
|
|
|
|
{
|
|
|
|
return iterator(base.data_.begin());
|
|
|
|
}
|
|
|
|
|
|
|
|
const_iterator begin() const
|
|
|
|
{
|
|
|
|
return const_iterator(base.data_.begin());
|
|
|
|
}
|
|
|
|
|
|
|
|
iterator end()
|
|
|
|
{
|
|
|
|
return iterator(base.data_.end());
|
|
|
|
}
|
|
|
|
|
|
|
|
const_iterator end() const
|
|
|
|
{
|
|
|
|
return const_iterator(base.data_.end());
|
|
|
|
}
|
|
|
|
|
|
|
|
const_iterator cbegin() const
|
|
|
|
{
|
|
|
|
return const_iterator(base.data_.begin());
|
|
|
|
}
|
|
|
|
|
|
|
|
const_iterator cend() const
|
|
|
|
{
|
|
|
|
return const_iterator(base.data_.end());
|
|
|
|
}
|
|
|
|
|
|
|
|
// modifiers
|
|
|
|
|
Merge latest changes for unordered. Improved compatability and a few tweaks.
Merged revisions 53127,53253,53256,53311,53314,53316-53318 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r53127 | danieljames | 2009-05-20 07:43:38 +0100 (Wed, 20 May 2009) | 1 line
Better configuration for boost.unordered.
........
r53253 | danieljames | 2009-05-25 20:14:07 +0100 (Mon, 25 May 2009) | 3 lines
Add explicit destructors to the unordered containers. Refs #2908.
Isn't really needed but it doesn't hurt.
........
r53256 | danieljames | 2009-05-25 20:45:23 +0100 (Mon, 25 May 2009) | 1 line
Unordered change log for explicit destructors.
........
r53311 | danieljames | 2009-05-27 18:42:01 +0100 (Wed, 27 May 2009) | 1 line
Missing changelog entry.
........
r53314 | danieljames | 2009-05-27 18:44:09 +0100 (Wed, 27 May 2009) | 1 line
Use lightweight_test for unordered.
........
r53316 | danieljames | 2009-05-27 19:19:32 +0100 (Wed, 27 May 2009) | 1 line
Some workarounds for old versions of Borland.
........
r53317 | danieljames | 2009-05-27 19:32:22 +0100 (Wed, 27 May 2009) | 1 line
Fix a change accidentally included in the last commit.
........
r53318 | danieljames | 2009-05-27 19:32:38 +0100 (Wed, 27 May 2009) | 1 line
Remove an unused function.
........
[SVN r53465]
2009-05-30 17:34:12 +00:00
|
|
|
#if defined(BOOST_UNORDERED_STD_FORWARD)
|
2008-09-18 11:30:59 +00:00
|
|
|
template <class... Args>
|
|
|
|
iterator emplace(Args&&... args)
|
|
|
|
{
|
Second try at merging emplace support.
Note that the previously rolled back commit was [53257], not [52357].
Merged revisions 52393-52394,52397,52884-52885,53255 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r52393 | danieljames | 2009-04-14 18:23:37 +0100 (Tue, 14 Apr 2009) | 2 lines
Implement full extract_key for compilers without SFINAE and variadic
templates.
........
r52394 | danieljames | 2009-04-14 18:23:51 +0100 (Tue, 14 Apr 2009) | 1 line
Use emplace instead of insert in the backend as it's more appropriate.
........
r52397 | danieljames | 2009-04-14 18:51:34 +0100 (Tue, 14 Apr 2009) | 1 line
Add stream output to the count test helper for unordered.
........
r52884 | danieljames | 2009-05-10 22:24:41 +0100 (Sun, 10 May 2009) | 19 lines
Cherrypick some unordered container changes from sandbox. Not including
anything which depends on the new move library.
------------------------------------------------------------------------
r52746 | danieljames | 2009-05-03 11:12:30 +0100 (Sun, 03 May 2009) | 1 line
Merge latest unordered container changes.
------------------------------------------------------------------------
r52747 | danieljames | 2009-05-03 11:15:35 +0100 (Sun, 03 May 2009) | 4 lines
Put the C++0x emplace implementations before the non-C++0x versions.
I'm going to change the non-C++0x to be macro heavy emulations of the
C++0x versions, so this will put the readable version first.
------------------------------------------------------------------------
r52748 | danieljames | 2009-05-03 11:15:44 +0100 (Sun, 03 May 2009) | 1 line
Refactor the unordered implementation a tad, to make implementing emplace less painful.
------------------------------------------------------------------------
........
r52885 | danieljames | 2009-05-10 22:25:09 +0100 (Sun, 10 May 2009) | 1 line
Merge emplace support for sandbox - but without move support.
........
r53255 | danieljames | 2009-05-25 20:45:06 +0100 (Mon, 25 May 2009) | 1 line
Unordered change log.
........
[SVN r53328]
2009-05-27 21:31:08 +00:00
|
|
|
return iterator(base.emplace(std::forward<Args>(args)...));
|
2008-09-18 11:30:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
template <class... Args>
|
|
|
|
iterator emplace_hint(const_iterator hint, Args&&... args)
|
|
|
|
{
|
Second try at merging emplace support.
Note that the previously rolled back commit was [53257], not [52357].
Merged revisions 52393-52394,52397,52884-52885,53255 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r52393 | danieljames | 2009-04-14 18:23:37 +0100 (Tue, 14 Apr 2009) | 2 lines
Implement full extract_key for compilers without SFINAE and variadic
templates.
........
r52394 | danieljames | 2009-04-14 18:23:51 +0100 (Tue, 14 Apr 2009) | 1 line
Use emplace instead of insert in the backend as it's more appropriate.
........
r52397 | danieljames | 2009-04-14 18:51:34 +0100 (Tue, 14 Apr 2009) | 1 line
Add stream output to the count test helper for unordered.
........
r52884 | danieljames | 2009-05-10 22:24:41 +0100 (Sun, 10 May 2009) | 19 lines
Cherrypick some unordered container changes from sandbox. Not including
anything which depends on the new move library.
------------------------------------------------------------------------
r52746 | danieljames | 2009-05-03 11:12:30 +0100 (Sun, 03 May 2009) | 1 line
Merge latest unordered container changes.
------------------------------------------------------------------------
r52747 | danieljames | 2009-05-03 11:15:35 +0100 (Sun, 03 May 2009) | 4 lines
Put the C++0x emplace implementations before the non-C++0x versions.
I'm going to change the non-C++0x to be macro heavy emulations of the
C++0x versions, so this will put the readable version first.
------------------------------------------------------------------------
r52748 | danieljames | 2009-05-03 11:15:44 +0100 (Sun, 03 May 2009) | 1 line
Refactor the unordered implementation a tad, to make implementing emplace less painful.
------------------------------------------------------------------------
........
r52885 | danieljames | 2009-05-10 22:25:09 +0100 (Sun, 10 May 2009) | 1 line
Merge emplace support for sandbox - but without move support.
........
r53255 | danieljames | 2009-05-25 20:45:06 +0100 (Mon, 25 May 2009) | 1 line
Unordered change log.
........
[SVN r53328]
2009-05-27 21:31:08 +00:00
|
|
|
return iterator(base.emplace_hint(get(hint), std::forward<Args>(args)...));
|
2008-09-18 11:30:59 +00:00
|
|
|
}
|
Second try at merging emplace support.
Note that the previously rolled back commit was [53257], not [52357].
Merged revisions 52393-52394,52397,52884-52885,53255 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r52393 | danieljames | 2009-04-14 18:23:37 +0100 (Tue, 14 Apr 2009) | 2 lines
Implement full extract_key for compilers without SFINAE and variadic
templates.
........
r52394 | danieljames | 2009-04-14 18:23:51 +0100 (Tue, 14 Apr 2009) | 1 line
Use emplace instead of insert in the backend as it's more appropriate.
........
r52397 | danieljames | 2009-04-14 18:51:34 +0100 (Tue, 14 Apr 2009) | 1 line
Add stream output to the count test helper for unordered.
........
r52884 | danieljames | 2009-05-10 22:24:41 +0100 (Sun, 10 May 2009) | 19 lines
Cherrypick some unordered container changes from sandbox. Not including
anything which depends on the new move library.
------------------------------------------------------------------------
r52746 | danieljames | 2009-05-03 11:12:30 +0100 (Sun, 03 May 2009) | 1 line
Merge latest unordered container changes.
------------------------------------------------------------------------
r52747 | danieljames | 2009-05-03 11:15:35 +0100 (Sun, 03 May 2009) | 4 lines
Put the C++0x emplace implementations before the non-C++0x versions.
I'm going to change the non-C++0x to be macro heavy emulations of the
C++0x versions, so this will put the readable version first.
------------------------------------------------------------------------
r52748 | danieljames | 2009-05-03 11:15:44 +0100 (Sun, 03 May 2009) | 1 line
Refactor the unordered implementation a tad, to make implementing emplace less painful.
------------------------------------------------------------------------
........
r52885 | danieljames | 2009-05-10 22:25:09 +0100 (Sun, 10 May 2009) | 1 line
Merge emplace support for sandbox - but without move support.
........
r53255 | danieljames | 2009-05-25 20:45:06 +0100 (Mon, 25 May 2009) | 1 line
Unordered change log.
........
[SVN r53328]
2009-05-27 21:31:08 +00:00
|
|
|
#else
|
|
|
|
|
|
|
|
iterator emplace(value_type const& v = value_type())
|
|
|
|
{
|
|
|
|
return iterator(base.emplace(v));
|
|
|
|
}
|
|
|
|
|
|
|
|
iterator emplace_hint(const_iterator hint, value_type const& v = value_type())
|
|
|
|
{
|
|
|
|
return iterator(base.emplace_hint(get(hint), v));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#define BOOST_UNORDERED_EMPLACE(z, n, _) \
|
|
|
|
template < \
|
|
|
|
BOOST_UNORDERED_TEMPLATE_ARGS(z, n) \
|
|
|
|
> \
|
|
|
|
iterator emplace( \
|
|
|
|
BOOST_UNORDERED_FUNCTION_PARAMS(z, n) \
|
|
|
|
) \
|
|
|
|
{ \
|
|
|
|
return iterator( \
|
|
|
|
base.emplace( \
|
|
|
|
BOOST_UNORDERED_CALL_PARAMS(z, n) \
|
|
|
|
)); \
|
|
|
|
} \
|
|
|
|
\
|
|
|
|
template < \
|
|
|
|
BOOST_UNORDERED_TEMPLATE_ARGS(z, n) \
|
|
|
|
> \
|
|
|
|
iterator emplace_hint(const_iterator hint, \
|
|
|
|
BOOST_UNORDERED_FUNCTION_PARAMS(z, n) \
|
|
|
|
) \
|
|
|
|
{ \
|
|
|
|
return iterator(base.emplace_hint(get(hint), \
|
|
|
|
BOOST_UNORDERED_CALL_PARAMS(z, n) \
|
|
|
|
)); \
|
|
|
|
}
|
|
|
|
|
|
|
|
BOOST_PP_REPEAT_FROM_TO(1, BOOST_UNORDERED_EMPLACE_LIMIT,
|
|
|
|
BOOST_UNORDERED_EMPLACE, _)
|
|
|
|
|
|
|
|
#undef BOOST_UNORDERED_EMPLACE
|
|
|
|
|
2008-09-18 11:30:59 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
iterator insert(const value_type& obj)
|
|
|
|
{
|
Second try at merging emplace support.
Note that the previously rolled back commit was [53257], not [52357].
Merged revisions 52393-52394,52397,52884-52885,53255 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r52393 | danieljames | 2009-04-14 18:23:37 +0100 (Tue, 14 Apr 2009) | 2 lines
Implement full extract_key for compilers without SFINAE and variadic
templates.
........
r52394 | danieljames | 2009-04-14 18:23:51 +0100 (Tue, 14 Apr 2009) | 1 line
Use emplace instead of insert in the backend as it's more appropriate.
........
r52397 | danieljames | 2009-04-14 18:51:34 +0100 (Tue, 14 Apr 2009) | 1 line
Add stream output to the count test helper for unordered.
........
r52884 | danieljames | 2009-05-10 22:24:41 +0100 (Sun, 10 May 2009) | 19 lines
Cherrypick some unordered container changes from sandbox. Not including
anything which depends on the new move library.
------------------------------------------------------------------------
r52746 | danieljames | 2009-05-03 11:12:30 +0100 (Sun, 03 May 2009) | 1 line
Merge latest unordered container changes.
------------------------------------------------------------------------
r52747 | danieljames | 2009-05-03 11:15:35 +0100 (Sun, 03 May 2009) | 4 lines
Put the C++0x emplace implementations before the non-C++0x versions.
I'm going to change the non-C++0x to be macro heavy emulations of the
C++0x versions, so this will put the readable version first.
------------------------------------------------------------------------
r52748 | danieljames | 2009-05-03 11:15:44 +0100 (Sun, 03 May 2009) | 1 line
Refactor the unordered implementation a tad, to make implementing emplace less painful.
------------------------------------------------------------------------
........
r52885 | danieljames | 2009-05-10 22:25:09 +0100 (Sun, 10 May 2009) | 1 line
Merge emplace support for sandbox - but without move support.
........
r53255 | danieljames | 2009-05-25 20:45:06 +0100 (Mon, 25 May 2009) | 1 line
Unordered change log.
........
[SVN r53328]
2009-05-27 21:31:08 +00:00
|
|
|
return iterator(base.emplace(obj));
|
2008-09-18 11:30:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
iterator insert(const_iterator hint, const value_type& obj)
|
|
|
|
{
|
Second try at merging emplace support.
Note that the previously rolled back commit was [53257], not [52357].
Merged revisions 52393-52394,52397,52884-52885,53255 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r52393 | danieljames | 2009-04-14 18:23:37 +0100 (Tue, 14 Apr 2009) | 2 lines
Implement full extract_key for compilers without SFINAE and variadic
templates.
........
r52394 | danieljames | 2009-04-14 18:23:51 +0100 (Tue, 14 Apr 2009) | 1 line
Use emplace instead of insert in the backend as it's more appropriate.
........
r52397 | danieljames | 2009-04-14 18:51:34 +0100 (Tue, 14 Apr 2009) | 1 line
Add stream output to the count test helper for unordered.
........
r52884 | danieljames | 2009-05-10 22:24:41 +0100 (Sun, 10 May 2009) | 19 lines
Cherrypick some unordered container changes from sandbox. Not including
anything which depends on the new move library.
------------------------------------------------------------------------
r52746 | danieljames | 2009-05-03 11:12:30 +0100 (Sun, 03 May 2009) | 1 line
Merge latest unordered container changes.
------------------------------------------------------------------------
r52747 | danieljames | 2009-05-03 11:15:35 +0100 (Sun, 03 May 2009) | 4 lines
Put the C++0x emplace implementations before the non-C++0x versions.
I'm going to change the non-C++0x to be macro heavy emulations of the
C++0x versions, so this will put the readable version first.
------------------------------------------------------------------------
r52748 | danieljames | 2009-05-03 11:15:44 +0100 (Sun, 03 May 2009) | 1 line
Refactor the unordered implementation a tad, to make implementing emplace less painful.
------------------------------------------------------------------------
........
r52885 | danieljames | 2009-05-10 22:25:09 +0100 (Sun, 10 May 2009) | 1 line
Merge emplace support for sandbox - but without move support.
........
r53255 | danieljames | 2009-05-25 20:45:06 +0100 (Mon, 25 May 2009) | 1 line
Unordered change log.
........
[SVN r53328]
2009-05-27 21:31:08 +00:00
|
|
|
return iterator(base.emplace_hint(get(hint), obj));
|
2008-09-18 11:30:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
template <class InputIterator>
|
|
|
|
void insert(InputIterator first, InputIterator last)
|
|
|
|
{
|
|
|
|
base.insert_range(first, last);
|
|
|
|
}
|
|
|
|
|
|
|
|
iterator erase(const_iterator position)
|
|
|
|
{
|
|
|
|
return iterator(base.data_.erase(get(position)));
|
|
|
|
}
|
|
|
|
|
|
|
|
size_type erase(const key_type& k)
|
|
|
|
{
|
|
|
|
return base.erase_key(k);
|
|
|
|
}
|
|
|
|
|
|
|
|
iterator erase(const_iterator first, const_iterator last)
|
|
|
|
{
|
|
|
|
return iterator(base.data_.erase_range(get(first), get(last)));
|
|
|
|
}
|
|
|
|
|
|
|
|
void clear()
|
|
|
|
{
|
|
|
|
base.data_.clear();
|
|
|
|
}
|
|
|
|
|
|
|
|
void swap(unordered_multimap& other)
|
|
|
|
{
|
|
|
|
base.swap(other.base);
|
|
|
|
}
|
|
|
|
|
|
|
|
// observers
|
|
|
|
|
|
|
|
hasher hash_function() const
|
|
|
|
{
|
|
|
|
return base.hash_function();
|
|
|
|
}
|
|
|
|
|
|
|
|
key_equal key_eq() const
|
|
|
|
{
|
|
|
|
return base.key_eq();
|
|
|
|
}
|
|
|
|
|
|
|
|
// lookup
|
|
|
|
|
|
|
|
iterator find(const key_type& k)
|
|
|
|
{
|
|
|
|
return iterator(base.find(k));
|
|
|
|
}
|
|
|
|
|
|
|
|
const_iterator find(const key_type& k) const
|
|
|
|
{
|
|
|
|
return const_iterator(base.find(k));
|
|
|
|
}
|
|
|
|
|
|
|
|
size_type count(const key_type& k) const
|
|
|
|
{
|
|
|
|
return base.count(k);
|
|
|
|
}
|
|
|
|
|
|
|
|
std::pair<iterator, iterator>
|
|
|
|
equal_range(const key_type& k)
|
|
|
|
{
|
|
|
|
return boost::unordered_detail::pair_cast<iterator, iterator>(
|
|
|
|
base.equal_range(k));
|
|
|
|
}
|
|
|
|
|
|
|
|
std::pair<const_iterator, const_iterator>
|
|
|
|
equal_range(const key_type& k) const
|
|
|
|
{
|
|
|
|
return boost::unordered_detail::pair_cast<const_iterator, const_iterator>(
|
|
|
|
base.equal_range(k));
|
|
|
|
}
|
|
|
|
|
|
|
|
// bucket interface
|
|
|
|
|
|
|
|
size_type bucket_count() const
|
|
|
|
{
|
|
|
|
return base.bucket_count();
|
|
|
|
}
|
|
|
|
|
|
|
|
size_type max_bucket_count() const
|
|
|
|
{
|
|
|
|
return base.max_bucket_count();
|
|
|
|
}
|
|
|
|
|
|
|
|
size_type bucket_size(size_type n) const
|
|
|
|
{
|
|
|
|
return base.data_.bucket_size(n);
|
|
|
|
}
|
|
|
|
|
|
|
|
size_type bucket(const key_type& k) const
|
|
|
|
{
|
|
|
|
return base.bucket(k);
|
|
|
|
}
|
|
|
|
|
|
|
|
local_iterator begin(size_type n)
|
|
|
|
{
|
|
|
|
return local_iterator(base.data_.begin(n));
|
|
|
|
}
|
|
|
|
|
|
|
|
const_local_iterator begin(size_type n) const
|
|
|
|
{
|
|
|
|
return const_local_iterator(base.data_.begin(n));
|
|
|
|
}
|
|
|
|
|
|
|
|
local_iterator end(size_type n)
|
|
|
|
{
|
|
|
|
return local_iterator(base.data_.end(n));
|
|
|
|
}
|
|
|
|
|
|
|
|
const_local_iterator end(size_type n) const
|
|
|
|
{
|
|
|
|
return const_local_iterator(base.data_.end(n));
|
|
|
|
}
|
|
|
|
|
|
|
|
const_local_iterator cbegin(size_type n) const
|
|
|
|
{
|
|
|
|
return const_local_iterator(base.data_.begin(n));
|
|
|
|
}
|
|
|
|
|
|
|
|
const_local_iterator cend(size_type n) const
|
|
|
|
{
|
|
|
|
return const_local_iterator(base.data_.end(n));
|
|
|
|
}
|
|
|
|
|
|
|
|
// hash policy
|
|
|
|
|
|
|
|
float load_factor() const
|
|
|
|
{
|
|
|
|
return base.load_factor();
|
|
|
|
}
|
|
|
|
|
|
|
|
float max_load_factor() const
|
|
|
|
{
|
|
|
|
return base.max_load_factor();
|
|
|
|
}
|
|
|
|
|
|
|
|
void max_load_factor(float m)
|
|
|
|
{
|
|
|
|
base.max_load_factor(m);
|
|
|
|
}
|
|
|
|
|
|
|
|
void rehash(size_type n)
|
|
|
|
{
|
|
|
|
base.rehash(n);
|
|
|
|
}
|
|
|
|
|
|
|
|
#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
|
|
|
|
friend bool operator==(unordered_multimap const&, unordered_multimap const&);
|
|
|
|
friend bool operator!=(unordered_multimap const&, unordered_multimap const&);
|
Merge latest changes for unordered. Improved compatability and a few tweaks.
Merged revisions 53127,53253,53256,53311,53314,53316-53318 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r53127 | danieljames | 2009-05-20 07:43:38 +0100 (Wed, 20 May 2009) | 1 line
Better configuration for boost.unordered.
........
r53253 | danieljames | 2009-05-25 20:14:07 +0100 (Mon, 25 May 2009) | 3 lines
Add explicit destructors to the unordered containers. Refs #2908.
Isn't really needed but it doesn't hurt.
........
r53256 | danieljames | 2009-05-25 20:45:23 +0100 (Mon, 25 May 2009) | 1 line
Unordered change log for explicit destructors.
........
r53311 | danieljames | 2009-05-27 18:42:01 +0100 (Wed, 27 May 2009) | 1 line
Missing changelog entry.
........
r53314 | danieljames | 2009-05-27 18:44:09 +0100 (Wed, 27 May 2009) | 1 line
Use lightweight_test for unordered.
........
r53316 | danieljames | 2009-05-27 19:19:32 +0100 (Wed, 27 May 2009) | 1 line
Some workarounds for old versions of Borland.
........
r53317 | danieljames | 2009-05-27 19:32:22 +0100 (Wed, 27 May 2009) | 1 line
Fix a change accidentally included in the last commit.
........
r53318 | danieljames | 2009-05-27 19:32:38 +0100 (Wed, 27 May 2009) | 1 line
Remove an unused function.
........
[SVN r53465]
2009-05-30 17:34:12 +00:00
|
|
|
#elif !BOOST_WORKAROUND(__BORLANDC__, < 0x0582)
|
Merged revisions 49661-49662,49666,49669,49735,49756,49770,49811 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r49661 | danieljames | 2008-11-09 12:03:45 +0000 (Sun, 09 Nov 2008) | 1 line
Move hash detail headers out of boost/functional/detail.
........
r49662 | danieljames | 2008-11-09 12:11:50 +0000 (Sun, 09 Nov 2008) | 1 line
Add a forwarding header for container_fwd.hpp
........
r49666 | danieljames | 2008-11-09 19:12:05 +0000 (Sun, 09 Nov 2008) | 1 line
Avoid comparing default initialised iterators in position_iterator.
........
r49669 | danieljames | 2008-11-09 21:57:38 +0000 (Sun, 09 Nov 2008) | 2 lines
Add link to the header to the synopsis in reference documentation.
Refs #2214
........
r49735 | danieljames | 2008-11-14 12:51:00 +0000 (Fri, 14 Nov 2008) | 1 line
Explicitly specify the template parameters in the unordered container friend, in order to avoid some warnings.
........
r49756 | danieljames | 2008-11-14 16:11:16 +0000 (Fri, 14 Nov 2008) | 1 line
Use pragmas to suppress a Visual C++ warning.
........
r49770 | danieljames | 2008-11-15 13:07:29 +0000 (Sat, 15 Nov 2008) | 1 line
Use the new swap library.
........
r49811 | danieljames | 2008-11-16 23:10:00 +0000 (Sun, 16 Nov 2008) | 1 line
Fix a typo.
........
[SVN r49855]
2008-11-20 22:53:20 +00:00
|
|
|
friend bool operator==<Key, T, Hash, Pred, Alloc>(unordered_multimap const&, unordered_multimap const&);
|
|
|
|
friend bool operator!=<Key, T, Hash, Pred, Alloc>(unordered_multimap const&, unordered_multimap const&);
|
2008-09-18 11:30:59 +00:00
|
|
|
#endif
|
|
|
|
}; // class template unordered_multimap
|
|
|
|
|
|
|
|
template <class K, class T, class H, class P, class A>
|
|
|
|
inline bool operator==(unordered_multimap<K, T, H, P, A> const& m1,
|
|
|
|
unordered_multimap<K, T, H, P, A> const& m2)
|
|
|
|
{
|
|
|
|
return boost::unordered_detail::equals(m1.base, m2.base);
|
|
|
|
}
|
|
|
|
|
|
|
|
template <class K, class T, class H, class P, class A>
|
|
|
|
inline bool operator!=(unordered_multimap<K, T, H, P, A> const& m1,
|
|
|
|
unordered_multimap<K, T, H, P, A> const& m2)
|
|
|
|
{
|
|
|
|
return !boost::unordered_detail::equals(m1.base, m2.base);
|
|
|
|
}
|
|
|
|
|
|
|
|
template <class K, class T, class H, class P, class A>
|
|
|
|
inline void swap(unordered_multimap<K, T, H, P, A> &m1,
|
|
|
|
unordered_multimap<K, T, H, P, A> &m2)
|
|
|
|
{
|
|
|
|
m1.swap(m2);
|
|
|
|
}
|
|
|
|
|
|
|
|
} // namespace boost
|
|
|
|
|
Merged revisions 49661-49662,49666,49669,49735,49756,49770,49811 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r49661 | danieljames | 2008-11-09 12:03:45 +0000 (Sun, 09 Nov 2008) | 1 line
Move hash detail headers out of boost/functional/detail.
........
r49662 | danieljames | 2008-11-09 12:11:50 +0000 (Sun, 09 Nov 2008) | 1 line
Add a forwarding header for container_fwd.hpp
........
r49666 | danieljames | 2008-11-09 19:12:05 +0000 (Sun, 09 Nov 2008) | 1 line
Avoid comparing default initialised iterators in position_iterator.
........
r49669 | danieljames | 2008-11-09 21:57:38 +0000 (Sun, 09 Nov 2008) | 2 lines
Add link to the header to the synopsis in reference documentation.
Refs #2214
........
r49735 | danieljames | 2008-11-14 12:51:00 +0000 (Fri, 14 Nov 2008) | 1 line
Explicitly specify the template parameters in the unordered container friend, in order to avoid some warnings.
........
r49756 | danieljames | 2008-11-14 16:11:16 +0000 (Fri, 14 Nov 2008) | 1 line
Use pragmas to suppress a Visual C++ warning.
........
r49770 | danieljames | 2008-11-15 13:07:29 +0000 (Sat, 15 Nov 2008) | 1 line
Use the new swap library.
........
r49811 | danieljames | 2008-11-16 23:10:00 +0000 (Sun, 16 Nov 2008) | 1 line
Fix a typo.
........
[SVN r49855]
2008-11-20 22:53:20 +00:00
|
|
|
#if defined(BOOST_MSVC)
|
|
|
|
#pragma warning(pop)
|
|
|
|
#endif
|
|
|
|
|
2008-09-18 11:30:59 +00:00
|
|
|
#endif // BOOST_UNORDERED_UNORDERED_MAP_HPP_INCLUDED
|