Merge pull request #3978 from stweil/sanfix

Modernize function ObjectCache::DeleteUnusedObjects (fix issue with s…
tesseract-ocr · Dec 12, 2022 · 0680ba8 · 0680ba8
2 parents b37de16 + 8c34b0d
commit 0680ba8
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/ccutil/object_cache.h b/src/ccutil/object_cache.h
@@ -96,12 +96,16 @@ class ObjectCache {
 
   void DeleteUnusedObjects() {
     std::lock_guard<std::mutex> guard(mu_);
-    for (auto it = cache_.rbegin(); it != cache_.rend(); ++it) {
-      if (it->count <= 0) {
-        delete it->object;
-        cache_.erase(std::next(it).base());
-      }
-    }
+    cache_.erase(std::remove_if(cache_.begin(), cache_.end(),
+                                [](const ReferenceCount &it) {
+                                  if (it.count <= 0) {
+                                    delete it.object;
+                                    return true;
+                                  } else {
+                                    return false;
+                                  }
+                                }),
+                 cache_.end());
   }
 
 private: