mpusz/mp-units
1
0
Fork 1
mirror of https://github.com/mpusz/mp-units.git synced 2025-08-03 04:14:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: VS2022 issues related to the std::string_view iterator fixed

Browse Source
This commit is contained in:
Mateusz Pusz
2021-11-15 13:57:47 +01:00
parent a09cef4a3f
commit 57ec615d79
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -352,7 +352,7 @@ template<std::input_iterator It, std::sentinel_for<It> S, typename Handler>
if (p != begin) { if (p != begin) {
auto c = *begin; auto c = *begin;
if (c == '{') throw STD_FMT::format_error("invalid fill character '{'"); if (c == '{') throw STD_FMT::format_error("invalid fill character '{'");
handler.on_fill(std::basic_string_view<std::iter_value_t<It>>(begin, static_cast<size_t>(p - begin))); handler.on_fill(std::basic_string_view<std::iter_value_t<It>>(&*begin, static_cast<size_t>(p - begin)));
begin = p + 1; begin = p + 1;
} else } else
++begin; ++begin;

14
src/core-fmt/include/units/format.h
View File

@@ -305,7 +305,7 @@ template<typename Dimension, typename Unit, typename Rep, typename CharT>
struct STD_FMT::formatter<units::quantity<Dimension, Unit, Rep>, CharT> { struct STD_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 = TYPENAME STD_FMT::basic_format_parse_context<CharT>::iterator; using const_iterator = TYPENAME STD_FMT::basic_format_parse_context<CharT>::const_iterator;
bool quantity_value = false; bool quantity_value = false;
bool quantity_unit = false; bool quantity_unit = false;
@@ -356,12 +356,16 @@ private:
f.specs.rep.dynamic_precision_index = units::detail::on_dynamic_arg(t, context); f.specs.rep.dynamic_precision_index = units::detail::on_dynamic_arg(t, context);
} }
constexpr void on_text(const CharT*, const CharT*) {} template<std::input_iterator It, std::sentinel_for<It> S>
constexpr void on_quantity_value(const CharT* begin, const CharT* end) constexpr void on_text(It, S) {}
template<std::input_iterator It, std::sentinel_for<It> S>
constexpr void on_quantity_value(It begin, S end)
{ {
if (begin != end) units::detail::parse_units_rep(begin, end, *this, units::treat_as_floating_point<Rep>); if (begin != end) units::detail::parse_units_rep(begin, end, *this, units::treat_as_floating_point<Rep>);
f.quantity_value = true; f.quantity_value = true;
} }
constexpr void on_quantity_unit(CharT mod) constexpr void on_quantity_unit(CharT mod)
{ {
if (mod != 'q') on_unit_modifier(mod); if (mod != 'q') on_unit_modifier(mod);
@@ -369,7 +373,7 @@ private:
} }
}; };
[[nodiscard]] constexpr std::pair<iterator, iterator> do_parse(STD_FMT::basic_format_parse_context<CharT>& ctx) [[nodiscard]] constexpr std::pair<const_iterator, const_iterator> do_parse(STD_FMT::basic_format_parse_context<CharT>& ctx)
{ {
auto begin = ctx.begin(); auto begin = ctx.begin();
auto end = ctx.end(); auto end = ctx.end();
@@ -423,7 +427,7 @@ public:
[[nodiscard]] constexpr auto parse(STD_FMT::basic_format_parse_context<CharT>& ctx) [[nodiscard]] constexpr auto parse(STD_FMT::basic_format_parse_context<CharT>& ctx)
{ {
auto range = do_parse(ctx); auto range = do_parse(ctx);
format_str = std::basic_string_view<CharT>(range.first, static_cast<size_t>(range.second - range.first)); format_str = std::basic_string_view<CharT>(&*range.first, static_cast<size_t>(range.second - range.first));
return range.second; return range.second;
} }