boostorg/unordered
1
0
Fork 1
mirror of https://github.com/boostorg/unordered.git synced 2025-08-01 04:14:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Unordered: Return iterators in pairs instead of node_pointers.

Browse Source 
It looks like the current version doesn't work with a correct
implementation of C++11 pairs since they don't use explicit conversions.
So just return the correct type in the first place.

Should probably be using iterators in other places as well. I was using
node_pointers everywhere due to some legacy from older versions.

[SVN r75158]
This commit is contained in:
Daniel James
2011-10-28 17:42:51 +00:00
parent 6ebc2e72ff
commit a5dcc9dab0
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/boost/unordered/detail/equivalent.hpp
View File

@@ -178,6 +178,7 @@ namespace boost { namespace unordered { namespace detail {
typedef typename table::key_type key_type; typedef typename table::key_type key_type;
typedef typename table::node_constructor node_constructor; typedef typename table::node_constructor node_constructor;
typedef typename table::extractor extractor; typedef typename table::extractor extractor;
typedef typename table::iterator iterator;
// Constructors // Constructors
@@ -255,13 +256,15 @@ namespace boost { namespace unordered { namespace detail {
return count; return count;
} }
std::pair<node_pointer, node_pointer> std::pair<iterator, iterator>
equal_range(key_type const& k) const equal_range(key_type const& k) const
{ {
node_pointer n = this->find_node(k); node_pointer n = this->find_node(k);
return std::make_pair(n, return std::make_pair(
n ? static_cast<node_pointer>( iterator(n), iterator(n ?
static_cast<node_pointer>(n->group_prev_)->next_) : n); static_cast<node_pointer>(
static_cast<node_pointer>(n->group_prev_)->next_) :
n));
} }
// Equality // Equality

19
include/boost/unordered/detail/unique.hpp
View File

@@ -174,8 +174,9 @@ namespace boost { namespace unordered { namespace detail {
typedef typename table::key_type key_type; typedef typename table::key_type key_type;
typedef typename table::node_constructor node_constructor; typedef typename table::node_constructor node_constructor;
typedef typename table::extractor extractor; typedef typename table::extractor extractor;
typedef typename table::iterator iterator;
typedef std::pair<node_pointer, bool> emplace_return; typedef std::pair<iterator, bool> emplace_return;
// Constructors // Constructors
@@ -253,12 +254,12 @@ namespace boost { namespace unordered { namespace detail {
std::out_of_range("Unable to find key in unordered_map.")); std::out_of_range("Unable to find key in unordered_map."));
} }
std::pair<node_pointer, node_pointer> std::pair<iterator, iterator>
equal_range(key_type const& k) const equal_range(key_type const& k) const
{ {
node_pointer n = this->find_node(k); node_pointer n = this->find_node(k);
return std::make_pair(n, return std::make_pair(iterator(n),
n ? static_cast<node_pointer>(n->next_) : n); iterator(n ? static_cast<node_pointer>(n->next_) : n));
} }
// equals // equals
@@ -354,7 +355,7 @@ namespace boost { namespace unordered { namespace detail {
boost::unordered::detail::please_ignore_this_overload> const&) boost::unordered::detail::please_ignore_this_overload> const&)
{ {
BOOST_ASSERT(false); BOOST_ASSERT(false);
return emplace_return(this->begin(), false); return emplace_return(iterator(this->begin()), false);
} }
#endif #endif
@@ -389,7 +390,7 @@ namespace boost { namespace unordered { namespace detail {
std::size_t hash = this->hash_function()(k); std::size_t hash = this->hash_function()(k);
node_pointer pos = this->find_node(hash, k); node_pointer pos = this->find_node(hash, k);
if (pos) return emplace_return(pos, false); if (pos) return emplace_return(iterator(pos), false);
// Create the node before rehashing in case it throws an // Create the node before rehashing in case it throws an
// exception (need strong safety in such a case). // exception (need strong safety in such a case).
@@ -400,7 +401,7 @@ namespace boost { namespace unordered { namespace detail {
// reserve has basic exception safety if the hash function // reserve has basic exception safety if the hash function
// throws, strong otherwise. // throws, strong otherwise.
this->reserve_for_insert(this->size_ + 1); this->reserve_for_insert(this->size_ + 1);
return emplace_return(this->add_node(a, hash), true); return emplace_return(iterator(this->add_node(a, hash)), true);
} }
emplace_return emplace_impl_with_node(node_constructor& a) emplace_return emplace_impl_with_node(node_constructor& a)
@@ -409,12 +410,12 @@ namespace boost { namespace unordered { namespace detail {
std::size_t hash = this->hash_function()(k); std::size_t hash = this->hash_function()(k);
node_pointer pos = this->find_node(hash, k); node_pointer pos = this->find_node(hash, k);
if (pos) return emplace_return(pos, false); if (pos) return emplace_return(iterator(pos), false);
// reserve has basic exception safety if the hash function // reserve has basic exception safety if the hash function
// throws, strong otherwise. // throws, strong otherwise.
this->reserve_for_insert(this->size_ + 1); this->reserve_for_insert(this->size_ + 1);
return emplace_return(this->add_node(a, hash), true); return emplace_return(iterator(this->add_node(a, hash)), true);
} }
template <BOOST_UNORDERED_EMPLACE_TEMPLATE> template <BOOST_UNORDERED_EMPLACE_TEMPLATE>