leavelet/fmt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make make_format_args public

Browse Source
This commit is contained in:
Victor Zverovich
2016-08-27 07:57:48 -07:00
parent 0028ce57b6
commit 4ece95a754
8 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/custom-formatter-test.cc
View File

@@ -45,7 +45,7 @@ class CustomPrintfArgFormatter :
}
};
std::string vcustom_format(const char *format_str, fmt::format_args args) {
std::string custom_vformat(const char *format_str, fmt::format_args args) {
fmt::MemoryWriter writer;
// Pass custom argument formatter as a template arg to BasicFormatter.
fmt::BasicFormatter<char, CustomArgFormatter> formatter(args, writer);
@@ -55,11 +55,11 @@ std::string vcustom_format(const char *format_str, fmt::format_args args) {
template <typename... Args>
std::string custom_format(const char *format_str, const Args & ... args) {
auto va = fmt::internal::make_format_args<fmt::BasicFormatter<char>>(args...);
return vcustom_format(format_str, va);
auto va = fmt::make_format_args<fmt::BasicFormatter<char>>(args...);
return custom_vformat(format_str, va);
}
std::string vcustom_sprintf(const char* format_str, fmt::format_args args) {
std::string custom_vsprintf(const char* format_str, fmt::format_args args) {
fmt::MemoryWriter writer;
fmt::PrintfFormatter<char, CustomPrintfArgFormatter> formatter(args, writer);
formatter.format(format_str);
@@ -68,8 +68,8 @@ std::string vcustom_sprintf(const char* format_str, fmt::format_args args) {
template <typename... Args>
std::string custom_sprintf(const char *format_str, const Args & ... args) {
auto va = fmt::internal::make_format_args<fmt::BasicFormatter<char>>(args...);
return vcustom_sprintf(format_str, va);
auto va = fmt::make_format_args<fmt::BasicFormatter<char>>(args...);
return custom_vsprintf(format_str, va);
}
TEST(CustomFormatterTest, Format) {

4
test/format-test.cc
View File

@@ -1572,7 +1572,7 @@ std::string vformat_message(int id, const char *format, fmt::format_args args) {
template <typename... Args>
std::string format_message(int id, const char *format, const Args & ... args) {
auto va = fmt::internal::make_format_args<fmt::BasicFormatter<char>>(args...);
auto va = fmt::make_format_args<fmt::BasicFormatter<char>>(args...);
return vformat_message(id, format, va);
}
@@ -1654,7 +1654,7 @@ void vcustom_format(const char *format_str, fmt::format_args args) {
template <typename... Args>
void custom_format(const char *format_str, const Args & ... args) {
auto va = fmt::internal::make_format_args<fmt::BasicFormatter<char>>(args...);
auto va = fmt::make_format_args<fmt::BasicFormatter<char>>(args...);
return vcustom_format(format_str, va);
}