From 75fc3a038466963966dfd1078d3d3d25cc8a5447 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Wed, 13 Sep 2023 11:56:06 +0200 Subject: [PATCH] style: more whitespace issues caused by rebase fixed --- src/core/include/mp-units/quantity.h | 1 + src/utility/include/mp-units/math.h | 4 ---- test/unit_test/runtime/distribution_test.cpp | 12 ++++-------- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/core/include/mp-units/quantity.h b/src/core/include/mp-units/quantity.h index de70bec6..dd694342 100644 --- a/src/core/include/mp-units/quantity.h +++ b/src/core/include/mp-units/quantity.h @@ -148,6 +148,7 @@ public: { return quantity{*this}; } + template requires requires(quantity q) { value_cast(q); } [[nodiscard]] constexpr quantity force_in(U) const diff --git a/src/utility/include/mp-units/math.h b/src/utility/include/mp-units/math.h index 77c8afcd..7bdf7189 100644 --- a/src/utility/include/mp-units/math.h +++ b/src/utility/include/mp-units/math.h @@ -159,7 +159,6 @@ template template [[nodiscard]] constexpr quantity(R), Rep> floor(const quantity& q) noexcept requires((!treat_as_floating_point) || requires { floor(q.numerical_value_ref_in(q.unit)); } || - requires { std::floor(q.numerical_value_ref_in(q.unit)); }) && (To == get_unit(R) || requires { q.force_in(To); @@ -199,7 +198,6 @@ template template [[nodiscard]] constexpr quantity(R), Rep> ceil(const quantity& q) noexcept requires((!treat_as_floating_point) || requires { ceil(q.numerical_value_ref_in(q.unit)); } || - requires { std::ceil(q.numerical_value_ref_in(q.unit)); }) && (To == get_unit(R) || requires { q.force_in(To); @@ -241,7 +239,6 @@ template template [[nodiscard]] constexpr quantity(R), Rep> round(const quantity& q) noexcept requires((!treat_as_floating_point) || requires { round(q.numerical_value_ref_in(q.unit)); } || - requires { std::round(q.numerical_value_ref_in(q.unit)); }) && (To == get_unit(R) || requires { ::mp_units::floor(q); @@ -284,7 +281,6 @@ template requires requires { common_reference(R1, R2); } && ( requires { hypot(x.numerical_value_ref_in(x.unit), y.numerical_value_ref_in(y.unit)); } || - requires { std::hypot(x.numerical_value_ref_in(x.unit), y.numerical_value_ref_in(y.unit)); }) { constexpr auto ref = common_reference(R1, R2); diff --git a/test/unit_test/runtime/distribution_test.cpp b/test/unit_test/runtime/distribution_test.cpp index bbf7c5ef..5b14ae7f 100644 --- a/test/unit_test/runtime/distribution_test.cpp +++ b/test/unit_test/runtime/distribution_test.cpp @@ -559,10 +559,8 @@ TEST_CASE("piecewise_constant_distribution") 3.0 * isq::length[si::metre]}; auto stl_dist = std::piecewise_constant_distribution(intervals_rep, [](rep val) { return val; }); - auto units_dist = - - mp_units::piecewise_constant_distribution(intervals_qty, - [](q qty) { return qty.numerical_value_ref_in(qty.unit); }); + auto units_dist = mp_units::piecewise_constant_distribution( + intervals_qty, [](q qty) { return qty.numerical_value_ref_in(qty.unit); }); CHECK(units_dist.intervals() == intervals_qty_vec); CHECK(units_dist.densities() == stl_dist.densities()); @@ -629,10 +627,8 @@ TEST_CASE("piecewise_linear_distribution") 3.0 * isq::length[si::metre]}; auto stl_dist = std::piecewise_linear_distribution(intervals_rep, [](rep val) { return val; }); - auto units_dist = - - mp_units::piecewise_linear_distribution(intervals_qty, - [](q qty) { return qty.numerical_value_ref_in(qty.unit); }); + auto units_dist = mp_units::piecewise_linear_distribution( + intervals_qty, [](q qty) { return qty.numerical_value_ref_in(qty.unit); }); CHECK(units_dist.intervals() == intervals_qty_vec); CHECK(units_dist.densities() == stl_dist.densities());