Merge pull request #599 from zosrothko/develop

Add up to 10 arguments to variables arguments list for all level form: correcting missing udpate
This commit is contained in:
Günter Obiltschnig
2014-11-07 09:42:41 +01:00
4 changed files with 338 additions and 0 deletions

View File

@@ -275,6 +275,38 @@ std::string format(const std::string& fmt, const Any& value1, const Any& value2,
}
std::string format(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7)
{
std::string result;
format(result, fmt, value1, value2, value3, value4, value5, value6, value7);
return result;
}
std::string format(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8)
{
std::string result;
format(result, fmt, value1, value2, value3, value4, value5, value6, value7, value8);
return result;
}
std::string format(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9)
{
std::string result;
format(result, fmt, value1, value2, value3, value4, value5, value6, value7, value8, value9);
return result;
}
std::string format(const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10)
{
std::string result;
format(result, fmt, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10);
return result;
}
void format(std::string& result, const std::string& fmt, const Any& value)
{
std::vector<Any> args;
@@ -338,6 +370,68 @@ void format(std::string& result, const std::string& fmt, const Any& value1, cons
}
void format(std::string& result, const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7)
{
std::vector<Any> args;
args.push_back(value1);
args.push_back(value2);
args.push_back(value3);
args.push_back(value4);
args.push_back(value5);
args.push_back(value6);
args.push_back(value7);
format(result, fmt, args);
}
void format(std::string& result, const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8)
{
std::vector<Any> args;
args.push_back(value1);
args.push_back(value2);
args.push_back(value3);
args.push_back(value4);
args.push_back(value5);
args.push_back(value6);
args.push_back(value7);
args.push_back(value8);
format(result, fmt, args);
}
void format(std::string& result, const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9)
{
std::vector<Any> args;
args.push_back(value1);
args.push_back(value2);
args.push_back(value3);
args.push_back(value4);
args.push_back(value5);
args.push_back(value6);
args.push_back(value7);
args.push_back(value8);
args.push_back(value9);
format(result, fmt, args);
}
void format(std::string& result, const std::string& fmt, const Any& value1, const Any& value2, const Any& value3, const Any& value4, const Any& value5, const Any& value6, const Any& value7, const Any& value8, const Any& value9, const Any& value10)
{
std::vector<Any> args;
args.push_back(value1);
args.push_back(value2);
args.push_back(value3);
args.push_back(value4);
args.push_back(value5);
args.push_back(value6);
args.push_back(value7);
args.push_back(value8);
args.push_back(value9);
args.push_back(value10);
format(result, fmt, args);
}
void format(std::string& result, const std::string& fmt, const std::vector<Any>& values)
{
std::string::const_iterator itFmt = fmt.begin();