RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 10:42:36 +01:00
Code Issues Releases Wiki Activity

Revert fmt::merge

Browse Source
This commit is contained in:
raven02 2014-12-18 00:10:20 +08:00
parent 52bf72787f
commit 37838a49ec
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Utilities/StrFmt.cpp
View File

@ -137,17 +137,14 @@ std::vector<std::string> fmt::split(const std::string& source, std::initializer_
std::string fmt::merge(std::vector<std::string> source, const std::string& separator) std::string fmt::merge(std::vector<std::string> source, const std::string& separator)
{ {
if (!source.size())
return "";
std::string result; std::string result;
for (int i = 0; i < source.size() - 1; ++i) for (auto &s : source)
{ {
result += source[i] + separator; result += s + separator;
} }
return result + source[source.size() - 1]; return result;
} }
std::string fmt::merge(std::initializer_list<std::vector<std::string>> sources, const std::string& separator) std::string fmt::merge(std::initializer_list<std::vector<std::string>> sources, const std::string& separator)
@ -167,4 +164,4 @@ std::string fmt::tolower(std::string source)
std::transform(source.begin(), source.end(), source.begin(), ::tolower); std::transform(source.begin(), source.end(), source.begin(), ::tolower);
return source; return source;
} }