From 36db898d01e213c9936f77f0853f5facb150f299 Mon Sep 17 00:00:00 2001
From: Andrew Gaul <andrew@gaul.org>
Date: Thu, 27 Jul 2023 23:34:43 +0900
Subject: [PATCH] Use C++11 std::map::erase return value (#2236)

---
 src/cache.cpp          | 4 ++--
 src/fdcache.cpp        | 6 +++---
 src/fdcache_entity.cpp | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/cache.cpp b/src/cache.cpp
index f01b0a2..1f6365a 100644
--- a/src/cache.cpp
+++ b/src/cache.cpp
@@ -546,7 +546,7 @@ bool StatCache::TruncateCache()
             stat_cache_entry* entry = iter->second;
             if(!entry || (0L == entry->notruncate && IsExpireStatCacheTime(entry->cache_date, ExpireTime))){
                 delete entry;
-                stat_cache.erase(iter++);
+                iter = stat_cache.erase(iter);
             }else{
                 ++iter;
             }
@@ -718,7 +718,7 @@ bool StatCache::TruncateSymlink()
             symlink_cache_entry* entry = iter->second;
             if(!entry || IsExpireStatCacheTime(entry->cache_date, ExpireTime)){  // use the same as Stats
                 delete entry;
-                symlink_cache.erase(iter++);
+                iter = symlink_cache.erase(iter);
             }else{
                 ++iter;
             }
diff --git a/src/fdcache.cpp b/src/fdcache.cpp
index dbe9b6e..8b79abc 100644
--- a/src/fdcache.cpp
+++ b/src/fdcache.cpp
@@ -730,12 +730,12 @@ bool FdManager::Close(FdEntity* ent, int fd)
             ent->Close(fd);
             if(!ent->IsOpen()){
                 // remove found entity from map.
-                fent.erase(iter++);
+                iter = fent.erase(iter);
 
                 // check another key name for entity value to be on the safe side
                 for(; iter != fent.end(); ){
                     if(iter->second == ent){
-                        fent.erase(iter++);
+                        iter = fent.erase(iter);
                     }else{
                         ++iter;
                     }
@@ -754,7 +754,7 @@ bool FdManager::ChangeEntityToTempPath(FdEntity* ent, const char* path)
 
     for(fdent_map_t::iterator iter = fent.begin(); iter != fent.end(); ){
         if(iter->second == ent){
-            fent.erase(iter++);
+            iter = fent.erase(iter);
 
             std::string tmppath;
             FdManager::MakeRandomTempPath(path, tmppath);
diff --git a/src/fdcache_entity.cpp b/src/fdcache_entity.cpp
index cca578f..46eec63 100644
--- a/src/fdcache_entity.cpp
+++ b/src/fdcache_entity.cpp
@@ -2378,7 +2378,7 @@ bool FdEntity::MergeOrgMeta(headers_t& updatemeta)
     // this is special cases, we remove the key which has empty values.
     for(headers_t::iterator hiter = orgmeta.begin(); hiter != orgmeta.end(); ){
         if(hiter->second.empty()){
-            orgmeta.erase(hiter++);
+            hiter = orgmeta.erase(hiter);
         }else{
             ++hiter;
         }