wirtz
/
FixedPointsArduino
mirror of https://github.com/Pharap/FixedPointsArduino.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Add workaround for gcc bug 58541 (#9)

Browse Source 
The bug in question causes a "redeclaration differs in constexpr" error, despite the standard not requiring this.
This bug is fixed in newer versions of gcc.
More information can be found [here](https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58541).
pull/10/merge
Pharap 7 years ago committed by GitHub
parent feb58a200d
commit 952a8594d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 66 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 41
      src/FixedPoints/SFixed.h
  2. 41
      src/FixedPoints/UFixed.h

41
src/FixedPoints/SFixed.h
Unescape View File

@ -89,41 +89,16 @@ public:
SFixed & operator /=(const SFixed & other); SFixed & operator /=(const SFixed & other);
public: public:
const static SFixed Epsilon; constexpr const static SFixed Epsilon = SFixed::fromInternal(1);
const static SFixed MinValue; constexpr const static SFixed MinValue = SFixed::fromInternal(FIXED_POINTS_DETAILS::MsbMask<InternalSize>::Value);
const static SFixed MaxValue; constexpr const static SFixed MaxValue = SFixed::fromInternal(~FIXED_POINTS_DETAILS::MsbMask<InternalSize>::Value);
const static SFixed Pi;
const static SFixed E;
const static SFixed Phi;
const static SFixed Tau;
};
//
// Variables
//
template< unsigned Integer, unsigned Fraction >
constexpr const SFixed<Integer, Fraction> SFixed<Integer, Fraction>::Epsilon = SFixed<Integer, Fraction>::fromInternal(1);
template< unsigned Integer, unsigned Fraction >
constexpr const SFixed<Integer, Fraction> SFixed<Integer, Fraction>::MinValue = SFixed::fromInternal(FIXED_POINTS_DETAILS::MsbMask<InternalSize>::Value);
template< unsigned Integer, unsigned Fraction >
constexpr const SFixed<Integer, Fraction> SFixed<Integer, Fraction>::MaxValue = SFixed::fromInternal(~FIXED_POINTS_DETAILS::MsbMask<InternalSize>::Value);
// 40 digits is probably enough for these // 40 digits is probably enough for these
template< unsigned Integer, unsigned Fraction > constexpr const static SFixed Pi = 3.1415926535897932384626433832795028841971;
constexpr const SFixed<Integer, Fraction> SFixed<Integer, Fraction>::Pi = 3.1415926535897932384626433832795028841971; constexpr const static SFixed E = 2.718281828459045235360287471352662497757;
constexpr const static SFixed Phi = 1.6180339887498948482045868343656381177203;
template< unsigned Integer, unsigned Fraction > constexpr const static SFixed Tau = 6.2831853071795864769252867665590057683943;
constexpr const SFixed<Integer, Fraction> SFixed<Integer, Fraction>::E = 2.718281828459045235360287471352662497757; };
template< unsigned Integer, unsigned Fraction >
constexpr const SFixed<Integer, Fraction> SFixed<Integer, Fraction>::Phi = 1.6180339887498948482045868343656381177203;
template< unsigned Integer, unsigned Fraction >
constexpr const SFixed<Integer, Fraction> SFixed<Integer, Fraction>::Tau = 6.2831853071795864769252867665590057683943;
// //

41
src/FixedPoints/UFixed.h
Unescape View File

@ -88,41 +88,16 @@ public:
UFixed & operator /=(const UFixed & other); UFixed & operator /=(const UFixed & other);
public: public:
const static UFixed Epsilon; constexpr const static UFixed Epsilon = UFixed::fromInternal(1);
const static UFixed MinValue; constexpr const static UFixed MinValue = UFixed::fromInternal(0);
const static UFixed MaxValue; constexpr const static UFixed MaxValue = UFixed::fromInternal(~0);
const static UFixed Pi;
const static UFixed E;
const static UFixed Phi;
const static UFixed Tau;
};
//
// Variables
//
template< unsigned Integer, unsigned Fraction >
constexpr const UFixed<Integer, Fraction> UFixed<Integer, Fraction>::Epsilon = UFixed<Integer, Fraction>::fromInternal(1);
template< unsigned Integer, unsigned Fraction >
constexpr const UFixed<Integer, Fraction> UFixed<Integer, Fraction>::MinValue = UFixed::fromInternal(0);
template< unsigned Integer, unsigned Fraction >
constexpr const UFixed<Integer, Fraction> UFixed<Integer, Fraction>::MaxValue = UFixed::fromInternal(~0);
// 40 digits is probably enough for these // 40 digits is probably enough for these
template< unsigned Integer, unsigned Fraction > constexpr const static UFixed Pi = 3.1415926535897932384626433832795028841971;
constexpr const UFixed<Integer, Fraction> UFixed<Integer, Fraction>::Pi = 3.1415926535897932384626433832795028841971; constexpr const static UFixed E = 2.718281828459045235360287471352662497757;
constexpr const static UFixed Phi = 1.6180339887498948482045868343656381177203;
template< unsigned Integer, unsigned Fraction > constexpr const static UFixed Tau = 6.2831853071795864769252867665590057683943;
constexpr const UFixed<Integer, Fraction> UFixed<Integer, Fraction>::E = 2.718281828459045235360287471352662497757; };
template< unsigned Integer, unsigned Fraction >
constexpr const UFixed<Integer, Fraction> UFixed<Integer, Fraction>::Phi = 1.6180339887498948482045868343656381177203;
template< unsigned Integer, unsigned Fraction >
constexpr const UFixed<Integer, Fraction> UFixed<Integer, Fraction>::Tau = 6.2831853071795864769252867665590057683943;
// //

Write Preview
Loading…
Cancel
Save