archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 05:51:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Reapply fmt::merge change

Browse source
This commit is contained in:
raven02 2014-12-21 07:30:30 +08:00
parent 7a61fd3055
commit 0506bf0352
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Utilities/StrFmt.cpp
View file

@ -137,14 +137,17 @@ 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 (auto &s : source) for (int i = 0; i < source.size() - 1; ++i)
{ {
result += s + separator; result += source[i] + separator;
} }
return result; return result + source[source.size() - 1];
} }
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)