From 392a029ef4d162eb14bc3f32f86e422d9bf5d232 Mon Sep 17 00:00:00 2001 From: arades79 Date: Sat, 11 Feb 2023 13:57:59 -0500 Subject: don't use static inside constexpr function Signed-off-by: arades79 --- src/common/fixed_point.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/common/fixed_point.h b/src/common/fixed_point.h index 29b80c328..f899b0d54 100644 --- a/src/common/fixed_point.h +++ b/src/common/fixed_point.h @@ -107,7 +107,7 @@ constexpr FixedPoint divide( using next_type = typename FixedPoint::next_type; using base_type = typename FixedPoint::base_type; - constexpr static size_t fractional_bits = FixedPoint::fractional_bits; + constexpr size_t fractional_bits = FixedPoint::fractional_bits; next_type t(numerator.to_raw()); t <<= fractional_bits; @@ -127,7 +127,7 @@ constexpr FixedPoint divide( using unsigned_type = typename FixedPoint::unsigned_type; - constexpr static int bits = FixedPoint::total_bits; + constexpr int bits = FixedPoint::total_bits; if (denominator == 0) { throw divide_by_zero(); @@ -198,7 +198,7 @@ constexpr FixedPoint multiply( using next_type = typename FixedPoint::next_type; using base_type = typename FixedPoint::base_type; - constexpr static size_t fractional_bits = FixedPoint::fractional_bits; + constexpr size_t fractional_bits = FixedPoint::fractional_bits; next_type t(static_cast(lhs.to_raw()) * static_cast(rhs.to_raw())); t >>= fractional_bits; @@ -216,9 +216,9 @@ constexpr FixedPoint multiply( using base_type = typename FixedPoint::base_type; - constexpr static size_t fractional_bits = FixedPoint::fractional_bits; - constexpr static base_type integer_mask = FixedPoint::integer_mask; - constexpr static base_type fractional_mask = FixedPoint::fractional_mask; + constexpr size_t fractional_bits = FixedPoint::fractional_bits; + constexpr base_type integer_mask = FixedPoint::integer_mask; + constexpr base_type fractional_mask = FixedPoint::fractional_mask; // more costly but doesn't need a larger type const base_type a_hi = (lhs.to_raw() & integer_mask) >> fractional_bits; -- cgit v1.2.3