mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-12-27 03:21:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplify field::format() and spec_field::format(), fix typo

Browse Source
This commit is contained in:
Alexey Ochapov 2021-04-22 20:43:01 +03:00 committed by Victor Zverovich
parent ca821982ee
commit 1678ed6235
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/fmt/compile.h
View File

@ -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> template <typename T, int N, typename... Args>
constexpr const T& get_arg_checked(const Args&... args) { constexpr const T& get_arg_checked(const Args&... args) {
const auto& arg = get<N>(args...); const auto& arg = get<N>(args...);
@ -552,8 +552,7 @@ template <typename Char, typename T, int N> struct field {
template <typename OutputIt, typename... Args> template <typename OutputIt, typename... Args>
constexpr OutputIt format(OutputIt out, const Args&... args) const { constexpr OutputIt format(OutputIt out, const Args&... args) const {
const T& arg = get_arg_checked<T, N>(args...); return write<Char>(out, get_arg_checked<T, N>(args...));
return write<Char>(out, arg);
} }
}; };
@ -599,11 +598,10 @@ template <typename Char, typename T, int N> struct spec_field {
template <typename OutputIt, typename... Args> template <typename OutputIt, typename... Args>
constexpr OutputIt format(OutputIt out, const Args&... args) const { constexpr OutputIt format(OutputIt out, const Args&... args) const {
const T& arg = get_arg_checked<T, N>(args...);
const auto& vargs = const auto& vargs =
make_format_args<basic_format_context<OutputIt, Char>>(args...); make_format_args<basic_format_context<OutputIt, Char>>(args...);
basic_format_context<OutputIt, Char> ctx(out, vargs); basic_format_context<OutputIt, Char> ctx(out, vargs);
return fmt.format(arg, ctx); return fmt.format(get_arg_checked<T, N>(args...), ctx);
} }
}; };