From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Tue, 11 Nov 2014 14:46:07 +0000 (+0100)
Subject: rgw/rgw_gc.cc: silence cppcheck
X-Git-Tag: v0.90~25^2~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=35ab4d79e58f5b8188565181a71fc69220f4125d;p=ceph.git

rgw/rgw_gc.cc: silence cppcheck

Silence cppcheck warning about std::remove, clarify the
used remove() function from RGWGC.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/rgw/rgw_gc.cc b/src/rgw/rgw_gc.cc
index b12b634db97d..d7d5716225da 100644
--- a/src/rgw/rgw_gc.cc
+++ b/src/rgw/rgw_gc.cc
@@ -213,7 +213,7 @@ int RGWGC::process(int index, int max_secs)
         remove_tags.push_back(info.tag);
 #define MAX_REMOVE_CHUNK 16
         if (remove_tags.size() > MAX_REMOVE_CHUNK) {
-          remove(index, remove_tags);
+          RGWGC::remove(index, remove_tags);
           remove_tags.clear();
         }
       }
@@ -222,7 +222,7 @@ int RGWGC::process(int index, int max_secs)
 
 done:
   if (!remove_tags.empty())
-    remove(index, remove_tags);
+    RGWGC::remove(index, remove_tags);
   l.unlock(&store->gc_pool_ctx, obj_names[index]);
   delete ctx;
   return 0;