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

typedef -> using

Browse Source
This commit is contained in:
Victor Zverovich 2019-07-07 15:40:34 -07:00
parent e3f20d3e13
commit c92dc37464
1 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/fmt/format.h
View File

@ -3334,9 +3334,8 @@ inline typename buffer_context<Char>::iterator format_to(
const Args&... args) { const Args&... args) {
internal::check_format_string<Args...>(format_str); internal::check_format_string<Args...>(format_str);
using context = buffer_context<Char>; using context = buffer_context<Char>;
format_arg_store<context, Args...> as{args...};
return internal::vformat_to(buf, to_string_view(format_str), return internal::vformat_to(buf, to_string_view(format_str),
basic_format_args<context>(as)); {make_format_args<context>(args...)});
} }
template <typename OutputIt, typename Char = char> template <typename OutputIt, typename Char = char>
@ -3351,7 +3350,7 @@ template <typename S, typename OutputIt, typename... Args,
!internal::is_contiguous_back_insert_iterator<OutputIt>::value)> !internal::is_contiguous_back_insert_iterator<OutputIt>::value)>
inline OutputIt vformat_to(OutputIt out, const S& format_str, inline OutputIt vformat_to(OutputIt out, const S& format_str,
format_args_t<OutputIt, char_t<S>> args) { format_args_t<OutputIt, char_t<S>> args) {
typedef internal::output_range<OutputIt, char_t<S>> range; using range = internal::output_range<OutputIt, char_t<S>>;
return vformat_to<arg_formatter<range>>(range(out), return vformat_to<arg_formatter<range>>(range(out),
to_string_view(format_str), args); to_string_view(format_str), args);
} }
@ -3374,10 +3373,9 @@ inline OutputIt format_to(OutputIt out, const S& format_str,
internal::is_string<S>::value, internal::is_string<S>::value,
""); "");
internal::check_format_string<Args...>(format_str); internal::check_format_string<Args...>(format_str);
typedef format_context_t<OutputIt, char_t<S>> context; using context = format_context_t<OutputIt, char_t<S>>;
format_arg_store<context, Args...> as{args...};
return vformat_to(out, to_string_view(format_str), return vformat_to(out, to_string_view(format_str),
basic_format_args<context>(as)); {make_format_args<context>(args...)});
} }
template <typename OutputIt> struct format_to_n_result { template <typename OutputIt> struct format_to_n_result {
@ -3406,8 +3404,8 @@ template <typename OutputIt, typename Char, typename... Args,
inline format_to_n_result<OutputIt> vformat_to_n( inline format_to_n_result<OutputIt> vformat_to_n(
OutputIt out, std::size_t n, basic_string_view<Char> format_str, OutputIt out, std::size_t n, basic_string_view<Char> format_str,
format_to_n_args<OutputIt, Char> args) { format_to_n_args<OutputIt, Char> args) {
typedef internal::truncating_iterator<OutputIt> It; auto it = vformat_to(internal::truncating_iterator<OutputIt>(out, n),
auto it = vformat_to(It(out, n), format_str, args); format_str, args);
return {it.base(), it.count()}; return {it.base(), it.count()};
} }
@ -3425,10 +3423,9 @@ inline format_to_n_result<OutputIt> format_to_n(OutputIt out, std::size_t n,
const S& format_str, const S& format_str,
const Args&... args) { const Args&... args) {
internal::check_format_string<Args...>(format_str); internal::check_format_string<Args...>(format_str);
using Char = char_t<S>; using context = format_to_n_context<OutputIt, char_t<S>>;
format_arg_store<format_to_n_context<OutputIt, Char>, Args...> as(args...);
return vformat_to_n(out, n, to_string_view(format_str), return vformat_to_n(out, n, to_string_view(format_str),
format_to_n_args<OutputIt, Char>(as)); {make_format_args<context>(args...)});
} }
template <typename Char> template <typename Char>
@ -3553,8 +3550,8 @@ FMT_END_NAMESPACE
#define FMT_STRING(s) \ #define FMT_STRING(s) \
[] { \ [] { \
struct str : fmt::compile_string { \ struct str : fmt::compile_string { \
typedef typename std::remove_cv<std::remove_pointer< \ using char_type = typename std::remove_cv<std::remove_pointer< \
typename std::decay<decltype(s)>::type>::type>::type char_type; \ typename std::decay<decltype(s)>::type>::type>::type; \
FMT_CONSTEXPR operator fmt::basic_string_view<char_type>() const { \ FMT_CONSTEXPR operator fmt::basic_string_view<char_type>() const { \
return {s, sizeof(s) / sizeof(char_type) - 1}; \ return {s, sizeof(s) / sizeof(char_type) - 1}; \
} \ } \