Skip to content

Commit

Permalink
simplify field::format() and spec_field::format(), fix typo
Browse files Browse the repository at this point in the history
  • Loading branch information
alexezeder committed Apr 23, 2021
1 parent f6d14bb commit 04603b5
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions include/fmt/compile.h
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ template <typename Char> struct code_unit {
}
};

// This ensures that the argument type is convertile to `const T&`.
// This ensures that the argument type is convertible to `const T&`.
template <typename T, int N, typename... Args>
constexpr const T& get_arg_checked(const Args&... args) {
const auto& arg = get<N>(args...);
Expand All @@ -552,8 +552,7 @@ template <typename Char, typename T, int N> struct field {

template <typename OutputIt, typename... Args>
constexpr OutputIt format(OutputIt out, const Args&... args) const {
const T& arg = get_arg_checked<T, N>(args...);
return write<Char>(out, arg);
return write<Char>(out, get_arg_checked<T, N>(args...));
}
};

Expand Down Expand Up @@ -599,11 +598,10 @@ template <typename Char, typename T, int N> struct spec_field {

template <typename OutputIt, typename... Args>
constexpr OutputIt format(OutputIt out, const Args&... args) const {
const T& arg = get_arg_checked<T, N>(args...);
const auto& vargs =
make_format_args<basic_format_context<OutputIt, Char>>(args...);
basic_format_context<OutputIt, Char> ctx(out, vargs);
return fmt.format(arg, ctx);
return fmt.format(get_arg_checked<T, N>(args...), ctx);
}
};

Expand Down

0 comments on commit 04603b5

Please sign in to comment.