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

fmt and catch2 updated to the latest versions

Browse Source
This commit is contained in:
Mateusz Pusz
2019-12-11 08:22:12 +01:00
parent bc1901f4f0
commit 9e34050e23
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
conanfile.py
View File

@@ -47,10 +47,10 @@ class UnitsConan(ConanFile):
exports_sources = ["src/*", "test/*", "cmake/*", "example/*","CMakeLists.txt"] exports_sources = ["src/*", "test/*", "cmake/*", "example/*","CMakeLists.txt"]
settings = "os", "compiler", "build_type", "arch" settings = "os", "compiler", "build_type", "arch"
requires = ( requires = (
"fmt/6.0.0" "fmt/6.1.0"
) )
build_requires = ( build_requires = (
"Catch2/2.10.0@catchorg/stable" "Catch2/2.11.0@catchorg/stable"
) )
generators = "cmake" generators = "cmake"

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

@@ -159,7 +159,7 @@ template<typename Dimension, typename Unit, typename Rep, typename CharT>
struct fmt::formatter<units::quantity<Dimension, Unit, Rep>, CharT> { 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_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::internal::arg_ref<CharT>;
fmt::basic_format_specs<CharT> specs; fmt::basic_format_specs<CharT> specs;
@@ -172,7 +172,7 @@ private:
struct spec_handler { struct spec_handler {
formatter& f; formatter& f;
fmt::basic_parse_context<CharT>& context; fmt::basic_format_parse_context<CharT>& context;
fmt::basic_string_view<CharT> format_str; fmt::basic_string_view<CharT> format_str;
template<typename Id> template<typename Id>
@@ -185,8 +185,7 @@ private:
constexpr arg_ref_type make_arg_ref(fmt::basic_string_view<CharT> arg_id) constexpr arg_ref_type make_arg_ref(fmt::basic_string_view<CharT> arg_id)
{ {
context.check_arg_id(arg_id); context.check_arg_id(arg_id);
const auto str_val = fmt::internal::string_view_metadata(format_str, arg_id); return arg_ref_type(arg_id);
return arg_ref_type(str_val);
} }
constexpr arg_ref_type make_arg_ref(fmt::internal::auto_id) constexpr arg_ref_type make_arg_ref(fmt::internal::auto_id)
@@ -226,7 +225,7 @@ private:
iterator end; iterator end;
}; };
constexpr parse_range do_parse(fmt::basic_parse_context<CharT>& ctx) constexpr parse_range do_parse(fmt::basic_format_parse_context<CharT>& ctx)
{ {
auto begin = ctx.begin(), end = ctx.end(); auto begin = ctx.begin(), end = ctx.end();
if(begin == end || *begin == '}') if(begin == end || *begin == '}')
@@ -285,7 +284,7 @@ private:
} }
public: public:
constexpr auto parse(fmt::basic_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::internal::to_unsigned(range.end - range.begin));
@@ -302,8 +301,8 @@ public:
auto out = std::back_inserter(buf); auto out = std::back_inserter(buf);
// process dynamic width and precision // process dynamic width and precision
fmt::internal::handle_dynamic_spec<fmt::internal::width_checker>(specs.width, width_ref, ctx, format_str.begin()); fmt::internal::handle_dynamic_spec<fmt::internal::width_checker>(specs.width, width_ref, ctx);
fmt::internal::handle_dynamic_spec<fmt::internal::precision_checker>(precision, precision_ref, ctx, format_str.begin()); fmt::internal::handle_dynamic_spec<fmt::internal::precision_checker>(precision, precision_ref, ctx);
// deal with quantity content // deal with quantity content
if(begin == end || *begin == '}') { if(begin == end || *begin == '}') {