From 9b7b485c33eb1411c3845ec11629a22a93c61e69 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sat, 22 Oct 2016 10:04:36 +0100
Subject: [PATCH] Use node_pointer in equality.

---
 include/boost/unordered/detail/equivalent.hpp | 47 +++++++++----------
 include/boost/unordered/detail/unique.hpp     |  4 +-
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/include/boost/unordered/detail/equivalent.hpp b/include/boost/unordered/detail/equivalent.hpp
index 4a482734..5a71181e 100644
--- a/include/boost/unordered/detail/equivalent.hpp
+++ b/include/boost/unordered/detail/equivalent.hpp
@@ -257,7 +257,7 @@ namespace boost { namespace unordered { namespace detail {
         {
             if(this->size_ != other.size_) return false;
     
-            for(iterator n1(this->begin()); n1.node_;)
+            for(node_pointer n1 = this->begin(); n1;)
             {
                 node_pointer n2 = other.find_node(other.get_key(n1->value()));
                 if (!n2) return false;
@@ -270,24 +270,24 @@ namespace boost { namespace unordered { namespace detail {
             return true;
         }
 
-        static bool group_equals(iterator n1, iterator end1,
-                iterator n2, iterator end2)
+        static bool group_equals(node_pointer n1, node_pointer end1,
+                node_pointer n2, node_pointer end2)
         {
             for(;;)
             {
-                if (*n1 != *n2) break;
+                if (n1->value() != n2->value()) break;
 
-                ++n1;
-                ++n2;
+                n1 = next_node(n1);
+                n2 = next_node(n2);
             
                 if (n1 == end1) return n2 == end2;
                 if (n2 == end2) return false;
             }
             
-            for(iterator n1a = n1, n2a = n2;;)
+            for(node_pointer n1a = n1, n2a = n2;;)
             {
-                ++n1a;
-                ++n2a;
+                n1a = next_node(n1a);
+                n2a = next_node(n2a);
 
                 if (n1a == end1)
                 {
@@ -298,35 +298,34 @@ namespace boost { namespace unordered { namespace detail {
                 if (n2a == end2) return false;
             }
 
-            iterator start = n1;
-            for(;n1 != end1; ++n1)
+            node_pointer start = n1;
+            for(;n1 != end1; n1 = next_node(n1))
             {
-                value_type const& v = *n1;
-                if (find(start, n1, v)) continue;
-                std::size_t matches = count_equal(n2, end2, v);
-                if (!matches) return false;
-                iterator next = n1;
-                ++next;
-                if (matches != 1 + count_equal(next, end1, v)) return false;
+                value_type const& v = n1->value();
+                if (!find(start, n1, v)) {
+                    std::size_t matches = count_equal(n2, end2, v);
+                    if (!matches) return false;
+                    if (matches != 1 + count_equal(next_node(n1), end1, v)) return false;
+                }
             }
             
             return true;
         }
 
-        static bool find(iterator n, iterator end, value_type const& v)
+        static bool find(node_pointer n, node_pointer end, value_type const& v)
         {
-            for(;n != end; ++n)
-                if (*n == v)
+            for(;n != end; n = next_node(n))
+                if (n->value() == v)
                     return true;
             return false;
         }
 
-        static std::size_t count_equal(iterator n, iterator end,
+        static std::size_t count_equal(node_pointer n, node_pointer end,
             value_type const& v)
         {
             std::size_t count = 0;
-            for(;n != end; ++n)
-                if (*n == v) ++count;
+            for(;n != end; n = next_node(n))
+                if (n->value() == v) ++count;
             return count;
         }
 
diff --git a/include/boost/unordered/detail/unique.hpp b/include/boost/unordered/detail/unique.hpp
index 0e5771e2..c736456b 100644
--- a/include/boost/unordered/detail/unique.hpp
+++ b/include/boost/unordered/detail/unique.hpp
@@ -252,11 +252,11 @@ namespace boost { namespace unordered { namespace detail {
         {
             if(this->size_ != other.size_) return false;
     
-            for(iterator n1(this->begin()); n1.node_; ++n1)
+            for(node_pointer n1 = this->begin(); n1; n1 = next_node(n1))
             {
                 node_pointer n2 = other.find_node(other.get_key(n1->value()));
 
-                if (!n2 || *n1 != n2->value())
+                if (!n2 || n1->value() != n2->value())
                     return false;
             }