From 0cebb68e2e6d659bcf4cf6a4f711b2e50e00091d Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Fri, 3 Feb 2023 16:58:33 +0100 Subject: [PATCH] fix: broken concept names fixed --- example/hello_units.cpp | 2 +- example/measurement.cpp | 2 +- example/strong_angular_quantities.cpp | 2 +- example/total_energy.cpp | 18 +++++++++--------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/example/hello_units.cpp b/example/hello_units.cpp index 227c67aa..a40be5cb 100644 --- a/example/hello_units.cpp +++ b/example/hello_units.cpp @@ -29,7 +29,7 @@ using namespace mp_units; -constexpr quantity_of auto avg_speed(quantity_of auto d, quantity_of auto t) +constexpr QuantityOf auto avg_speed(QuantityOf auto d, QuantityOf auto t) { return quantity_cast(d / t); } diff --git a/example/measurement.cpp b/example/measurement.cpp index 17e51c16..c304d26c 100644 --- a/example/measurement.cpp +++ b/example/measurement.cpp @@ -134,7 +134,7 @@ void example() const auto a = isq::acceleration(measurement{9.8, 0.1}, m / s2); const auto t = isq::time(measurement{1.2, 0.1}, s); - const weak_quantity_of auto v = a * t; + const WeakQuantityOf auto v = a * t; std::cout << a << " * " << t << " = " << v << " = " << v[km / h] << '\n'; const auto length = isq::length(measurement{123., 1.}, si::metre); diff --git a/example/strong_angular_quantities.cpp b/example/strong_angular_quantities.cpp index 5bb360d4..1b5f9ed3 100644 --- a/example/strong_angular_quantities.cpp +++ b/example/strong_angular_quantities.cpp @@ -41,7 +41,7 @@ int main() const auto lever = isq_angle::position_vector[cm](20); const auto force = isq_angle::force[N](500); const auto angle = isq_angle::angular_measure[deg](90.); - const weak_quantity_of auto torque = + const WeakQuantityOf auto torque = lever * force * angular::sin(angle) / isq_angle::cotes_angle(1); std::cout << "Applying a perpendicular force of " << force << " to a " << lever << " long lever results in " diff --git a/example/total_energy.cpp b/example/total_energy.cpp index 1a74e6ed..fca518a4 100644 --- a/example/total_energy.cpp +++ b/example/total_energy.cpp @@ -37,9 +37,9 @@ namespace { using namespace mp_units; -quantity_of auto total_energy(weak_quantity_of auto p, - weak_quantity_of auto m, - weak_quantity_of auto c) +QuantityOf auto total_energy(WeakQuantityOf auto p, + WeakQuantityOf auto m, + WeakQuantityOf auto c) { return quantity_cast(sqrt(pow<2>(p * c) + pow<2>(m * pow<2>(c)))); } @@ -49,9 +49,9 @@ void si_example() using namespace mp_units::si::unit_symbols; constexpr auto GeV = si::giga; - constexpr quantity_of auto c = si::si2019::speed_of_light_in_vacuum(1.); - const weak_quantity_of auto p1 = isq::mechanical_energy(4., GeV) / c; - const weak_quantity_of auto m1 = isq::mechanical_energy(3., GeV) / pow<2>(c); + constexpr QuantityOf auto c = si::si2019::speed_of_light_in_vacuum(1.); + const WeakQuantityOf auto p1 = isq::mechanical_energy(4., GeV) / c; + const WeakQuantityOf auto m1 = isq::mechanical_energy(3., GeV) / pow<2>(c); const auto E = total_energy(p1, m1, c); std::cout << "\n*** SI units (c = " << c << " = " << c[si::metre / s] << ") ***\n"; @@ -88,9 +88,9 @@ void natural_example() using namespace mp_units::natural; using namespace mp_units::natural::unit_symbols; - constexpr quantity_of auto c = 1. * speed_of_light_in_vacuum; - const quantity_of auto p = 4. * momentum[GeV]; - const quantity_of auto m = 3. * mass[GeV]; + constexpr QuantityOf auto c = 1. * speed_of_light_in_vacuum; + const QuantityOf auto p = 4. * momentum[GeV]; + const QuantityOf auto m = 3. * mass[GeV]; const auto E = total_energy(p, m, c); std::cout << "\n*** Natural units (c = " << c << ") ***\n"