diff --git a/include/fmt/core.h b/include/fmt/core.h index 4cc179b5..bfe46ec5 100644 --- a/include/fmt/core.h +++ b/include/fmt/core.h @@ -2778,12 +2778,11 @@ void vformat_to(buffer& buf, basic_string_view fmt, FMT_API void vprint(std::FILE* f, string_view format_str, format_args args, string_view suffix); -FMT_API void vprint_mojibake(std::FILE*, string_view, format_args, string_view); -FMT_API void vprint_mojibake(std::FILE*, string_view, format_args); +FMT_API void vprint_mojibake(std::FILE*, string_view, format_args, + string_view = {}); #ifndef _WIN32 inline void vprint_mojibake(std::FILE*, string_view, format_args, string_view) { } -inline void vprint_mojibake(std::FILE*, string_view, format_args) {} #endif FMT_END_DETAIL_NAMESPACE @@ -2983,8 +2982,12 @@ FMT_NODISCARD FMT_INLINE auto formatted_size(format_string fmt, return buf.count(); } -FMT_API void vprint(string_view fmt, format_args args); -FMT_API void vprint(std::FILE* f, string_view fmt, format_args args); +inline void vprint(std::FILE* f, string_view fmt, format_args args) { + detail::vprint(f, fmt, args, {}); +} +inline void vprint(string_view fmt, format_args args) { + vprint(stdout, fmt, args); +} /** \rst diff --git a/include/fmt/format-inl.h b/include/fmt/format-inl.h index 1fba6504..8991cbcc 100644 --- a/include/fmt/format-inl.h +++ b/include/fmt/format-inl.h @@ -1490,13 +1490,8 @@ FMT_FUNC void vprint(std::FILE* f, string_view format_str, format_args args, buffer.append(suffix); detail::print(f, {buffer.data(), buffer.size()}); } - } // namespace detail -FMT_FUNC void vprint(std::FILE* f, string_view format_str, format_args args) { - detail::vprint(f, format_str, args, {}); -} - #ifdef _WIN32 // Print assuming legacy (non-Unicode) encoding. FMT_FUNC void detail::vprint_mojibake(std::FILE* f, string_view format_str, @@ -1507,16 +1502,8 @@ FMT_FUNC void detail::vprint_mojibake(std::FILE* f, string_view format_str, buffer.append(suffix); fwrite_fully(buffer.data(), 1, buffer.size(), f); } -FMT_FUNC void detail::vprint_mojibake(std::FILE* f, string_view format_str, - format_args args) { - vprint_mojibake(f, format_str, args, {}); -} #endif -FMT_FUNC void vprint(string_view format_str, format_args args) { - vprint(stdout, format_str, args); -} - namespace detail { struct singleton {