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

Minor cleanup

Browse Source
This commit is contained in:
Victor Zverovich
2024-11-02 11:24:24 -07:00
parent 8523dba2dc
commit 7e73566ce7
1 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
include/fmt/format.h
View File

@ -3835,7 +3835,7 @@ template <typename T> auto ptr(T p) -> const void* {
* **Example**: * **Example**:
* *
* enum class color { red, green, blue }; * enum class color { red, green, blue };
* auto s = fmt::format("{}", fmt::underlying(color::red)); * auto s = fmt::format("{}", fmt::underlying(color::red)); // s == "0"
*/ */
template <typename Enum> template <typename Enum>
constexpr auto underlying(Enum e) noexcept -> underlying_t<Enum> { constexpr auto underlying(Enum e) noexcept -> underlying_t<Enum> {
@ -3917,14 +3917,14 @@ template <typename T> struct formatter<group_digits_view<T>> : formatter<T> {
} }
template <typename FormatContext> template <typename FormatContext>
auto format(group_digits_view<T> t, FormatContext& ctx) const auto format(group_digits_view<T> view, FormatContext& ctx) const
-> decltype(ctx.out()) { -> decltype(ctx.out()) {
auto specs = specs_; auto specs = specs_;
detail::handle_dynamic_spec(specs.dynamic_width(), specs.width, detail::handle_dynamic_spec(specs.dynamic_width(), specs.width,
specs.width_ref, ctx); specs.width_ref, ctx);
detail::handle_dynamic_spec(specs.dynamic_precision(), specs.precision, detail::handle_dynamic_spec(specs.dynamic_precision(), specs.precision,
specs.precision_ref, ctx); specs.precision_ref, ctx);
auto arg = detail::make_write_int_arg(t.value, specs.sign()); auto arg = detail::make_write_int_arg(view.value, specs.sign());
return detail::write_int( return detail::write_int(
ctx.out(), static_cast<detail::uint64_or_128_t<T>>(arg.abs_value), ctx.out(), static_cast<detail::uint64_or_128_t<T>>(arg.abs_value),
arg.prefix, specs, detail::digit_grouping<char>("\3", ",")); arg.prefix, specs, detail::digit_grouping<char>("\3", ","));
@ -3994,9 +3994,9 @@ template <typename T, typename Char = char> struct nested_formatter {
inline namespace literals { inline namespace literals {
#if FMT_USE_NONTYPE_TEMPLATE_ARGS #if FMT_USE_NONTYPE_TEMPLATE_ARGS
template <detail::fixed_string Str> constexpr auto operator""_a() { template <detail::fixed_string S> constexpr auto operator""_a() {
using char_t = remove_cvref_t<decltype(Str.data[0])>; using char_t = remove_cvref_t<decltype(*S.data)>;
return detail::udl_arg<char_t, sizeof(Str.data) / sizeof(char_t), Str>(); return detail::udl_arg<char_t, sizeof(S.data) / sizeof(char_t), S>();
} }
#else #else
/** /**
@ -4071,21 +4071,20 @@ class format_int {
inline auto str() const -> std::string { return {str_, size()}; } inline auto str() const -> std::string { return {str_, size()}; }
}; };
#define FMT_STRING_IMPL(s, base) \ #define FMT_STRING_IMPL(s, base) \
[] { \ [] { \
/* Use the hidden visibility as a workaround for a GCC bug (#1973). */ \ /* Use the hidden visibility as a workaround for a GCC bug (#1973). */ \
/* Use a macro-like name to avoid shadowing warnings. */ \ /* Use a macro-like name to avoid shadowing warnings. */ \
struct FMT_VISIBILITY("hidden") FMT_COMPILE_STRING : base { \ struct FMT_VISIBILITY("hidden") FMT_COMPILE_STRING : base { \
using char_type = fmt::remove_cvref_t<decltype(s[0])>; \ using char_type = fmt::remove_cvref_t<decltype(s[0])>; \
FMT_CONSTEXPR explicit operator fmt::basic_string_view<char_type>() \ constexpr explicit operator fmt::basic_string_view<char_type>() const { \
const { \ return fmt::detail::compile_string_to_view<char_type>(s); \
return fmt::detail::compile_string_to_view<char_type>(s); \ } \
} \ }; \
}; \ using FMT_STRING_VIEW = \
using FMT_STRING_VIEW = \ fmt::basic_string_view<typename FMT_COMPILE_STRING::char_type>; \
fmt::basic_string_view<typename FMT_COMPILE_STRING::char_type>; \ fmt::detail::ignore_unused(FMT_STRING_VIEW(FMT_COMPILE_STRING())); \
fmt::detail::ignore_unused(FMT_STRING_VIEW(FMT_COMPILE_STRING())); \ return FMT_COMPILE_STRING(); \
return FMT_COMPILE_STRING(); \
}() }()
/** /**