1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00

Merge pull request #281 from janisozaur/clang4

Accepted. This should be fixed in fuzzylite first, still.
This commit is contained in:
DjWarmonger 2017-02-19 21:39:01 +01:00 committed by GitHub
commit 0fdee4fde2

View File

@ -442,11 +442,9 @@ namespace fl {
template FL_API std::string Operation::join(int items, const std::string& separator,
int first, ...);
template FL_API std::string Operation::join(int items, const std::string& separator,
double first, ...);
template <> FL_API std::string Operation::join(int items, const std::string& separator,
float first, ...) {
double first, ...) {
std::ostringstream ss;
ss << str(first);
if (items > 1) ss << separator;