[base] Unified stl_add and stl_helpers.

4 files changed, 11 insertions, 11 deletions

diff --git a/coding/coding_tests/varint_test.cpp b/coding/coding_tests/varint_test.cpp
index 102f5694f1..fca5cc0fd3 100644
--- a/coding/coding_tests/varint_test.cpp
+++ b/coding/coding_tests/varint_test.cpp
@@ -4,7 +4,7 @@
 #include "coding/byte_stream.hpp"
 
 #include "base/macros.hpp"
-#include "base/stl_add.hpp"
+#include "base/stl_helpers.hpp"
 
 #include <vector>
 
@@ -111,10 +111,10 @@ UNIT_TEST(VarIntMax)
 UNIT_TEST(ReadVarInt64Array_EmptyArray)
 {
   vector<int64_t> result;
-  void const * pEnd = ReadVarInt64Array(NULL, (void *)0, MakeBackInsertFunctor(result));
+  void const * pEnd = ReadVarInt64Array(NULL, (void *)0, base::MakeBackInsertFunctor(result));
   TEST_EQUAL(result, vector<int64_t>(), ("UntilBufferEnd"));
   TEST_EQUAL(reinterpret_cast<uintptr_t>(pEnd), 0, ("UntilBufferEnd"));
-  pEnd = ReadVarInt64Array(NULL, (size_t)0, MakeBackInsertFunctor(result));
+  pEnd = ReadVarInt64Array(NULL, (size_t)0, base::MakeBackInsertFunctor(result));
   TEST_EQUAL(result, vector<int64_t>(), ("GivenSize"));
   TEST_EQUAL(reinterpret_cast<uintptr_t>(pEnd), 0, ("GivenSize"));
 }
@@ -165,7 +165,7 @@ UNIT_TEST(ReadVarInt64Array)
 
       vector<int64_t> result;
       void const * pEnd = ReadVarInt64Array(pDataStart, pDataEnd,
-                                            MakeBackInsertFunctor(result));
+                                            base::MakeBackInsertFunctor(result));
 
       TEST_EQUAL(pEnd, pDataEnd, ("UntilBufferEnd", data.size()));
       TEST_EQUAL(result, testValues, ("UntilBufferEnd", data.size()));
@@ -173,7 +173,7 @@ UNIT_TEST(ReadVarInt64Array)
     {
       vector<int64_t> result;
       void const * pEnd = ReadVarInt64Array(&data[0], testValues.size(),
-                                            MakeBackInsertFunctor(result));
+                                            base::MakeBackInsertFunctor(result));
 
       TEST_EQUAL(pEnd, &data[0] + data.size(), ("GivenSize", data.size()));
       TEST_EQUAL(result, testValues, ("GivenSize", data.size()));
diff --git a/coding/geometry_coding.cpp b/coding/geometry_coding.cpp
index a3c84d8fd8..90ba013f2b 100644
--- a/coding/geometry_coding.cpp
+++ b/coding/geometry_coding.cpp
@@ -375,7 +375,7 @@ void const * LoadInner(DecodeFunT fn, void const * pBeg, size_t count,
   DeltasT deltas;
   deltas.reserve(count);
   void const * ret =
-      ReadVarUint64Array(static_cast<char const *>(pBeg), count, MakeBackInsertFunctor(deltas));
+      ReadVarUint64Array(static_cast<char const *>(pBeg), count, base::MakeBackInsertFunctor(deltas));
 
   Decode(fn, deltas, params, points);
   return ret;
diff --git a/coding/geometry_coding.hpp b/coding/geometry_coding.hpp
index d54e37ffe8..26b8db04e4 100644
--- a/coding/geometry_coding.hpp
+++ b/coding/geometry_coding.hpp
@@ -12,7 +12,7 @@
 #include "base/base.hpp"
 #include "base/bits.hpp"
 #include "base/buffer_vector.hpp"
-#include "base/stl_add.hpp"
+#include "base/stl_helpers.hpp"
 
 #include <algorithm>
 #include <cstddef>
@@ -251,7 +251,7 @@ void LoadOuter(DecodeFunT fn, TSource & src, GeometryCodingParams const & params
 
   DeltasT deltas;
   deltas.reserve(count / 2);
-  ReadVarUint64Array(p, p + count, MakeBackInsertFunctor(deltas));
+  ReadVarUint64Array(p, p + count, base::MakeBackInsertFunctor(deltas));
 
   Decode(fn, deltas, params, points, reserveF);
 }
diff --git a/coding/varint.hpp b/coding/varint.hpp
index 8754c567ce..b5de27a01a 100644
--- a/coding/varint.hpp
+++ b/coding/varint.hpp
@@ -6,7 +6,7 @@
 #include "base/base.hpp"
 #include "base/bits.hpp"
 #include "base/exception.hpp"
-#include "base/stl_add.hpp"
+#include "base/stl_helpers.hpp"
 
 #include <cstddef>
 #include <type_traits>
@@ -257,7 +257,7 @@ void const * ReadVarInt64Array(void const * pBeg, void const * pEnd, F f)
 template <typename F> inline
 void const * ReadVarUint64Array(void const * pBeg, void const * pEnd, F f)
 {
-  return impl::ReadVarInt64Array(pBeg, impl::ReadVarInt64ArrayUntilBufferEnd(pEnd), f, IdFunctor());
+  return impl::ReadVarInt64Array(pBeg, impl::ReadVarInt64ArrayUntilBufferEnd(pEnd), f, base::IdFunctor());
 }
 
 template <typename F> inline
@@ -270,7 +270,7 @@ void const * ReadVarInt64Array(void const * pBeg, size_t count, F f)
 template <typename F> inline
 void const * ReadVarUint64Array(void const * pBeg, size_t count, F f)
 {
-  return impl::ReadVarInt64Array(pBeg, impl::ReadVarInt64ArrayGivenSize(count), f, IdFunctor());
+  return impl::ReadVarInt64Array(pBeg, impl::ReadVarInt64ArrayGivenSize(count), f, base::IdFunctor());
 }
 
 template <class Cont, class Sink>