From ca7762177fd07e41596409076c1ed1a5a2dda25a Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Fri, 19 Mar 2021 07:01:12 +0100 Subject: [PATCH] refactor: `quantity::value_` renamed to `quantity::number_` Refers to #259 --- src/core/include/units/quantity.h | 34 +++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/core/include/units/quantity.h b/src/core/include/units/quantity.h index 1eeff3e3..a72af05e 100644 --- a/src/core/include/units/quantity.h +++ b/src/core/include/units/quantity.h @@ -106,7 +106,7 @@ using quantity_like_type = quantity::dimension, */ template U, QuantityValue Rep = double> class quantity { - Rep value_; + Rep number_; public: // member types and values using dimension = D; @@ -146,10 +146,10 @@ public: template Value> constexpr explicit(!(is_same_v && is_same_v)) - quantity(const Value& v) : value_(v) {} + quantity(const Value& v) : number_(v) {} template Q> - constexpr explicit(false) quantity(const Q& q) : value_(quantity_cast(q).number()) {} + constexpr explicit(false) quantity(const Q& q) : number_(quantity_cast(q).number()) {} template requires safe_castable_to_, quantity> @@ -159,7 +159,7 @@ public: quantity& operator=(quantity&&) = default; // data access - [[nodiscard]] constexpr rep number() const noexcept { return value_; } + [[nodiscard]] constexpr rep number() const noexcept { return number_; } // member unary operators [[nodiscard]] constexpr Quantity auto operator+() const @@ -179,40 +179,40 @@ public: constexpr quantity& operator++() requires requires(rep v) { { ++v } -> std::same_as; } { - ++value_; + ++number_; return *this; } [[nodiscard]] constexpr quantity operator++(int) requires requires(rep v) { { v++ } -> std::same_as; } { - return quantity(value_++); + return quantity(number_++); } constexpr quantity& operator--() requires requires(rep v) { { --v } -> std::same_as; } { - --value_; + --number_; return *this; } [[nodiscard]] constexpr quantity operator--(int) requires requires(rep v) { { v-- } -> std::same_as; } { - return quantity(value_--); + return quantity(number_--); } constexpr quantity& operator+=(const quantity& q) requires requires(rep a, rep b) { { a += b } -> std::same_as; } { - value_ += q.number(); + number_ += q.number(); return *this; } constexpr quantity& operator-=(const quantity& q) requires requires(rep a, rep b) { { a -= b } -> std::same_as; } { - value_ -= q.number(); + number_ -= q.number(); return *this; } @@ -220,14 +220,14 @@ public: constexpr quantity& operator*=(const Rep2& rhs) requires requires(rep a, const Rep2 b) { { a *= b } -> std::same_as; } { - value_ *= rhs; + number_ *= rhs; return *this; } template constexpr quantity& operator*=(const dimensionless& rhs) requires requires(rep a, const Rep2 b) { { a *= b } -> std::same_as; } { - value_ *= rhs.number(); + number_ *= rhs.number(); return *this; } @@ -236,7 +236,7 @@ public: requires requires(rep a, const Rep2 b) { { a /= b } -> std::same_as; } { gsl_ExpectsAudit(rhs != quantity_values::zero()); - value_ /= rhs; + number_ /= rhs; return *this; } template @@ -244,7 +244,7 @@ public: requires requires(rep a, const Rep2 b) { { a /= b } -> std::same_as; } { gsl_ExpectsAudit(rhs.number() != quantity_values::zero()); - value_ /= rhs.number(); + number_ /= rhs.number(); return *this; } @@ -254,7 +254,7 @@ public: requires(rep a, const Rep2 b) { { a %= b } -> std::same_as; } { gsl_ExpectsAudit(rhs != quantity_values::zero()); - value_ %= rhs; + number_ %= rhs; return *this; } @@ -264,7 +264,7 @@ public: requires(rep a, const Rep2 b) { { a %= b } -> std::same_as; } { gsl_ExpectsAudit(rhs.number() != quantity_values::zero()); - value_ %= rhs.number(); + number_ %= rhs.number(); return *this; } @@ -273,7 +273,7 @@ public: requires(rep a, rep b) { { a %= b } -> std::same_as; } { gsl_ExpectsAudit(q.number() != quantity_values::zero()); - value_ %= q.number(); + number_ %= q.number(); return *this; }