Read sample as a file of object ids.

3 files changed, 5 insertions, 7 deletions

diff --git a/base/base_tests/string_utils_test.cpp b/base/base_tests/string_utils_test.cpp
index 304d6b2ce8..7612468777 100644
--- a/base/base_tests/string_utils_test.cpp
+++ b/base/base_tests/string_utils_test.cpp
@@ -456,8 +456,8 @@ UNIT_TEST(Tokenize)
 {
   {
     initializer_list<string> expected{"acb", "def", "ghi"};
-    TEST_EQUAL(strings::Tokenize<vector>("acb def ghi", " "), vector<string>(expected), ());
-    TEST_EQUAL(strings::Tokenize<set>("acb def ghi", " "), set<string>(expected), ());
+    TEST_EQUAL(strings::Tokenize<vector>("acb def ghi", " " /* delims */), vector<string>(expected), ());
+    TEST_EQUAL(strings::Tokenize<set>("acb def ghi", " " /* delims */), set<string>(expected), ());
   }
   {
     static_assert(is_same<vector<string>, decltype(strings::Tokenize("", ""))>::value);
diff --git a/base/stl_add.hpp b/base/stl_add.hpp
index 7a1331358c..8ccfdffa53 100644
--- a/base/stl_add.hpp
+++ b/base/stl_add.hpp
@@ -32,7 +32,7 @@ public:
   }
   void operator() (typename ContainerT::value_type const & t) const
   {
-    m_Container.insert(t);
+    m_Container.insert(end(m_Container), t);
   }
 };
 
diff --git a/base/string_utils.hpp b/base/string_utils.hpp
index c7645767a7..8d7c37e8a6 100644
--- a/base/string_utils.hpp
+++ b/base/string_utils.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "base/buffer_vector.hpp"
+#include "base/stl_add.hpp"
 
 #include "std/algorithm.hpp"
 #include "std/cstdint.hpp"
@@ -310,10 +311,7 @@ template <template <typename ...> class Collection = vector>
 Collection<string> Tokenize(string const & str, char const * delims)
 {
   Collection<string> c;
-  Tokenize(str, delims, [&c](string const & str)
-  {
-    c.insert(end(c), str);
-  });
+  Tokenize(str, delims, MakeInsertFunctor(c));
   return c;
 }