Fix #709 in intrusive_list operator-> (#721)

ETLCPP · Jul 1, 2023 · 7f990d7 · 7f990d7
1 parent 96092d8
commit 7f990d7
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 1 deletion.
diff --git a/include/etl/intrusive_list.h b/include/etl/intrusive_list.h
@@ -440,7 +440,7 @@ namespace etl
 
       pointer operator ->() const
       {
-        return *static_cast<pointer>(p_value);
+        return static_cast<pointer>(p_value);
       }
 
       friend bool operator == (const iterator& lhs, const iterator& rhs)

diff --git a/test/test_intrusive_forward_list.cpp b/test/test_intrusive_forward_list.cpp
@@ -209,6 +209,21 @@ namespace
       CHECK(are_equal);
     }
 
+    //*************************************************************************
+    TEST_FIXTURE(SetupFixture, test_iterator_arrow_operator)
+    {
+      ItemNDCNode item1("1");
+      ItemNDCNode item2("2");
+      DataNDC0 data;
+      data.push_front(item2);
+      data.push_front(item1);
+
+      auto iter = data.begin();
+      CHECK(*(iter.operator->()) == item1);
+      ++iter;
+      CHECK(*(iter.operator->()) == item2);
+    }
+
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_const_iterator)
     {
@@ -219,6 +234,21 @@ namespace
       CHECK(are_equal);
     }
 
+    //*************************************************************************
+    TEST_FIXTURE(SetupFixture, test_const_iterator_arrow_operator)
+    {
+      ItemNDCNode item1("1");
+      ItemNDCNode item2("2");
+      DataNDC0 data;
+      data.push_front(item2);
+      data.push_front(item1);
+
+      auto iter = data.cbegin();
+      CHECK(*(iter.operator->()) == item1);
+      ++iter;
+      CHECK(*(iter.operator->()) == item2);
+    }
+
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_clear)
     {

diff --git a/test/test_intrusive_list.cpp b/test/test_intrusive_list.cpp
@@ -222,6 +222,21 @@ namespace
       CHECK(are_equal);
     }
 
+    //*************************************************************************
+    TEST_FIXTURE(SetupFixture, test_iterator_arrow_operator)
+    {
+      ItemNDCNode item1("1");
+      ItemNDCNode item2("2");
+      DataNDC0 data;
+      data.push_back(item1);
+      data.push_back(item2);
+
+      auto iter = data.begin();
+      CHECK(*(iter.operator->()) == item1);
+      ++iter;
+      CHECK(*(iter.operator->()) == item2);
+    }
+
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_const_iterator)
     {
@@ -234,6 +249,21 @@ namespace
       CHECK(are_equal);
     }
 
+    //*************************************************************************
+    TEST_FIXTURE(SetupFixture, test_const_iterator_arrow_operator)
+    {
+      ItemNDCNode item1("1");
+      ItemNDCNode item2("2");
+      DataNDC0 data;
+      data.push_back(item1);
+      data.push_back(item2);
+
+      auto iter = data.cbegin();
+      CHECK(*(iter.operator->()) == item1);
+      ++iter;
+      CHECK(*(iter.operator->()) == item2);
+    }
+
     //*************************************************************************
     TEST_FIXTURE(SetupFixture, test_clear)
     {