commit 8928788d5a9aaa04164120bbb99df7ca45cabb5b
author Casey Dahlin <sadmac@google.com> Mon Nov 02 20:28:09 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 02 20:28:09 2015 +0000
tree 06cc6675fa294de8ade57b0ee72222f9dadb073c
parent efa901e50c82148bf6397311c435a6300bc51372
parent f8557e7a7c91c6b528653ed8199cdf3427aaede1

Merge "Make Join support string delimiters"

include/base/strings.h

diff --git a/include/base/strings.h b/include/base/strings.h
index 638f845..20da144 100644
--- a/include/base/strings.h
+++ b/include/base/strings.h
@@ -36,8 +36,8 @@
 std::string Trim(const std::string& s);
 
 // Joins a container of things into a single string, using the given separator.
-template <typename ContainerT>
-std::string Join(const ContainerT& things, char separator) {
+template <typename ContainerT, typename SeparatorT>
+std::string Join(const ContainerT& things, SeparatorT separator) {
   if (things.empty()) {
     return "";
   }
@@ -53,6 +53,8 @@
 // We instantiate the common cases in strings.cpp.
 extern template std::string Join(const std::vector<std::string>&, char);
 extern template std::string Join(const std::vector<const char*>&, char);
+extern template std::string Join(const std::vector<std::string>&, const std::string&);
+extern template std::string Join(const std::vector<const char*>&, const std::string&);
 
 // Tests whether 's' starts with 'prefix'.
 bool StartsWith(const std::string& s, const char* prefix);

strings.cpp

diff --git a/strings.cpp b/strings.cpp
index bac983b..d687e3c 100644
--- a/strings.cpp
+++ b/strings.cpp
@@ -83,6 +83,8 @@
 // aid compile time and binary size.
 template std::string Join(const std::vector<std::string>&, char);
 template std::string Join(const std::vector<const char*>&, char);
+template std::string Join(const std::vector<std::string>&, const std::string&);
+template std::string Join(const std::vector<const char*>&, const std::string&);
 
 bool StartsWith(const std::string& s, const char* prefix) {
   return s.compare(0, strlen(prefix), prefix) == 0;