From 080ffa2f5dec31f53a0befc0e23c62fa104603e6 Mon Sep 17 00:00:00 2001 From: Pharap <2933055+Pharap@users.noreply.github.com> Date: Mon, 30 Sep 2019 18:48:59 +0100 Subject: [PATCH] Remove redundant consts (#64) Remove consts where constexpr is also in effect as constexpr implies const. --- src/FixedPoints/Details.h | 6 +++--- src/FixedPoints/SFixed.h | 38 +++++++++++++++++++------------------- src/FixedPoints/UFixed.h | 38 +++++++++++++++++++------------------- 3 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/FixedPoints/Details.h b/src/FixedPoints/Details.h index e0e4edf..02b3e25 100644 --- a/src/FixedPoints/Details.h +++ b/src/FixedPoints/Details.h @@ -119,21 +119,21 @@ namespace FIXED_POINTS_DETAILS struct MsbMask { MsbMask() = delete; - constexpr const static LeastUInt Value = (1ull << (Bits - 1)); + constexpr static LeastUInt Value = (1ull << (Bits - 1)); }; template< unsigned Bits > struct IdentityMask { IdentityMask() = delete; - constexpr const static LeastUInt Value = 1 | (IdentityMask::Value << 1); + constexpr static LeastUInt Value = 1 | (IdentityMask::Value << 1); }; template<> struct IdentityMask<0> { IdentityMask() = delete; - constexpr const static LeastUInt<0> Value = 0; + constexpr static LeastUInt<0> Value = 0; }; #if !defined(FIXED_POINTS_NO_RANDOM) diff --git a/src/FixedPoints/SFixed.h b/src/FixedPoints/SFixed.h index 7a0349f..9ab7201 100644 --- a/src/FixedPoints/SFixed.h +++ b/src/FixedPoints/SFixed.h @@ -26,10 +26,10 @@ template< unsigned Integer, unsigned Fraction > class SFixed { public: - constexpr const static uintmax_t IntegerSize = Integer + 1; - constexpr const static uintmax_t FractionSize = Fraction; - constexpr const static uintmax_t LogicalSize = IntegerSize + FractionSize; - constexpr const static uintmax_t Scale = UINTMAX_C(1) << FractionSize; + constexpr static uintmax_t IntegerSize = Integer + 1; + constexpr static uintmax_t FractionSize = Fraction; + constexpr static uintmax_t LogicalSize = IntegerSize + FractionSize; + constexpr static uintmax_t Scale = UINTMAX_C(1) << FractionSize; public: static_assert(LogicalSize <= FIXED_POINTS_DETAILS::BitSize::Value, "Platform does not have a native type large enough for SFixed."); @@ -39,22 +39,22 @@ public: using FractionType = FIXED_POINTS_DETAILS::LeastUInt; using InternalType = FIXED_POINTS_DETAILS::LeastInt; - constexpr const static uintmax_t InternalSize = FIXED_POINTS_DETAILS::BitSize::Value; + constexpr static uintmax_t InternalSize = FIXED_POINTS_DETAILS::BitSize::Value; using ShiftType = FIXED_POINTS_DETAILS::LeastUInt; using MaskType = FIXED_POINTS_DETAILS::LeastUInt; public: - constexpr const static ShiftType IntegerShift = FractionSize; - constexpr const static ShiftType FractionShift = 0; + constexpr static ShiftType IntegerShift = FractionSize; + constexpr static ShiftType FractionShift = 0; - constexpr const static MaskType IntegerMask = FIXED_POINTS_DETAILS::IdentityMask::Value; - constexpr const static MaskType FractionMask = FIXED_POINTS_DETAILS::IdentityMask::Value; + constexpr static MaskType IntegerMask = FIXED_POINTS_DETAILS::IdentityMask::Value; + constexpr static MaskType FractionMask = FIXED_POINTS_DETAILS::IdentityMask::Value; - constexpr const static MaskType IdentityMask = (IntegerMask << IntegerShift) | (FractionMask << FractionShift); + constexpr static MaskType IdentityMask = (IntegerMask << IntegerShift) | (FractionMask << FractionShift); - constexpr const static MaskType MidpointMask = FIXED_POINTS_DETAILS::MsbMask::Value; - constexpr const static MaskType LesserMidpointMask = MidpointMask - 1; + constexpr static MaskType MidpointMask = FIXED_POINTS_DETAILS::MsbMask::Value; + constexpr static MaskType LesserMidpointMask = MidpointMask - 1; protected: class RawType @@ -114,15 +114,15 @@ public: SFixed & operator /=(const SFixed & other); public: - constexpr const static SFixed Epsilon = SFixed::fromInternal(1); - constexpr const static SFixed MinValue = SFixed::fromInternal(FIXED_POINTS_DETAILS::MsbMask::Value); - constexpr const static SFixed MaxValue = SFixed::fromInternal(~FIXED_POINTS_DETAILS::MsbMask::Value); + constexpr static SFixed Epsilon = SFixed::fromInternal(1); + constexpr static SFixed MinValue = SFixed::fromInternal(FIXED_POINTS_DETAILS::MsbMask::Value); + constexpr static SFixed MaxValue = SFixed::fromInternal(~FIXED_POINTS_DETAILS::MsbMask::Value); // 40 digits is probably enough for these - constexpr const static SFixed Pi = 3.1415926535897932384626433832795028841971; - constexpr const static SFixed E = 2.718281828459045235360287471352662497757; - constexpr const static SFixed Phi = 1.6180339887498948482045868343656381177203; - constexpr const static SFixed Tau = 6.2831853071795864769252867665590057683943; + constexpr static SFixed Pi = 3.1415926535897932384626433832795028841971; + constexpr static SFixed E = 2.718281828459045235360287471352662497757; + constexpr static SFixed Phi = 1.6180339887498948482045868343656381177203; + constexpr static SFixed Tau = 6.2831853071795864769252867665590057683943; }; diff --git a/src/FixedPoints/UFixed.h b/src/FixedPoints/UFixed.h index bcb5c94..c7b77e4 100644 --- a/src/FixedPoints/UFixed.h +++ b/src/FixedPoints/UFixed.h @@ -26,10 +26,10 @@ template< unsigned Integer, unsigned Fraction > class UFixed { public: - constexpr const static uintmax_t IntegerSize = Integer; - constexpr const static uintmax_t FractionSize = Fraction; - constexpr const static uintmax_t LogicalSize = IntegerSize + FractionSize; - constexpr const static uintmax_t Scale = UINTMAX_C(1) << FractionSize; + constexpr static uintmax_t IntegerSize = Integer; + constexpr static uintmax_t FractionSize = Fraction; + constexpr static uintmax_t LogicalSize = IntegerSize + FractionSize; + constexpr static uintmax_t Scale = UINTMAX_C(1) << FractionSize; public: static_assert(LogicalSize <= FIXED_POINTS_DETAILS::BitSize::Value, "Platform does not have a native type large enough for UFixed."); @@ -39,22 +39,22 @@ public: using FractionType = FIXED_POINTS_DETAILS::LeastUInt; using InternalType = FIXED_POINTS_DETAILS::LeastUInt; - constexpr const static uintmax_t InternalSize = FIXED_POINTS_DETAILS::BitSize::Value; + constexpr static uintmax_t InternalSize = FIXED_POINTS_DETAILS::BitSize::Value; using ShiftType = FIXED_POINTS_DETAILS::LeastUInt; using MaskType = FIXED_POINTS_DETAILS::LeastUInt; public: - constexpr const static ShiftType IntegerShift = FractionSize; - constexpr const static ShiftType FractionShift = 0; + constexpr static ShiftType IntegerShift = FractionSize; + constexpr static ShiftType FractionShift = 0; - constexpr const static MaskType IntegerMask = FIXED_POINTS_DETAILS::IdentityMask::Value; - constexpr const static MaskType FractionMask = FIXED_POINTS_DETAILS::IdentityMask::Value; + constexpr static MaskType IntegerMask = FIXED_POINTS_DETAILS::IdentityMask::Value; + constexpr static MaskType FractionMask = FIXED_POINTS_DETAILS::IdentityMask::Value; - constexpr const static MaskType IdentityMask = (IntegerMask << IntegerShift) | (FractionMask << FractionShift); + constexpr static MaskType IdentityMask = (IntegerMask << IntegerShift) | (FractionMask << FractionShift); - constexpr const static MaskType MidpointMask = FIXED_POINTS_DETAILS::MsbMask::Value; - constexpr const static MaskType LesserMidpointMask = MidpointMask - 1; + constexpr static MaskType MidpointMask = FIXED_POINTS_DETAILS::MsbMask::Value; + constexpr static MaskType LesserMidpointMask = MidpointMask - 1; protected: class RawType @@ -114,15 +114,15 @@ public: UFixed & operator /=(const UFixed & other); public: - constexpr const static UFixed Epsilon = UFixed::fromInternal(1); - constexpr const static UFixed MinValue = UFixed::fromInternal(0); - constexpr const static UFixed MaxValue = UFixed::fromInternal(~0); + constexpr static UFixed Epsilon = UFixed::fromInternal(1); + constexpr static UFixed MinValue = UFixed::fromInternal(0); + constexpr static UFixed MaxValue = UFixed::fromInternal(~0); // 40 digits is probably enough for these - constexpr const static UFixed Pi = 3.1415926535897932384626433832795028841971; - constexpr const static UFixed E = 2.718281828459045235360287471352662497757; - constexpr const static UFixed Phi = 1.6180339887498948482045868343656381177203; - constexpr const static UFixed Tau = 6.2831853071795864769252867665590057683943; + constexpr static UFixed Pi = 3.1415926535897932384626433832795028841971; + constexpr static UFixed E = 2.718281828459045235360287471352662497757; + constexpr static UFixed Phi = 1.6180339887498948482045868343656381177203; + constexpr static UFixed Tau = 6.2831853071795864769252867665590057683943; };