fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-07-30 02:37:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move vprint_mojibake to the internal namespace

Browse Source
This commit is contained in:
Victor Zverovich
2020-01-04 08:31:18 -10:00
parent a73d89e9c7
commit aa07c57654
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/fmt/core.h
View File

@ -1441,6 +1441,8 @@ template <typename Char>
typename buffer_context<Char>::iterator vformat_to( typename buffer_context<Char>::iterator vformat_to(
buffer<Char>& buf, basic_string_view<Char> format_str, buffer<Char>& buf, basic_string_view<Char> format_str,
basic_format_args<buffer_context<Char>> args); basic_format_args<buffer_context<Char>> args);
FMT_API void vprint_mojibake(std::FILE*, string_view, format_args);
} // namespace internal } // namespace internal
/** /**
@ -1515,7 +1517,6 @@ inline std::basic_string<Char> format(const S& format_str, Args&&... args) {
FMT_API void vprint(string_view, format_args); FMT_API void vprint(string_view, format_args);
FMT_API void vprint(std::FILE*, string_view, format_args); FMT_API void vprint(std::FILE*, string_view, format_args);
FMT_API void vprint_mojibake(std::FILE*, string_view, format_args);
/** /**
\rst \rst
@ -1535,8 +1536,9 @@ inline void print(std::FILE* f, const S& format_str, Args&&... args) {
vprint(f, to_string_view(format_str), vprint(f, to_string_view(format_str),
internal::make_args_checked<Args...>(format_str, args...)); internal::make_args_checked<Args...>(format_str, args...));
#else #else
vprint_mojibake(f, to_string_view(format_str), internal::vprint_mojibake(
internal::make_args_checked<Args...>(format_str, args...)); f, to_string_view(format_str),
internal::make_args_checked<Args...>(format_str, args...));
#endif #endif
} }
@ -1558,8 +1560,9 @@ inline void print(const S& format_str, Args&&... args) {
vprint(to_string_view(format_str), vprint(to_string_view(format_str),
internal::make_args_checked<Args...>(format_str, args...)); internal::make_args_checked<Args...>(format_str, args...));
#else #else
vprint_mojibake(stdout, to_string_view(format_str), internal::vprint_mojibake(
internal::make_args_checked<Args...>(format_str, args...)); stdout, to_string_view(format_str),
internal::make_args_checked<Args...>(format_str, args...));
#endif #endif
} }
FMT_END_NAMESPACE FMT_END_NAMESPACE

8
include/fmt/format-inl.h
View File

@ -1363,12 +1363,12 @@ FMT_FUNC void vprint(std::FILE* f, string_view format_str, format_args args) {
#ifdef _WIN32 #ifdef _WIN32
// Print assuming legacy (non-Unicode) encoding. // Print assuming legacy (non-Unicode) encoding.
FMT_FUNC void vprint_mojibake(std::FILE* f, string_view format_str, FMT_FUNC void internal::vprint_mojibake(std::FILE* f, string_view format_str,
format_args args) { format_args args) {
memory_buffer buffer; memory_buffer buffer;
internal::vformat_to(buffer, format_str, vformat_to(buffer, format_str,
basic_format_args<buffer_context<char>>(args)); basic_format_args<buffer_context<char>>(args));
internal::fwrite_fully(buffer.data(), 1, buffer.size(), f); fwrite_fully(buffer.data(), 1, buffer.size(), f);
} }
#endif #endif