External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support char*_t in fmt::join

Browse Source
This commit is contained in:
Patrick Stewart 2021-04-13 13:27:12 +01:00
parent a1c6bfd77b
commit 1ab8f0ba99
2 changed files with 13 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/fmt/format.h
View File

@ -3753,14 +3753,9 @@ struct formatter<arg_join<It, Sentinel, Char>, Char> {
Returns an object that formats the iterator range `[begin, end)` with elements Returns an object that formats the iterator range `[begin, end)` with elements
separated by `sep`. separated by `sep`.
*/ */
template <typename It, typename Sentinel> template <typename It, typename Sentinel, typename S>
arg_join<It, Sentinel, char> join(It begin, Sentinel end, string_view sep) { arg_join<It, Sentinel, char_t<S>> join(It begin, Sentinel end, const S& sep) {
return {begin, end, sep}; return {begin, end, to_string_view(sep)};
}
template <typename It, typename Sentinel>
arg_join<It, Sentinel, wchar_t> join(It begin, Sentinel end, wstring_view sep) {
return {begin, end, sep};
} }
/** /**
@ -3779,15 +3774,9 @@ arg_join<It, Sentinel, wchar_t> join(It begin, Sentinel end, wstring_view sep) {
// Output: "01, 02, 03" // Output: "01, 02, 03"
\endrst \endrst
*/ */
template <typename Range> template <typename Range, typename S>
arg_join<detail::iterator_t<Range>, detail::sentinel_t<Range>, char> join( arg_join<detail::iterator_t<Range>, detail::sentinel_t<Range>, char_t<S>> join(
Range&& range, string_view sep) { Range&& range, const S& sep) {
return join(std::begin(range), std::end(range), sep);
}
template <typename Range>
arg_join<detail::iterator_t<Range>, detail::sentinel_t<Range>, wchar_t> join(
Range&& range, wstring_view sep) {
return join(std::begin(range), std::end(range), sep); return join(std::begin(range), std::end(range), sep);
} }

26
include/fmt/ranges.h
View File

@ -427,16 +427,10 @@ struct formatter<tuple_arg_join<Char, T...>, Char> {
// Output: "1, a" // Output: "1, a"
\endrst \endrst
*/ */
template <typename... T> template <typename... T, typename S>
FMT_CONSTEXPR tuple_arg_join<char, T...> join(const std::tuple<T...>& tuple, FMT_CONSTEXPR tuple_arg_join<char_t<S>, T...> join(const std::tuple<T...>& tuple,
string_view sep) { const S& sep) {
return {tuple, sep}; return {tuple, to_string_view(sep)};
}
template <typename... T>
FMT_CONSTEXPR tuple_arg_join<wchar_t, T...> join(const std::tuple<T...>& tuple,
wstring_view sep) {
return {tuple, sep};
} }
/** /**
@ -450,15 +444,9 @@ FMT_CONSTEXPR tuple_arg_join<wchar_t, T...> join(const std::tuple<T...>& tuple,
// Output: "1, 2, 3" // Output: "1, 2, 3"
\endrst \endrst
*/ */
template <typename T> template <typename T, typename S>
arg_join<const T*, const T*, char> join(std::initializer_list<T> list, arg_join<const T*, const T*, char_t<S>> join(std::initializer_list<T> list,
string_view sep) { const S& sep) {
return join(std::begin(list), std::end(list), sep);
}
template <typename T>
arg_join<const T*, const T*, wchar_t> join(std::initializer_list<T> list,
wstring_view sep) {
return join(std::begin(list), std::end(list), sep); return join(std::begin(list), std::end(list), sep);
} }