mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-10-02 21:12:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27 from jdale88/variadic-format

Browse Source 
Added variadic versions for Format that act as a proxy for providing an initialiser list to a BasicFormatter
This commit is contained in:
vitaut 2014-03-07 08:03:14 -08:00
commit 7592eda492
2 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
format-test.cc
View File

@ -1485,19 +1485,12 @@ TEST(StrTest, Convert) {
EXPECT_EQ("2012-12-9", s); EXPECT_EQ("2012-12-9", s);
} }
#if FMT_USE_INITIALIZER_LIST #if FMT_USE_INITIALIZER_LIST && FMT_USE_VARIADIC_TEMPLATES
template<typename... Args>
inline std::string Format(const StringRef &format, const Args & ... args) {
Writer w;
fmt::BasicFormatter<char> f(w, format.c_str(), {args...});
return fmt::str(f);
}
TEST(FormatTest, Variadic) { TEST(FormatTest, Variadic) {
Writer w; EXPECT_EQ("Hello, world!1", Format("Hello, {}!{}", "world", 1));
EXPECT_EQ("Hello, world!1", str(Format("Hello, {}!{}", "world", 1))); EXPECT_EQ(L"Hello, world!1", Format(L"Hello, {}!{}", L"world", 1));
} }
#endif // FMT_USE_INITIALIZER_LIST #endif // FMT_USE_INITIALIZER_LIST && FMT_USE_VARIADIC_TEMPLATES
int main(int argc, char **argv) { int main(int argc, char **argv) {
#ifdef _WIN32 #ifdef _WIN32

23
format.h
View File

@ -61,6 +61,12 @@
(FMT_GCC_VERSION >= 404 && __cplusplus >= 201103) || _MSC_VER >= 1800) (FMT_GCC_VERSION >= 404 && __cplusplus >= 201103) || _MSC_VER >= 1800)
#endif #endif
#ifndef FMT_USE_VARIADIC_TEMPLATES
# define FMT_USE_VARIADIC_TEMPLATES \
(__has_feature(cxx_variadic_templates) || \
(FMT_GCC_VERSION >= 404 && __cplusplus >= 201103) || _MSC_VER >= 1800)
#endif
#if FMT_USE_INITIALIZER_LIST #if FMT_USE_INITIALIZER_LIST
# include <initializer_list> # include <initializer_list>
#endif #endif
@ -1491,6 +1497,23 @@ inline Formatter<ColorWriter> PrintColored(Color c, StringRef format) {
Formatter<ColorWriter> f(format, ColorWriter(c)); Formatter<ColorWriter> f(format, ColorWriter(c));
return f; return f;
} }
#if FMT_USE_INITIALIZER_LIST && FMT_USE_VARIADIC_TEMPLATES
template<typename... Args>
std::string Format(const StringRef &format, const Args & ... args) {
Writer w;
BasicFormatter<char> f(w, format.c_str(), { args... });
return fmt::str(f);
}
template<typename... Args>
std::wstring Format(const WStringRef &format, const Args & ... args) {
WWriter w;
BasicFormatter<wchar_t> f(w, format.c_str(), { args... });
return fmt::str(f);
}
#endif // FMT_USE_INITIALIZER_LIST && FMT_USE_VARIADIC_TEMPLATES
} }
#if _MSC_VER #if _MSC_VER