feedc0de/boost_unordered
1
0
Fork 0
forked from boostorg/unordered
Code Pull Requests Activity

Initial checkin of new version of Boost.Unordered.

Browse Source 
- More template use, less preprocessor use.
 - Removed some of the Visual C++ 6 workarounds.
 - Reduced memory use of the main object.
 - Split into smaller headers.

[SVN r55878]
This commit is contained in:
Daniel James
2009-08-30 16:42:28 +00:00
parent 4350660626
commit 386d9f28d7
19 changed files with 3622 additions and 3431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

396
include/boost/unordered/unordered_set.hpp
View File

@@ -15,7 +15,8 @@
#include <boost/unordered/unordered_set_fwd.hpp>
#include <boost/functional/hash.hpp>
#include <boost/unordered/detail/hash_table.hpp>
#include <boost/unordered/detail/allocator_helpers.hpp>
#include <boost/unordered/detail/insert.hpp>
#if !defined(BOOST_HAS_RVALUE_REFS)
#include <boost/unordered/detail/move.hpp>
@@ -39,37 +40,56 @@ namespace boost
template <class Value, class Hash, class Pred, class Alloc>
class unordered_set
{
#if BOOST_WORKAROUND(__BORLANDC__, < 0x0582)
public:
#endif
typedef boost::unordered_detail::hash_types_unique_keys<
Value, Value, Hash, Pred, Alloc
> implementation;
BOOST_DEDUCED_TYPENAME implementation::hash_table base;
public:
// types
typedef Value key_type;
typedef Value value_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;
#if !BOOST_WORKAROUND(__BORLANDC__, < 0x0582)
private:
#endif
typedef BOOST_DEDUCED_TYPENAME implementation::const_iterator iterator;
typedef BOOST_DEDUCED_TYPENAME implementation::const_iterator const_iterator;
typedef BOOST_DEDUCED_TYPENAME implementation::const_local_iterator local_iterator;
typedef BOOST_DEDUCED_TYPENAME implementation::const_local_iterator const_local_iterator;
typedef BOOST_DEDUCED_TYPENAME
boost::unordered_detail::rebind_wrap<allocator_type, value_type>::type
value_allocator;
typedef boost::unordered_detail::hash_unique_table<Hash, Pred, value_allocator,
boost::unordered_detail::set_extractor> table;
typedef BOOST_DEDUCED_TYPENAME table::iterator_base iterator_base;
public:
typedef BOOST_DEDUCED_TYPENAME value_allocator::pointer pointer;
typedef BOOST_DEDUCED_TYPENAME value_allocator::const_pointer const_pointer;
typedef BOOST_DEDUCED_TYPENAME value_allocator::reference reference;
typedef BOOST_DEDUCED_TYPENAME value_allocator::const_reference const_reference;
typedef BOOST_DEDUCED_TYPENAME std::size_t size_type;
typedef BOOST_DEDUCED_TYPENAME std::ptrdiff_t difference_type;
typedef boost::unordered_detail::hash_const_local_iterator<
value_allocator, boost::unordered_detail::ungrouped> const_local_iterator;
typedef boost::unordered_detail::hash_const_iterator<
value_allocator, boost::unordered_detail::ungrouped> const_iterator;
typedef const_local_iterator local_iterator;
typedef const_iterator iterator;
#if !BOOST_WORKAROUND(__BORLANDC__, < 0x0582)
private:
#endif
table table_;
BOOST_DEDUCED_TYPENAME table::iterator_base const&
get(const_iterator const& it)
{
return boost::unordered_detail::iterator_access::get(it);
}
public:
// construct/destroy/copy
@@ -78,34 +98,35 @@ namespace boost
const hasher &hf = hasher(),
const key_equal &eql = key_equal(),
const allocator_type &a = allocator_type())
: base(n, hf, eql, a)
: table_(n, hf, eql, a)
{
}
explicit unordered_set(allocator_type const& a)
: base(boost::unordered_detail::default_initial_bucket_count,
: table_(boost::unordered_detail::default_initial_bucket_count,
hasher(), key_equal(), a)
{
}
unordered_set(unordered_set const& other, allocator_type const& a)
: base(other.base, a)
: table_(other.table_, a)
{
}
template <class InputIterator>
unordered_set(InputIterator f, InputIterator l)
: base(f, l, boost::unordered_detail::default_initial_bucket_count,
hasher(), key_equal(), allocator_type())
: table_(boost::unordered_detail::initial_size(f, l), hasher(), key_equal(), allocator_type())
{
table_.insert_range(f, l);
}
template <class InputIterator>
unordered_set(InputIterator f, InputIterator l, size_type n,
const hasher &hf = hasher(),
const key_equal &eql = key_equal())
: base(f, l, n, hf, eql, allocator_type())
: table_(boost::unordered_detail::initial_size(f, l, n), hf, eql, allocator_type())
{
table_.insert_range(f, l);
}
template <class InputIterator>
@@ -113,38 +134,39 @@ namespace boost
const hasher &hf,
const key_equal &eql,
const allocator_type &a)
: base(f, l, n, hf, eql, a)
: table_(boost::unordered_detail::initial_size(f, l, n), hf, eql, a)
{
table_.insert_range(f, l);
}
~unordered_set() {}
#if defined(BOOST_HAS_RVALUE_REFS)
unordered_set(unordered_set&& other)
: base(other.base, boost::unordered_detail::move_tag())
: table_(other.table_, boost::unordered_detail::move_tag())
{
}
unordered_set(unordered_set&& other, allocator_type const& a)
: base(other.base, a, boost::unordered_detail::move_tag())
: table_(other.table_, a, boost::unordered_detail::move_tag())
{
}
unordered_set& operator=(unordered_set&& x)
{
base.move(x.base);
table_.move(x.table_);
return *this;
}
#else
unordered_set(boost::unordered_detail::move_from<unordered_set<Value, Hash, Pred, Alloc> > other)
: base(other.source.base, boost::unordered_detail::move_tag())
: table_(other.source.table_, boost::unordered_detail::move_tag())
{
}
#if !BOOST_WORKAROUND(__BORLANDC__, < 0x0593)
unordered_set& operator=(unordered_set x)
{
base.move(x.base);
table_.move(x.table_);
return *this;
}
#endif
@@ -156,80 +178,71 @@ namespace boost
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)
: table_(boost::unordered_detail::initial_size(list.begin(), list.end(), n), hf, eql, allocator_type())
{
table_.insert_range(list.begin(), list.end());
}
unordered_set& operator=(std::initializer_list<value_type> list)
{
base.data_.clear();
base.insert_range(list.begin(), list.end());
table_.clear();
table_.insert_range(list.begin(), list.end());
return *this;
}
#endif
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();
return table_.node_alloc();
}
// size and capacity
bool empty() const
{
return base.empty();
return table_.size_ == 0;
}
size_type size() const
{
return base.size();
return table_.size_;
}
size_type max_size() const
{
return base.max_size();
return table_.max_size();
}
// iterators
iterator begin()
{
return iterator(base.data_.begin());
return iterator(table_.begin());
}
const_iterator begin() const
{
return const_iterator(base.data_.begin());
return const_iterator(table_.begin());
}
iterator end()
{
return iterator(base.data_.end());
return iterator(table_.end());
}
const_iterator end() const
{
return const_iterator(base.data_.end());
return const_iterator(table_.end());
}
const_iterator cbegin() const
{
return const_iterator(base.data_.begin());
return const_iterator(table_.begin());
}
const_iterator cend() const
{
return const_iterator(base.data_.end());
return const_iterator(table_.end());
}
// modifiers
@@ -239,26 +252,26 @@ namespace boost
std::pair<iterator, bool> emplace(Args&&... args)
{
return boost::unordered_detail::pair_cast<iterator, bool>(
base.emplace(std::forward<Args>(args)...));
table_.emplace(std::forward<Args>(args)...));
}
template <class... Args>
iterator emplace_hint(const_iterator hint, Args&&... args)
{
return iterator(
base.emplace_hint(get(hint), std::forward<Args>(args)...));
table_.emplace_hint(get(hint), std::forward<Args>(args)...));
}
#else
std::pair<iterator, bool> emplace(value_type const& v = value_type())
{
return boost::unordered_detail::pair_cast<iterator, bool>(
base.emplace(v));
table_.emplace(v));
}
iterator emplace_hint(const_iterator hint, value_type const& v = value_type())
{
return iterator(base.emplace_hint(get(hint), v));
return iterator(table_.emplace_hint(get(hint), v));
}
#define BOOST_UNORDERED_EMPLACE(z, n, _) \
@@ -270,7 +283,7 @@ namespace boost
) \
{ \
return boost::unordered_detail::pair_cast<iterator, bool>( \
base.emplace( \
table_.emplace( \
BOOST_UNORDERED_CALL_PARAMS(z, n) \
)); \
} \
@@ -282,7 +295,7 @@ namespace boost
BOOST_UNORDERED_FUNCTION_PARAMS(z, n) \
) \
{ \
return iterator(base.emplace_hint(get(hint), \
return iterator(table_.emplace_hint(get(hint), \
BOOST_UNORDERED_CALL_PARAMS(z, n) \
)); \
}
@@ -297,148 +310,148 @@ namespace boost
std::pair<iterator, bool> insert(const value_type& obj)
{
return boost::unordered_detail::pair_cast<iterator, bool>(
base.emplace(obj));
table_.emplace(obj));
}
iterator insert(const_iterator hint, const value_type& obj)
{
return iterator(base.emplace_hint(get(hint), obj));
return iterator(table_.emplace_hint(get(hint), obj));
}
template <class InputIterator>
void insert(InputIterator first, InputIterator last)
{
base.insert_range(first, last);
table_.insert_range(first, last);
}
iterator erase(const_iterator position)
{
return iterator(base.data_.erase(get(position)));
return iterator(table_.erase(get(position)));
}
size_type erase(const key_type& k)
{
return base.erase_key(k);
return table_.erase_key(k);
}
iterator erase(const_iterator first, const_iterator last)
{
return iterator(base.data_.erase_range(get(first), get(last)));
return iterator(table_.erase_range(get(first), get(last)));
}
void clear()
{
base.data_.clear();
table_.clear();
}
void swap(unordered_set& other)
{
base.swap(other.base);
table_.swap(other.table_);
}
// observers
hasher hash_function() const
{
return base.hash_function();
return table_.hash_function();
}
key_equal key_eq() const
{
return base.key_eq();
return table_.key_eq();
}
// lookup
const_iterator find(const key_type& k) const
{
return const_iterator(base.find(k));
return const_iterator(table_.find(k));
}
size_type count(const key_type& k) const
{
return base.count(k);
return table_.count(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));
table_.equal_range(k));
}
// bucket interface
size_type bucket_count() const
{
return base.bucket_count();
return table_.bucket_count();
}
size_type max_bucket_count() const
{
return base.max_bucket_count();
return table_.max_bucket_count();
}
size_type bucket_size(size_type n) const
{
return base.data_.bucket_size(n);
return table_.bucket_size(n);
}
size_type bucket(const key_type& k) const
{
return base.bucket(k);
return table_.bucket_index(k);
}
local_iterator begin(size_type n)
{
return local_iterator(base.data_.begin(n));
return local_iterator(table_.bucket_begin(n));
}
const_local_iterator begin(size_type n) const
{
return const_local_iterator(base.data_.begin(n));
return const_local_iterator(table_.bucket_begin(n));
}
local_iterator end(size_type n)
{
return local_iterator(base.data_.end(n));
return local_iterator(table_.bucket_end(n));
}
const_local_iterator end(size_type n) const
{
return const_local_iterator(base.data_.end(n));
return const_local_iterator(table_.bucket_end(n));
}
const_local_iterator cbegin(size_type n) const
{
return const_local_iterator(base.data_.begin(n));
return const_local_iterator(table_.bucket_begin(n));
}
const_local_iterator cend(size_type n) const
{
return const_local_iterator(base.data_.end(n));
return const_local_iterator(table_.bucket_end(n));
}
// hash policy
float load_factor() const
{
return base.load_factor();
return table_.load_factor();
}
float max_load_factor() const
{
return base.max_load_factor();
return table_.mlf_;
}
void max_load_factor(float m)
{
base.max_load_factor(m);
table_.max_load_factor(m);
}
void rehash(size_type n)
{
base.rehash(n);
table_.rehash(n);
}
#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
@@ -454,14 +467,14 @@ namespace boost
inline bool operator==(unordered_set<T, H, P, A> const& m1,
unordered_set<T, H, P, A> const& m2)
{
return boost::unordered_detail::equals(m1.base, m2.base);
return m1.table_.equals(m2.table_);
}
template <class T, class H, class P, class A>
inline bool operator!=(unordered_set<T, H, P, A> const& m1,
unordered_set<T, H, P, A> const& m2)
{
return !boost::unordered_detail::equals(m1.base, m2.base);
return !m1.table_.equals(m2.table_);
}
template <class T, class H, class P, class A>
@@ -474,37 +487,55 @@ namespace boost
template <class Value, class Hash, class Pred, class Alloc>
class unordered_multiset
{
#if BOOST_WORKAROUND(__BORLANDC__, < 0x0582)
public:
#endif
typedef boost::unordered_detail::hash_types_equivalent_keys<
Value, Value, Hash, Pred, Alloc
> implementation;
BOOST_DEDUCED_TYPENAME implementation::hash_table base;
public:
//types
typedef Value key_type;
typedef Value value_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;
#if !BOOST_WORKAROUND(__BORLANDC__, < 0x0582)
private:
#endif
typedef BOOST_DEDUCED_TYPENAME
boost::unordered_detail::rebind_wrap<allocator_type, value_type>::type
value_allocator;
typedef BOOST_DEDUCED_TYPENAME implementation::const_iterator iterator;
typedef BOOST_DEDUCED_TYPENAME implementation::const_iterator const_iterator;
typedef BOOST_DEDUCED_TYPENAME implementation::const_local_iterator local_iterator;
typedef BOOST_DEDUCED_TYPENAME implementation::const_local_iterator const_local_iterator;
typedef boost::unordered_detail::hash_equivalent_table<Hash, Pred, value_allocator,
boost::unordered_detail::set_extractor> table;
typedef BOOST_DEDUCED_TYPENAME table::iterator_base iterator_base;
public:
typedef BOOST_DEDUCED_TYPENAME value_allocator::pointer pointer;
typedef BOOST_DEDUCED_TYPENAME value_allocator::const_pointer const_pointer;
typedef BOOST_DEDUCED_TYPENAME value_allocator::reference reference;
typedef BOOST_DEDUCED_TYPENAME value_allocator::const_reference const_reference;
typedef BOOST_DEDUCED_TYPENAME std::size_t size_type;
typedef BOOST_DEDUCED_TYPENAME std::ptrdiff_t difference_type;
typedef boost::unordered_detail::hash_const_local_iterator<
value_allocator, boost::unordered_detail::grouped> const_local_iterator;
typedef boost::unordered_detail::hash_const_iterator<
value_allocator, boost::unordered_detail::grouped> const_iterator;
typedef const_local_iterator local_iterator;
typedef const_iterator iterator;
#if !BOOST_WORKAROUND(__BORLANDC__, < 0x0582)
private:
#endif
table table_;
BOOST_DEDUCED_TYPENAME table::iterator_base const&
get(const_iterator const& it)
{
return boost::unordered_detail::iterator_access::get(it);
}
public:
// construct/destroy/copy
@@ -513,34 +544,35 @@ namespace boost
const hasher &hf = hasher(),
const key_equal &eql = key_equal(),
const allocator_type &a = allocator_type())
: base(n, hf, eql, a)
: table_(n, hf, eql, a)
{
}
explicit unordered_multiset(allocator_type const& a)
: base(boost::unordered_detail::default_initial_bucket_count,
: table_(boost::unordered_detail::default_initial_bucket_count,
hasher(), key_equal(), a)
{
}
unordered_multiset(unordered_multiset const& other, allocator_type const& a)
: base(other.base, a)
: table_(other.table_, a)
{
}
template <class InputIterator>
unordered_multiset(InputIterator f, InputIterator l)
: base(f, l, boost::unordered_detail::default_initial_bucket_count,
hasher(), key_equal(), allocator_type())
: table_(boost::unordered_detail::initial_size(f, l), hasher(), key_equal(), allocator_type())
{
table_.insert_range(f, l);
}
template <class InputIterator>
unordered_multiset(InputIterator f, InputIterator l, size_type n,
const hasher &hf = hasher(),
const key_equal &eql = key_equal())
: base(f, l, n, hf, eql, allocator_type())
: table_(boost::unordered_detail::initial_size(f, l, n), hf, eql, allocator_type())
{
table_.insert_range(f, l);
}
template <class InputIterator>
@@ -548,38 +580,39 @@ namespace boost
const hasher &hf,
const key_equal &eql,
const allocator_type &a)
: base(f, l, n, hf, eql, a)
: table_(boost::unordered_detail::initial_size(f, l, n), hf, eql, a)
{
table_.insert_range(f, l);
}
~unordered_multiset() {}
#if defined(BOOST_HAS_RVALUE_REFS)
unordered_multiset(unordered_multiset&& other)
: base(other.base, boost::unordered_detail::move_tag())
: table_(other.table_, boost::unordered_detail::move_tag())
{
}
unordered_multiset(unordered_multiset&& other, allocator_type const& a)
: base(other.base, a, boost::unordered_detail::move_tag())
: table_(other.table_, a, boost::unordered_detail::move_tag())
{
}
unordered_multiset& operator=(unordered_multiset&& x)
{
base.move(x.base);
table_.move(x.table_);
return *this;
}
#else
unordered_multiset(boost::unordered_detail::move_from<unordered_multiset<Value, Hash, Pred, Alloc> > other)
: base(other.source.base, boost::unordered_detail::move_tag())
: table_(other.source.table_, boost::unordered_detail::move_tag())
{
}
#if !BOOST_WORKAROUND(__BORLANDC__, < 0x0593)
unordered_multiset& operator=(unordered_multiset x)
{
base.move(x.base);
table_.move(x.table_);
return *this;
}
#endif
@@ -591,80 +624,71 @@ namespace boost
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)
: table_(boost::unordered_detail::initial_size(list.begin(), list.end(), n), hf, eql, allocator_type())
{
table_.insert_range(list.begin(), list.end());
}
unordered_multiset& operator=(std::initializer_list<value_type> list)
{
base.data_.clear();
base.insert_range(list.begin(), list.end());
table_.clear();
table_.insert_range(list.begin(), list.end());
return *this;
}
#endif
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();
return table_.node_alloc();
}
// size and capacity
bool empty() const
{
return base.empty();
return table_.size_ == 0;
}
size_type size() const
{
return base.size();
return table_.size_;
}
size_type max_size() const
{
return base.max_size();
return table_.max_size();
}
// iterators
iterator begin()
{
return iterator(base.data_.begin());
return iterator(table_.begin());
}
const_iterator begin() const
{
return const_iterator(base.data_.begin());
return const_iterator(table_.begin());
}
iterator end()
{
return iterator(base.data_.end());
return iterator(table_.end());
}
const_iterator end() const
{
return const_iterator(base.data_.end());
return const_iterator(table_.end());
}
const_iterator cbegin() const
{
return const_iterator(base.data_.begin());
return const_iterator(table_.begin());
}
const_iterator cend() const
{
return const_iterator(base.data_.end());
return const_iterator(table_.end());
}
// modifiers
@@ -673,24 +697,24 @@ namespace boost
template <class... Args>
iterator emplace(Args&&... args)
{
return iterator(base.emplace(std::forward<Args>(args)...));
return iterator(table_.emplace(std::forward<Args>(args)...));
}
template <class... Args>
iterator emplace_hint(const_iterator hint, Args&&... args)
{
return iterator(base.emplace_hint(get(hint), std::forward<Args>(args)...));
return iterator(table_.emplace_hint(get(hint), std::forward<Args>(args)...));
}
#else
iterator emplace(value_type const& v = value_type())
{
return iterator(base.emplace(v));
return iterator(table_.emplace(v));
}
iterator emplace_hint(const_iterator hint, value_type const& v = value_type())
{
return iterator(base.emplace_hint(get(hint), v));
return iterator(table_.emplace_hint(get(hint), v));
}
#define BOOST_UNORDERED_EMPLACE(z, n, _) \
@@ -702,9 +726,7 @@ namespace boost
) \
{ \
return iterator( \
base.emplace( \
BOOST_UNORDERED_CALL_PARAMS(z, n) \
)); \
table_.emplace(BOOST_UNORDERED_CALL_PARAMS(z, n))); \
} \
\
template < \
@@ -714,7 +736,7 @@ namespace boost
BOOST_UNORDERED_FUNCTION_PARAMS(z, n) \
) \
{ \
return iterator(base.emplace_hint(get(hint), \
return iterator(table_.emplace_hint(get(hint), \
BOOST_UNORDERED_CALL_PARAMS(z, n) \
)); \
}
@@ -728,148 +750,148 @@ namespace boost
iterator insert(const value_type& obj)
{
return iterator(base.emplace(obj));
return iterator(table_.emplace(obj));
}
iterator insert(const_iterator hint, const value_type& obj)
{
return iterator(base.emplace_hint(get(hint), obj));
return iterator(table_.emplace_hint(get(hint), obj));
}
template <class InputIterator>
void insert(InputIterator first, InputIterator last)
{
base.insert_range(first, last);
table_.insert_range(first, last);
}
iterator erase(const_iterator position)
{
return iterator(base.data_.erase(get(position)));
return iterator(table_.erase(get(position)));
}
size_type erase(const key_type& k)
{
return base.erase_key(k);
return table_.erase_key(k);
}
iterator erase(const_iterator first, const_iterator last)
{
return iterator(base.data_.erase_range(get(first), get(last)));
return iterator(table_.erase_range(get(first), get(last)));
}
void clear()
{
base.data_.clear();
table_.clear();
}
void swap(unordered_multiset& other)
{
base.swap(other.base);
table_.swap(other.table_);
}
// observers
hasher hash_function() const
{
return base.hash_function();
return table_.hash_function();
}
key_equal key_eq() const
{
return base.key_eq();
return table_.key_eq();
}
// lookup
const_iterator find(const key_type& k) const
{
return const_iterator(base.find(k));
return const_iterator(table_.find(k));
}
size_type count(const key_type& k) const
{
return base.count(k);
return table_.count(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));
table_.equal_range(k));
}
// bucket interface
size_type bucket_count() const
{
return base.bucket_count();
return table_.bucket_count();
}
size_type max_bucket_count() const
{
return base.max_bucket_count();
return table_.max_bucket_count();
}
size_type bucket_size(size_type n) const
{
return base.data_.bucket_size(n);
return table_.bucket_size(n);
}
size_type bucket(const key_type& k) const
{
return base.bucket(k);
return table_.bucket_index(k);
}
local_iterator begin(size_type n)
{
return local_iterator(base.data_.begin(n));
return local_iterator(table_.bucket_begin(n));
}
const_local_iterator begin(size_type n) const
{
return const_local_iterator(base.data_.begin(n));
return const_local_iterator(table_.bucket_begin(n));
}
local_iterator end(size_type n)
{
return local_iterator(base.data_.end(n));
return local_iterator(table_.bucket_end(n));
}
const_local_iterator end(size_type n) const
{
return const_local_iterator(base.data_.end(n));
return const_local_iterator(table_.bucket_end(n));
}
const_local_iterator cbegin(size_type n) const
{
return const_local_iterator(base.data_.begin(n));
return const_local_iterator(table_.bucket_begin(n));
}
const_local_iterator cend(size_type n) const
{
return const_local_iterator(base.data_.end(n));
return const_local_iterator(table_.bucket_end(n));
}
// hash policy
float load_factor() const
{
return base.load_factor();
return table_.load_factor();
}
float max_load_factor() const
{
return base.max_load_factor();
return table_.mlf_;
}
void max_load_factor(float m)
{
base.max_load_factor(m);
table_.max_load_factor(m);
}
void rehash(size_type n)
{
base.rehash(n);
table_.rehash(n);
}
#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
@@ -885,14 +907,14 @@ namespace boost
inline bool operator==(unordered_multiset<T, H, P, A> const& m1,
unordered_multiset<T, H, P, A> const& m2)
{
return boost::unordered_detail::equals(m1.base, m2.base);
return m1.table_.equals(m2.table_);
}
template <class T, class H, class P, class A>
inline bool operator!=(unordered_multiset<T, H, P, A> const& m1,
unordered_multiset<T, H, P, A> const& m2)
{
return !boost::unordered_detail::equals(m1.base, m2.base);
return !m1.table_.equals(m2.table_);
}
template <class T, class H, class P, class A>