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
fmt/printf.h
View File

@@ -506,8 +506,7 @@ inline std::string vsprintf(CStringRef format, format_args args) {
*/
template <typename... Args>
inline std::string sprintf(CStringRef format_str, const Args & ... args) {
auto vargs = internal::make_format_args<BasicFormatter<char>>(args...);
return vsprintf(format_str, vargs);
return vsprintf(format_str, make_format_args<BasicFormatter<char>>(args...));
}
inline std::wstring vsprintf(WCStringRef format, format_args args) {
@@ -518,7 +517,7 @@ inline std::wstring vsprintf(WCStringRef format, format_args args) {
template <typename... Args>
inline std::wstring sprintf(WCStringRef format_str, const Args & ... args) {
auto vargs = internal::make_format_args<BasicFormatter<wchar_t>>(args...);
auto vargs = make_format_args<BasicFormatter<wchar_t>>(args...);
return vsprintf(format_str, vargs);
}
@@ -535,7 +534,7 @@ FMT_API int vfprintf(std::FILE *f, CStringRef format, format_args args);
*/
template <typename... Args>
inline int fprintf(std::FILE *f, CStringRef format_str, const Args & ... args) {
auto vargs = internal::make_format_args<BasicFormatter<char>>(args...);
auto vargs = make_format_args<BasicFormatter<char>>(args...);
return vfprintf(f, format_str, vargs);
}
@@ -554,8 +553,7 @@ inline int vprintf(CStringRef format, format_args args) {
*/
template <typename... Args>
inline int printf(CStringRef format_str, const Args & ... args) {
auto vargs = internal::make_format_args<BasicFormatter<char>>(args...);
return vprintf(format_str, vargs);
return vprintf(format_str, make_format_args<BasicFormatter<char>>(args...));
}
inline int vfprintf(std::ostream &os, CStringRef format_str, format_args args) {
@@ -577,7 +575,7 @@ inline int vfprintf(std::ostream &os, CStringRef format_str, format_args args) {
template <typename... Args>
inline int fprintf(std::ostream &os, CStringRef format_str,
const Args & ... args) {
auto vargs = internal::make_format_args<BasicFormatter<char>>(args...);
auto vargs = make_format_args<BasicFormatter<char>>(args...);
return vfprintf(os, format_str, vargs);
}
} // namespace fmt