From 0f05e7d4be67a2b277c71562adbb70545c40b71e Mon Sep 17 00:00:00 2001
From: John Wellbelove <smartgit@wellbelove.co.uk>
Date: Fri, 30 Dec 2016 11:57:00 +0000
Subject: [PATCH] Improved erase_after

---
 src/intrusive_forward_list.h | 39 ++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/src/intrusive_forward_list.h b/src/intrusive_forward_list.h
index 43f07e05..85f67169 100644
--- a/src/intrusive_forward_list.h
+++ b/src/intrusive_forward_list.h
@@ -527,7 +527,6 @@ namespace etl
 
     //*************************************************************************
     /// Erases the value at the specified position.
-    /// Clears the link after erasing if CHECKED.
     //*************************************************************************
     iterator erase_after(iterator position)
     {
@@ -544,36 +543,32 @@ namespace etl
 
     //*************************************************************************
     /// Erases a range of elements.
-    /// Clears the links after erasing if CHECKED.
     //*************************************************************************
     iterator erase_after(iterator first, iterator last)
     {
-      link_type* p_first = first.p_value;
-      link_type* p_last = last.p_value;
-      link_type* p_next = p_first->etl_next;
-
-      // Join the ends.
-      etl::link<link_type>(p_first, p_last);
-
-      p_first = p_next;
-
-      // Erase the ones in between.
-      while (p_first != p_last)
+      if (first != last)
       {
-        // One less.
-        --current_size;
+        current_size -= std::distance(first, last) - 1;
 
-        p_next  = p_first->etl_next; // Remember the next link.
-        p_first = p_next;            // Move to the next link.
-      }
+        link_type* p_first = first.p_value;
+        link_type* p_last = last.p_value;
+        link_type* p_next = p_first->etl_next;
 
-      if (p_next == nullptr)
-      {
-        return end();
+        // Join the ends.
+        etl::link<link_type>(p_first, p_last);
+
+        if (p_next == nullptr)
+        {
+          return end();
+        }
+        else
+        {
+          return last;
+        }
       }
       else
       {
-        return iterator(*static_cast<value_type*>(p_last));
+        return last;
       }
     }