Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(347)

Unified Diff: base/string_util.cc

Issue 10828217: string_util support for joining strings using strings not just chars. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: string_util support for joining strings on strings in addition to chars. Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/string_util.h ('k') | base/string_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/string_util.cc
diff --git a/base/string_util.cc b/base/string_util.cc
index 2eecb79eaa77ea027ff436b496e77b0b90a4a023..9e3422d260237902d562c03174fc755850387683 100644
--- a/base/string_util.cc
+++ b/base/string_util.cc
@@ -750,8 +750,7 @@ size_t Tokenize(const base::StringPiece& str,
}
template<typename STR>
-static STR JoinStringT(const std::vector<STR>& parts,
- typename STR::value_type sep) {
+static STR JoinStringT(const std::vector<STR>& parts, const STR& sep) {
if (parts.empty())
return STR();
@@ -768,11 +767,21 @@ static STR JoinStringT(const std::vector<STR>& parts,
}
std::string JoinString(const std::vector<std::string>& parts, char sep) {
- return JoinStringT(parts, sep);
+ return JoinStringT(parts, std::string(1, sep));
}
string16 JoinString(const std::vector<string16>& parts, char16 sep) {
- return JoinStringT(parts, sep);
+ return JoinStringT(parts, string16(1, sep));
+}
+
+std::string JoinString(const std::vector<std::string>& parts,
+ const std::string& separator) {
+ return JoinStringT(parts, separator);
+}
+
+string16 JoinString(const std::vector<string16>& parts,
+ const string16& separator) {
+ return JoinStringT(parts, separator);
}
template<class FormatStringType, class OutStringType>
« no previous file with comments | « base/string_util.h ('k') | base/string_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698