[base] Unified stl_add and stl_helpers.

5 files changed, 11 insertions, 11 deletions

diff --git a/map/cloud.cpp b/map/cloud.cpp
index f84e593688..8dda4fe597 100644
--- a/map/cloud.cpp
+++ b/map/cloud.cpp
@@ -503,7 +503,7 @@ void Cloud::UpdateIndex(bool indexExists)
       MarkModifiedImpl(path.second, true /* isOutdated */);
 
     // Erase disappeared files from index.
-    my::EraseIf(m_index.m_entries, [this](EntryPtr const & entity) {
+    base::EraseIf(m_index.m_entries, [this](EntryPtr const & entity) {
       return m_files.find(entity->m_name) == m_files.end();
     });
 
diff --git a/map/framework.cpp b/map/framework.cpp
index 7bc661b28d..f91091f029 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -1505,7 +1505,7 @@ search::DisplayedCategories const & Framework::GetDisplayedCategories()
   {
     // Add Category modifiers here.
     //std::tuple<Modifier> modifiers(city);
-    //my::for_each_in_tuple(modifiers, [&](size_t, SponsoredCategoryModifier & modifier)
+    //base::for_each_in_tuple(modifiers, [&](size_t, SponsoredCategoryModifier & modifier)
     //{
     //  m_displayedCategories->Modify(modifier);
     //});
diff --git a/map/style_tests/classificator_tests.cpp b/map/style_tests/classificator_tests.cpp
index 3552e95881..c0a875768a 100644
--- a/map/style_tests/classificator_tests.cpp
+++ b/map/style_tests/classificator_tests.cpp
@@ -9,7 +9,7 @@
 #include "platform/platform.hpp"
 
 #include "base/logging.hpp"
-#include "base/stl_add.hpp"
+#include "base/stl_helpers.hpp"
 
 using namespace std;
 
@@ -101,7 +101,7 @@ void ForEachObject(Classificator const & c, string const & name,
                    EGeomType geomType, int rules)
 {
   vector<string> path;
-  strings::Tokenize(name, "-", MakeBackInsertFunctor(path));
+  strings::Tokenize(name, "-", base::MakeBackInsertFunctor(path));
   ForEachObject(c, path, geomType, rules);
 }
 
@@ -170,7 +170,7 @@ pair<int, int> GetMinMax(int level, vector<uint32_t> const & types, drule::rule_
   return res;
 }
 
-string CombineArrT(my::StringIL const & arrT)
+string CombineArrT(base::StringIL const & arrT)
 {
   string result;
   for (auto it = arrT.begin(); it != arrT.end(); ++it)
@@ -182,7 +182,7 @@ string CombineArrT(my::StringIL const & arrT)
   return result;
 }
 
-void CheckPriority(vector<my::StringIL> const & arrT, vector<size_t> const & arrI, drule::rule_type_t ruleType)
+void CheckPriority(vector<base::StringIL> const & arrT, vector<size_t> const & arrI, drule::rule_type_t ruleType)
 {
   UnitTestInitPlatform();
   Classificator const & c = classif();
@@ -240,7 +240,7 @@ void CheckPriority(vector<my::StringIL> const & arrT, vector<size_t> const & arr
 
 UNIT_TEST(Classificator_AreaPriority)
 {
-  vector<my::StringIL> types =
+  vector<base::StringIL> types =
   {
     // 0
     {"natural", "coastline"},
@@ -261,7 +261,7 @@ UNIT_TEST(Classificator_AreaPriority)
 UNIT_TEST(Classificator_PoiPriority)
 {
   {
-    vector<my::StringIL> types =
+    vector<base::StringIL> types =
     {
       // 1
       {"amenity", "atm"},
@@ -273,7 +273,7 @@ UNIT_TEST(Classificator_PoiPriority)
   }
 
   {
-    vector<my::StringIL> types =
+    vector<base::StringIL> types =
     {
       // 1
       {"amenity", "bench"}, {"amenity", "shelter"},
diff --git a/map/user.cpp b/map/user.cpp
index 2ecd56ac03..6465e044ba 100644
--- a/map/user.cpp
+++ b/map/user.cpp
@@ -408,7 +408,7 @@ void User::NotifySubscribersImpl()
 
 void User::ClearSubscribersImpl()
 {
-  my::EraseIf(m_subscribers, [](auto const & s) { return s == nullptr; });
+  base::EraseIf(m_subscribers, [](auto const & s) { return s == nullptr; });
 }
 
 void User::RequestUserDetails()
diff --git a/map/user_mark_layer.cpp b/map/user_mark_layer.cpp
index 0a8255cda2..9e1256489f 100644
--- a/map/user_mark_layer.cpp
+++ b/map/user_mark_layer.cpp
@@ -6,7 +6,7 @@
 
 #include "base/macros.hpp"
 #include "base/scope_guard.hpp"
-#include "base/stl_add.hpp"
+#include "base/stl_helpers.hpp"
 
 #include <algorithm>
 #include <utility>