boostorg/unordered
1
0
Fork 1
mirror of https://github.com/boostorg/unordered.git synced 2025-07-31 03:47:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update the unordered containers' iterator overloads for the more recent versions of TR1.

Browse Source 
[SVN r2921]
This commit is contained in:
Daniel James
2006-04-17 08:45:32 +00:00
parent 56e67a9d7d
commit e8faab1268
2 changed files with 50 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
include/boost/unordered_map.hpp
View File

@ -5,7 +5,7 @@
// boost/unordered_map.hpp // boost/unordered_map.hpp
// Copyright <20> 2003-2004 Jeremy B. Maitin-Shepard. // Copyright <20> 2003-2004 Jeremy B. Maitin-Shepard.
// Copyright <20> 2005 Daniel James. // Copyright <20> 2005-2006 Daniel James.
// Use, modification, and distribution is subject to the Boost Software // Use, modification, and distribution is subject to the Boost Software
// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy
@ -186,32 +186,47 @@ namespace boost
base.insert_unique(obj)); base.insert_unique(obj));
} }
iterator insert(const_iterator hint, const value_type& obj) iterator insert(iterator hint, const value_type& obj)
{ {
return iterator(base.insert_unique(get(hint), obj)); return iterator(base.insert_unique(get(hint), obj));
} }
const_iterator insert(const_iterator hint, const value_type& obj)
{
return const_iterator(base.insert_unique(get(hint), obj));
}
template <class InputIterator> template <class InputIterator>
void insert(InputIterator first, InputIterator last) void insert(InputIterator first, InputIterator last)
{ {
base.insert(first, last); base.insert(first, last);
} }
iterator erase(const_iterator position) iterator erase(iterator position)
{ {
return iterator(base.erase(get(position))); return iterator(base.erase(get(position)));
} }
const_iterator erase(const_iterator position)
{
return const_iterator(base.erase(get(position)));
}
size_type erase(const key_type& k) size_type erase(const key_type& k)
{ {
return base.erase(k); return base.erase(k);
} }
iterator erase(const_iterator first, const_iterator last) iterator erase(iterator first, iterator last)
{ {
return iterator(base.erase(get(first), get(last))); return iterator(base.erase(get(first), get(last)));
} }
const_iterator erase(const_iterator first, const_iterator last)
{
return const_iterator(base.erase(get(first), get(last)));
}
void clear() void clear()
{ {
base.clear(); base.clear();
@ -473,32 +488,47 @@ namespace boost
return iterator(base.insert_equivalent(obj)); return iterator(base.insert_equivalent(obj));
} }
iterator insert(const_iterator hint, const value_type& obj) iterator insert(iterator hint, const value_type& obj)
{ {
return iterator(base.insert_equivalent(get(hint), obj)); return iterator(base.insert_equivalent(get(hint), obj));
} }
const_iterator insert(const_iterator hint, const value_type& obj)
{
return const_iterator(base.insert_equivalent(get(hint), obj));
}
template <class InputIterator> template <class InputIterator>
void insert(InputIterator first, InputIterator last) void insert(InputIterator first, InputIterator last)
{ {
base.insert(first, last); base.insert(first, last);
} }
iterator erase(const_iterator position) iterator erase(iterator position)
{ {
return iterator(base.erase(get(position))); return iterator(base.erase(get(position)));
} }
const_iterator erase(const_iterator position)
{
return const_iterator(base.erase(get(position)));
}
size_type erase(const key_type& k) size_type erase(const key_type& k)
{ {
return base.erase(k); return base.erase(k);
} }
iterator erase(const_iterator first, const_iterator last) iterator erase(iterator first, iterator last)
{ {
return iterator(base.erase(get(first), get(last))); return iterator(base.erase(get(first), get(last)));
} }
const_iterator erase(const_iterator first, const_iterator last)
{
return const_iterator(base.erase(get(first), get(last)));
}
void clear() void clear()
{ {
base.clear(); base.clear();

91
include/boost/unordered_set.hpp
View File

@ -5,13 +5,12 @@
// boost/unordered_set.hpp // boost/unordered_set.hpp
// Copyright <20> 2003-2004 Jeremy B. Maitin-Shepard. // Copyright <20> 2003-2004 Jeremy B. Maitin-Shepard.
// Copyright <20> 2005 Daniel James. // Copyright <20> 2005-2006 Daniel James.
// Use, modification, and distribution is subject to the Boost Software // Use, modification, and distribution is subject to the Boost Software
// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy
// at http://www.boost.org/LICENSE_1_0.txt) // at http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_UNORDERED_SET_HPP_INCLUDED #ifndef BOOST_UNORDERED_SET_HPP_INCLUDED
#define BOOST_UNORDERED_SET_HPP_INCLUDED #define BOOST_UNORDERED_SET_HPP_INCLUDED
@ -130,21 +129,11 @@ namespace boost
// iterators // iterators
iterator begin()
{
return iterator(base.begin());
}
const_iterator begin() const const_iterator begin() const
{ {
return const_iterator(base.begin()); return const_iterator(base.begin());
} }
iterator end()
{
return iterator(base.end());
}
const_iterator end() const const_iterator end() const
{ {
return const_iterator(base.end()); return const_iterator(base.end());
@ -158,9 +147,9 @@ namespace boost
base.insert_unique(obj)); base.insert_unique(obj));
} }
iterator insert(const_iterator hint, const value_type& obj) const_iterator insert(const_iterator hint, const value_type& obj)
{ {
return iterator(base.insert_unique(get(hint), obj)); return const_iterator(base.insert_unique(get(hint), obj));
} }
template <class InputIterator> template <class InputIterator>
@ -169,9 +158,9 @@ namespace boost
base.insert(first, last); base.insert(first, last);
} }
iterator erase(const_iterator position) const_iterator erase(const_iterator position)
{ {
return iterator(base.erase(get(position))); return const_iterator(base.erase(get(position)));
} }
size_type erase(const key_type& k) size_type erase(const key_type& k)
@ -179,9 +168,9 @@ namespace boost
return base.erase(k); return base.erase(k);
} }
iterator erase(const_iterator first, const_iterator last) const_iterator erase(const_iterator first, const_iterator last)
{ {
return iterator(base.erase(get(first), get(last))); return const_iterator(base.erase(get(first), get(last)));
} }
void clear() void clear()
@ -208,11 +197,6 @@ namespace boost
// lookup // lookup
iterator find(const key_type& k)
{
return iterator(base.find(k));
}
const_iterator find(const key_type& k) const const_iterator find(const key_type& k) const
{ {
return const_iterator(base.find(k)); return const_iterator(base.find(k));
@ -223,13 +207,6 @@ namespace boost
return base.count(k); 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> std::pair<const_iterator, const_iterator>
equal_range(const key_type& k) const equal_range(const key_type& k) const
{ {
@ -259,21 +236,11 @@ namespace boost
return base.bucket(k); return base.bucket(k);
} }
local_iterator begin(size_type n)
{
return local_iterator(base.begin(n));
}
const_local_iterator begin(size_type n) const const_local_iterator begin(size_type n) const
{ {
return local_iterator(base.begin(n)); return local_iterator(base.begin(n));
} }
local_iterator end(size_type n)
{
return local_iterator(base.end(n));
}
const_local_iterator end(size_type n) const const_local_iterator end(size_type n) const
{ {
return const_local_iterator(base.end(n)); return const_local_iterator(base.end(n));
@ -410,21 +377,11 @@ namespace boost
// iterators // iterators
iterator begin()
{
return iterator(base.begin());
}
const_iterator begin() const const_iterator begin() const
{ {
return const_iterator(base.begin()); return const_iterator(base.begin());
} }
iterator end()
{
return iterator(base.end());
}
const_iterator end() const const_iterator end() const
{ {
return const_iterator(base.end()); return const_iterator(base.end());
@ -437,9 +394,9 @@ namespace boost
return iterator(base.insert_equivalent(obj)); return iterator(base.insert_equivalent(obj));
} }
iterator insert(const_iterator hint, const value_type& obj) const_iterator insert(const_iterator hint, const value_type& obj)
{ {
return iterator(base.insert_equivalent(get(hint), obj)); return const_iterator(base.insert_equivalent(get(hint), obj));
} }
template <class InputIterator> template <class InputIterator>
@ -448,9 +405,9 @@ namespace boost
base.insert(first, last); base.insert(first, last);
} }
iterator erase(const_iterator position) const_iterator erase(const_iterator position)
{ {
return iterator(base.erase(get(position))); return const_iterator(base.erase(get(position)));
} }
size_type erase(const key_type& k) size_type erase(const key_type& k)
@ -458,9 +415,9 @@ namespace boost
return base.erase(k); return base.erase(k);
} }
iterator erase(const_iterator first, const_iterator last) const_iterator erase(const_iterator first, const_iterator last)
{ {
return iterator(base.erase(get(first), get(last))); return const_iterator(base.erase(get(first), get(last)));
} }
void clear() void clear()
@ -487,11 +444,6 @@ namespace boost
// lookup // lookup
iterator find(const key_type& k)
{
return iterator(base.find(k));
}
const_iterator find(const key_type& k) const const_iterator find(const key_type& k) const
{ {
return const_iterator(base.find(k)); return const_iterator(base.find(k));
@ -502,13 +454,6 @@ namespace boost
return base.count(k); 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> std::pair<const_iterator, const_iterator>
equal_range(const key_type& k) const equal_range(const key_type& k) const
{ {
@ -538,21 +483,11 @@ namespace boost
return base.bucket(k); return base.bucket(k);
} }
local_iterator begin(size_type n)
{
return local_iterator(base.begin(n));
}
const_local_iterator begin(size_type n) const const_local_iterator begin(size_type n) const
{ {
return const_local_iterator(base.begin(n)); return const_local_iterator(base.begin(n));
} }
local_iterator end(size_type n)
{
return local_iterator(base.end(n));
}
const_local_iterator end(size_type n) const const_local_iterator end(size_type n) const
{ {
return const_local_iterator(base.end(n)); return const_local_iterator(base.end(n));