mpusz/mp-units
1
0
Fork 1
mirror of https://github.com/mpusz/mp-units.git synced 2025-07-30 10:27:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

fmt updated to 7.0.3

Browse Source
This commit is contained in:
Mateusz Pusz
2020-08-17 22:07:59 +02:00
parent c351b81dd4
commit 82baa51708
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
conanfile.py
View File

@ -46,7 +46,7 @@ class UnitsConan(ConanFile):
exports_sources = ["docs/*", "src/*", "test/*", "cmake/*", "example/*","CMakeLists.txt"] exports_sources = ["docs/*", "src/*", "test/*", "cmake/*", "example/*","CMakeLists.txt"]
settings = "os", "compiler", "build_type", "arch" settings = "os", "compiler", "build_type", "arch"
requires = ( requires = (
"fmt/6.2.1", "fmt/7.0.3",
"ms-gsl/3.1.0" "ms-gsl/3.1.0"
) )
# scm = { # scm = {

18
src/include/units/format.h
View File

@ -77,7 +77,7 @@ namespace units {
template <typename CharT> template <typename CharT>
struct global_format_specs struct global_format_specs
{ {
fmt::internal::fill_t<CharT> fill = fmt::internal::fill_t<CharT>::make(); fmt::detail::fill_t<CharT> fill = fmt::detail::fill_t<CharT>::make();
fmt::align_t align = fmt::align_t::none; fmt::align_t align = fmt::align_t::none;
int width = 0; int width = 0;
}; };
@ -128,7 +128,7 @@ namespace units {
// parse precision if a floating point // parse precision if a floating point
if(*begin == '.') { if(*begin == '.') {
if (treat_as_floating_point) if (treat_as_floating_point)
begin = fmt::internal::parse_precision(begin, end, handler); begin = fmt::detail::parse_precision(begin, end, handler);
else else
handler.on_error("precision not allowed for integral quantity representation"); handler.on_error("precision not allowed for integral quantity representation");
} }
@ -278,7 +278,7 @@ struct fmt::formatter<units::quantity<Dimension, Unit, Rep>, CharT> {
private: private:
using quantity = units::quantity<Dimension, Unit, Rep>; using quantity = units::quantity<Dimension, Unit, Rep>;
using iterator = fmt::basic_format_parse_context<CharT>::iterator; using iterator = fmt::basic_format_parse_context<CharT>::iterator;
using arg_ref_type = fmt::internal::arg_ref<CharT>; using arg_ref_type = fmt::detail::arg_ref<CharT>;
units::detail::global_format_specs<CharT> global_specs; units::detail::global_format_specs<CharT> global_specs;
units::detail::rep_format_specs rep_specs; units::detail::rep_format_specs rep_specs;
@ -308,7 +308,7 @@ private:
return arg_ref_type(arg_id); return arg_ref_type(arg_id);
} }
constexpr arg_ref_type make_arg_ref(fmt::internal::auto_id) constexpr arg_ref_type make_arg_ref(fmt::detail::auto_id)
{ {
return arg_ref_type(context.next_arg_id()); return arg_ref_type(context.next_arg_id());
} }
@ -386,12 +386,12 @@ private:
spec_handler handler{*this, ctx, format_str}; spec_handler handler{*this, ctx, format_str};
// parse alignment // parse alignment
begin = fmt::internal::parse_align(begin, end, handler); begin = fmt::detail::parse_align(begin, end, handler);
if(begin == end) if(begin == end)
return {begin, begin}; return {begin, begin};
// parse width // parse width
begin = fmt::internal::parse_width(begin, end, handler); begin = fmt::detail::parse_width(begin, end, handler);
if(begin == end) if(begin == end)
return {begin, begin}; return {begin, begin};
@ -409,7 +409,7 @@ public:
constexpr auto parse(fmt::basic_format_parse_context<CharT>& ctx) constexpr auto parse(fmt::basic_format_parse_context<CharT>& ctx)
{ {
auto range = do_parse(ctx); auto range = do_parse(ctx);
format_str = fmt::basic_string_view<CharT>(&*range.begin, fmt::internal::to_unsigned(range.end - range.begin)); format_str = fmt::basic_string_view<CharT>(&*range.begin, fmt::detail::to_unsigned(range.end - range.begin));
return range.end; return range.end;
} }
@ -419,8 +419,8 @@ public:
auto begin = format_str.begin(), end = format_str.end(); auto begin = format_str.begin(), end = format_str.end();
// process dynamic width and precision // process dynamic width and precision
fmt::internal::handle_dynamic_spec<fmt::internal::width_checker>(global_specs.width, width_ref, ctx); fmt::detail::handle_dynamic_spec<fmt::detail::width_checker>(global_specs.width, width_ref, ctx);
fmt::internal::handle_dynamic_spec<fmt::internal::precision_checker>(rep_specs.precision, precision_ref, ctx); fmt::detail::handle_dynamic_spec<fmt::detail::precision_checker>(rep_specs.precision, precision_ref, ctx);
// In `global_format_buffer` we will create a global format string // In `global_format_buffer` we will create a global format string
// e.g. "{:*^10%.1Q_%q}, 1.23q_m" => "{:*^10}" // e.g. "{:*^10%.1Q_%q}, 1.23q_m" => "{:*^10}"