feedc0de/mp-units
1
0
Fork 0
forked from mpusz/mp-units
Code Pull Requests Activity

Merge pull request #589 from nebkat/fix-fmt-11

Browse Source 
fix: Support fmtlib 11.0.0
This commit is contained in:
Mateusz Pusz
2024-07-02 20:27:05 +09:00
committed by GitHub
parent 485a53d3d7 0ac6a1701d
commit 84f0a0411c
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/include/mp-units/bits/fmt.h
View File

@@ -146,7 +146,11 @@ template<typename Int>
template<class Handler, typename FormatArg> template<class Handler, typename FormatArg>
[[nodiscard]] constexpr int get_dynamic_spec(FormatArg arg) [[nodiscard]] constexpr int get_dynamic_spec(FormatArg arg)
{ {
#if defined MP_UNITS_USE_FMTLIB && FMT_VERSION >= 110000
const unsigned long long value = arg.visit(Handler{});
#else
const unsigned long long value = MP_UNITS_STD_FMT::visit_format_arg(Handler{}, arg); const unsigned long long value = MP_UNITS_STD_FMT::visit_format_arg(Handler{}, arg);
#endif
if (value > ::mp_units::detail::to_unsigned(std::numeric_limits<int>::max())) { if (value > ::mp_units::detail::to_unsigned(std::numeric_limits<int>::max())) {
MP_UNITS_THROW(MP_UNITS_STD_FMT::format_error("number is too big")); MP_UNITS_THROW(MP_UNITS_STD_FMT::format_error("number is too big"));
} }

4
src/core/include/mp-units/format.h
View File

@@ -467,8 +467,8 @@ public:
return parse_defaults_specs(it, end); return parse_defaults_specs(it, end);
} }
template<typename OutIt> template<typename FormatContext>
OutIt format(const quantity_t& q, MP_UNITS_STD_FMT::basic_format_context<OutIt, Char>& ctx) const auto format(const quantity_t& q, FormatContext& ctx) const
{ {
auto specs = specs_; auto specs = specs_;
mp_units::detail::handle_dynamic_spec<mp_units::detail::width_checker>(specs.width, specs.width_ref, ctx); mp_units::detail::handle_dynamic_spec<mp_units::detail::width_checker>(specs.width, specs.width_ref, ctx);