From 6029d1cfd05c990c690ab296b56bd232d0c74e4c Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sun, 14 Aug 2016 20:55:40 +0100
Subject: [PATCH] Trim down node_tmp code.

---
 include/boost/unordered/detail/allocate.hpp   | 16 ++--------------
 include/boost/unordered/detail/equivalent.hpp |  8 ++------
 include/boost/unordered/detail/unique.hpp     | 10 ++--------
 3 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/include/boost/unordered/detail/allocate.hpp b/include/boost/unordered/detail/allocate.hpp
index 710a7a5f..da9da16a 100644
--- a/include/boost/unordered/detail/allocate.hpp
+++ b/include/boost/unordered/detail/allocate.hpp
@@ -1145,21 +1145,14 @@ namespace boost { namespace unordered { namespace detail {
     template <typename NodeAlloc>
     struct node_tmp
     {
-    private:
-
-        typedef NodeAlloc node_allocator;
         typedef boost::unordered::detail::allocator_traits<NodeAlloc>
             node_allocator_traits;
-        typedef typename node_allocator_traits::value_type node;
         typedef typename node_allocator_traits::pointer node_pointer;
-        typedef typename node::value_type value_type;
 
-    public:
-
-        node_allocator& alloc_;
+        NodeAlloc& alloc_;
         node_pointer node_;
 
-        explicit node_tmp(node_pointer n, node_allocator& a):
+        explicit node_tmp(node_pointer n, NodeAlloc& a):
             alloc_(a),
             node_(n)
         {
@@ -1167,11 +1160,6 @@ namespace boost { namespace unordered { namespace detail {
 
         ~node_tmp();
 
-        value_type const& value() const {
-            BOOST_ASSERT(node_ );
-            return node_->value();
-        }
-
         // no throw
         node_pointer release()
         {
diff --git a/include/boost/unordered/detail/equivalent.hpp b/include/boost/unordered/detail/equivalent.hpp
index 2099ed9b..7e7c757c 100644
--- a/include/boost/unordered/detail/equivalent.hpp
+++ b/include/boost/unordered/detail/equivalent.hpp
@@ -428,13 +428,9 @@ namespace boost { namespace unordered { namespace detail {
         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.node_->value());
             std::size_t key_hash = this->hash(k);
             iterator position = this->find_node(key_hash, k);
-
-            // reserve has basic exception safety if the hash function
-            // throws, strong otherwise.
             this->reserve_for_insert(this->size_ + 1);
             return this->add_node(a.release(), key_hash, position);
         }
@@ -442,7 +438,7 @@ namespace boost { namespace unordered { namespace detail {
         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.node_->value());
             std::size_t key_hash = this->hash(k);
             iterator position = this->find_node(key_hash, k);
             this->add_node(a.release(), key_hash, position);
diff --git a/include/boost/unordered/detail/unique.hpp b/include/boost/unordered/detail/unique.hpp
index 73852793..aabee950 100644
--- a/include/boost/unordered/detail/unique.hpp
+++ b/include/boost/unordered/detail/unique.hpp
@@ -421,14 +421,10 @@ namespace boost { namespace unordered { namespace detail {
                 boost::unordered::detail::func::construct_value_generic(
                     this->node_alloc(), BOOST_UNORDERED_EMPLACE_FORWARD),
                 this->node_alloc());
-            key_type const& k = this->get_key(b.value());
+            key_type const& k = this->get_key(b.node_->value());
             std::size_t key_hash = this->hash(k);
             iterator pos = this->find_node(key_hash, k);
-
             if (pos.node_) { return emplace_return(pos, false); }
-
-            // reserve has basic exception safety if the hash function
-            // throws, strong otherwise.
             this->reserve_for_insert(this->size_ + 1);
             return emplace_return(this->add_node(b.release(), key_hash), true);
         }
@@ -478,8 +474,6 @@ namespace boost { namespace unordered { namespace detail {
                 if(this->size_ + 1 > this->max_load_)
                     this->reserve_for_insert(this->size_ +
                         boost::unordered::detail::insert_size(i, j));
-    
-                // Nothing after this point can throw.
                 this->add_node(b.release(), key_hash);
             }
         }
@@ -495,7 +489,7 @@ namespace boost { namespace unordered { namespace detail {
                     a.alloc_, a.node_->value_ptr(), *i);
                 node_tmp b(a.release(), a.alloc_);
 
-                key_type const& k = this->get_key(b.value());
+                key_type const& k = this->get_key(b.node_->value());
                 std::size_t key_hash = this->hash(k);
                 iterator pos = this->find_node(key_hash, k);