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

Cleaner emplace_impl in equivalent.

Browse Source
This commit is contained in:
Daniel James
2016-08-14 20:55:40 +01:00
parent 5490bcfe95
commit 3fe46a1769
1 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -425,8 +425,10 @@ namespace boost { namespace unordered { namespace detail {
return iterator(n); return iterator(n);
} }
iterator emplace_impl(node_tmp& a) iterator emplace_impl(node_pointer n)
{ {
node_tmp a(n, this->node_alloc());
key_type const& k = this->get_key(a.value()); key_type const& k = this->get_key(a.value());
std::size_t key_hash = this->hash(k); std::size_t key_hash = this->hash(k);
iterator position = this->find_node(key_hash, k); iterator position = this->find_node(key_hash, k);
@@ -437,8 +439,9 @@ namespace boost { namespace unordered { namespace detail {
return this->add_node(a.release(), key_hash, position); return this->add_node(a.release(), key_hash, position);
} }
void emplace_impl_no_rehash(node_tmp& a) void emplace_impl_no_rehash(node_pointer n)
{ {
node_tmp a(n, this->node_alloc());
key_type const& k = this->get_key(a.value()); key_type const& k = this->get_key(a.value());
std::size_t key_hash = this->hash(k); std::size_t key_hash = this->hash(k);
iterator position = this->find_node(key_hash, k); iterator position = this->find_node(key_hash, k);
@@ -466,12 +469,9 @@ namespace boost { namespace unordered { namespace detail {
template <BOOST_UNORDERED_EMPLACE_TEMPLATE> template <BOOST_UNORDERED_EMPLACE_TEMPLATE>
iterator emplace(BOOST_UNORDERED_EMPLACE_ARGS) iterator emplace(BOOST_UNORDERED_EMPLACE_ARGS)
{ {
node_tmp b( return iterator(emplace_impl(
boost::unordered::detail::func::construct_value_generic( boost::unordered::detail::func::construct_value_generic(
this->node_alloc(), BOOST_UNORDERED_EMPLACE_FORWARD), this->node_alloc(), BOOST_UNORDERED_EMPLACE_FORWARD)));
this->node_alloc());
return iterator(emplace_impl(b));
} }
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
@@ -487,22 +487,18 @@ namespace boost { namespace unordered { namespace detail {
std::size_t distance = std::distance(i, j); std::size_t distance = std::distance(i, j);
if(distance == 1) { if(distance == 1) {
node_tmp b( emplace_impl(
boost::unordered::detail::func::construct_value( boost::unordered::detail::func::construct_value(
this->node_alloc(), *i), this->node_alloc(), *i));
this->node_alloc());
emplace_impl(b);
} }
else { else {
// Only require basic exception safety here // Only require basic exception safety here
this->reserve_for_insert(this->size_ + distance); this->reserve_for_insert(this->size_ + distance);
for (; i != j; ++i) { for (; i != j; ++i) {
node_tmp b( emplace_impl_no_rehash(
boost::unordered::detail::func::construct_value( boost::unordered::detail::func::construct_value(
this->node_alloc(), *i), this->node_alloc(), *i));
this->node_alloc());
emplace_impl_no_rehash(b);
} }
} }
} }
@@ -512,11 +508,9 @@ namespace boost { namespace unordered { namespace detail {
boost::unordered::detail::disable_if_forward<I, void*>::type = 0) boost::unordered::detail::disable_if_forward<I, void*>::type = 0)
{ {
for (; i != j; ++i) { for (; i != j; ++i) {
node_tmp b( emplace_impl(
boost::unordered::detail::func::construct_value( boost::unordered::detail::func::construct_value(
this->node_alloc(), *i), this->node_alloc(), *i));
this->node_alloc());
emplace_impl(b);
} }
} }