aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Martin B. Jensen <32485905+hmbj@users.noreply.github.com>2024-04-17 17:30:48 +0200
committerGitHub <noreply@github.com>2024-04-17 08:30:48 -0700
commitee0c3351a4d47ca89090b8a7458846288b18efca (patch)
tree80b94a0a06180346e72560ab3d172c6ffd3a3978
parent99735764ea773ce7426688d503499e72f58d739a (diff)
downloadfmtlib-ee0c3351a4d47ca89090b8a7458846288b18efca.tar.gz
Fix format_to + FMT_STRING for wide character type (#3931)
Added overload that takes a wformat_string. Fixes issue #3925.
-rw-r--r--include/fmt/xchar.h12
-rw-r--r--test/xchar-test.cc6
2 files changed, 16 insertions, 2 deletions
diff --git a/include/fmt/xchar.h b/include/fmt/xchar.h
index 557dbe1d..a6bf47fe 100644
--- a/include/fmt/xchar.h
+++ b/include/fmt/xchar.h
@@ -141,6 +141,13 @@ auto format(wformat_string<T...> fmt, T&&... args) -> std::wstring {
return vformat(fmt::wstring_view(fmt), fmt::make_wformat_args(args...));
}
+template <typename OutputIt, typename... T>
+auto format_to(OutputIt out, wformat_string<T...> fmt, T&&... args)
+ -> OutputIt {
+ return vformat_to(out, fmt::wstring_view(fmt),
+ fmt::make_wformat_args(args...));
+}
+
// Pass char_t as a default template parameter instead of using
// std::basic_string<char_t<S>> to reduce the symbol size.
template <typename S, typename... T,
@@ -186,8 +193,9 @@ auto vformat_to(OutputIt out, const S& format_str,
template <typename OutputIt, typename S, typename... T,
typename Char = detail::format_string_char_t<S>,
- FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value&&
- detail::is_exotic_char<Char>::value)>
+ FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value &&
+ !std::is_same<Char, char>::value &&
+ !std::is_same<Char, wchar_t>::value)>
inline auto format_to(OutputIt out, const S& fmt, T&&... args) -> OutputIt {
return vformat_to(out, detail::to_string_view(fmt),
fmt::make_format_args<buffered_context<Char>>(args...));
diff --git a/test/xchar-test.cc b/test/xchar-test.cc
index 8f15a347..cbc961d3 100644
--- a/test/xchar-test.cc
+++ b/test/xchar-test.cc
@@ -195,6 +195,12 @@ TEST(xchar_test, format_to) {
EXPECT_STREQ(buf.data(), L"42");
}
+TEST(xchar_test, compile_time_string_format_to) {
+ std::wstring ws;
+ fmt::format_to(std::back_inserter(ws), FMT_STRING(L"{}"), 42);
+ EXPECT_EQ(L"42", ws);
+}
+
TEST(xchar_test, vformat_to) {
int n = 42;
auto args = fmt::make_wformat_args(n);