From 233cfe404544e0f09bf69df66717d59e8ad9ee5d Mon Sep 17 00:00:00 2001
From: Volker Birk <vb@pep.foundation>
Date: Mon, 22 Oct 2018 23:39:30 +0200
Subject: [PATCH] safely delete while iterating

---
 pc_container.hh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pc_container.hh b/pc_container.hh
index 115c4a5..2743d90 100644
--- a/pc_container.hh
+++ b/pc_container.hh
@@ -53,9 +53,9 @@ public:
     }
     
     // Beware: does not delete *pdata nor *cdata! That's producer's and consumer's task!
-    void erase(typename Container::const_iterator pos)
+    typename Container::iterator erase(typename Container::const_iterator pos)
     {
-        c.erase(pos);
+        return c.erase(pos);
     }
     
     // removes all elements with pdata==null && cdata==null
@@ -67,11 +67,10 @@ public:
     // clear the container. Delete all *pdata via custom deleter functor.
     void clear(std::function<void(Pdata*)> deleter = [](Pdata *e) { delete e; })
     {
-        for(auto q=begin(); q!=end(); ++q)
+        for(auto q=begin(); q!=end(); q=erase(q))
         {
             deleter(q->pdata);
             q->pdata = nullptr;
-            erase(q);
         }
     }