From b4bdf2d98239bc82331115d13140cc7d0f59da50 Mon Sep 17 00:00:00 2001
From: vng <viktor.govako@gmail.com>
Date: Wed, 23 Mar 2016 18:08:38 +0300
Subject: [PATCH] Added EraseIf helper.

---
 base/stl_helpers.hpp   |  8 +++++++-
 search/v2/geocoder.cpp | 10 +++++-----
 storage/storage.cpp    |  5 -----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/base/stl_helpers.hpp b/base/stl_helpers.hpp
index f4f3ca3b97..3375867f75 100644
--- a/base/stl_helpers.hpp
+++ b/base/stl_helpers.hpp
@@ -45,12 +45,18 @@ struct Comparer<false, T, C>
 
 // Sorts and removes duplicate entries from |v|.
 template <typename T>
-void SortUnique(std::vector<T> & v)
+void SortUnique(vector<T> & v)
 {
   sort(v.begin(), v.end());
   v.erase(unique(v.begin(), v.end()), v.end());
 }
 
+template <typename T, class TFn>
+void EraseIf(vector<T> & v, TFn && fn)
+{
+  v.erase(remove_if(v.begin(), v.end(), forward<TFn>(fn)), v.end());
+}
+
 // Creates a comparer being able to compare two instances of class C
 // (given by reference or pointer) by a field or const method of C.
 // For example, to create comparer that is able to compare pairs of
diff --git a/search/v2/geocoder.cpp b/search/v2/geocoder.cpp
index 30c434c0ed..a63bef7f04 100644
--- a/search/v2/geocoder.cpp
+++ b/search/v2/geocoder.cpp
@@ -416,10 +416,10 @@ void Geocoder::SetParams(Params const & params)
   if (m_params.m_tokens.size() > 1)
   {
     for (auto & v : m_params.m_tokens)
-      v.erase(remove_if(v.begin(), v.end(), &IsStopWord), v.end());
+      my::EraseIf(v, &IsStopWord);
 
     auto & v = m_params.m_tokens;
-    v.erase(remove_if(v.begin(), v.end(), mem_fn(&Params::TSynonymsVector::empty)), v.end());
+    my::EraseIf(v, mem_fn(&Params::TSynonymsVector::empty));
 
     // If all tokens are stop words - give up.
     if (m_params.m_tokens.empty())
@@ -488,10 +488,10 @@ void Geocoder::GoInViewport(TResultList & results)
   vector<shared_ptr<MwmInfo>> infos;
   m_index.GetMwmsInfo(infos);
 
-  infos.erase(remove_if(infos.begin(), infos.end(), [this](shared_ptr<MwmInfo> const & info)
+  my::EraseIf(infos, [this](shared_ptr<MwmInfo> const & info)
   {
     return !m_params.m_pivot.IsIntersect(info->m_limitRect);
-  }), infos.end());
+  });
 
   GoImpl(infos, true /* inViewport */);
 }
@@ -1129,7 +1129,7 @@ void Geocoder::MatchPOIsAndBuildings(size_t curToken)
         return !features->GetBit(featureId);
       };
       for (auto & cluster : clusters)
-        cluster.erase(remove_if(cluster.begin(), cluster.end(), noFeature), cluster.end());
+        my::EraseIf(cluster, noFeature);
     }
 
     for (size_t i = 0; i < ARRAY_SIZE(clusters); ++i)
diff --git a/storage/storage.cpp b/storage/storage.cpp
index 1dbf7aff93..72c4a724f2 100644
--- a/storage/storage.cpp
+++ b/storage/storage.cpp
@@ -33,11 +33,6 @@ namespace storage
 {
 namespace
 {
-template <typename T>
-void RemoveIf(vector<T> & v, function<bool(T const & t)> const & p)
-{
-  v.erase(remove_if(v.begin(), v.end(), p), v.end());
-}
 
 uint64_t GetLocalSize(shared_ptr<LocalCountryFile> file, MapOptions opt)
 {