diff --git a/include/fmt/os.h b/include/fmt/os.h index 061a6cd5..f12bceb2 100644 --- a/include/fmt/os.h +++ b/include/fmt/os.h @@ -198,7 +198,7 @@ FMT_API std::system_error vwindows_error(int error_code, string_view format_str, template std::system_error windows_error(int error_code, string_view message, const Args&... args) { - return vwindows_error(error_code, message, make_format_args(args...)); + return vwindows_error(error_code, message, fmt::make_format_args(args...)); } // Reports a Windows error without throwing an exception. @@ -269,7 +269,7 @@ class buffered_file { template inline void print(string_view format_str, const Args&... args) { - vprint(format_str, make_format_args(args...)); + vprint(format_str, fmt::make_format_args(args...)); } }; @@ -438,7 +438,7 @@ class FMT_API ostream final : private detail::buffer { */ template void print(format_string fmt, T&&... args) { vformat_to(detail::buffer_appender(*this), fmt, - make_format_args(args...)); + fmt::make_format_args(args...)); } }; diff --git a/include/fmt/printf.h b/include/fmt/printf.h index 40431019..a6275ce2 100644 --- a/include/fmt/printf.h +++ b/include/fmt/printf.h @@ -621,7 +621,7 @@ template ::value, char_t>> inline auto sprintf(const S& fmt, const T&... args) -> std::basic_string { using context = basic_printf_context_t; - return vsprintf(to_string_view(fmt), make_format_args(args...)); + return vsprintf(to_string_view(fmt), fmt::make_format_args(args...)); } template > @@ -649,7 +649,7 @@ inline auto vfprintf( template > inline auto fprintf(std::FILE* f, const S& fmt, const T&... args) -> int { using context = basic_printf_context_t; - return vfprintf(f, to_string_view(fmt), make_format_args(args...)); + return vfprintf(f, to_string_view(fmt), fmt::make_format_args(args...)); } template > @@ -672,7 +672,7 @@ inline auto vprintf( template ::value)> inline auto printf(const S& fmt, const T&... args) -> int { return vprintf(to_string_view(fmt), - make_format_args>>(args...)); + fmt::make_format_args>>(args...)); } template > @@ -699,7 +699,7 @@ template > inline auto fprintf(std::basic_ostream& os, const S& fmt, const T&... args) -> int { return vfprintf(os, to_string_view(fmt), - make_format_args>(args...)); + fmt::make_format_args>(args...)); } FMT_MODULE_EXPORT_END