diff --git a/src/Math/MathTypeTraits.h b/src/Math/MathTypeTraits.h index 2b54f8e3a..385fc8a0e 100644 --- a/src/Math/MathTypeTraits.h +++ b/src/Math/MathTypeTraits.h @@ -56,14 +56,6 @@ template struct MathTypeTraits { */ #ifdef DOXYGEN_GENERATING_OUTPUT - /** - * @brief Corresponding numeric type large at least as 32bit integer - * - * Usable e.g. to prevent conversion of `char` to characters when printing - * numeric types to output. - */ - typedef U NumericType; - /** * @brief Corresponding floating-point type for normalization * @@ -123,49 +115,39 @@ template struct MathTypeTraitsFloatingPoint { } template<> struct MathTypeTraits: Implementation::MathTypeTraitsIntegral { - typedef std::uint32_t NumericType; typedef float FloatingPointType; }; template<> struct MathTypeTraits: Implementation::MathTypeTraitsIntegral { - typedef std::int32_t NumericType; typedef float FloatingPointType; }; template<> struct MathTypeTraits: Implementation::MathTypeTraitsIntegral { - typedef std::uint32_t NumericType; typedef float FloatingPointType; }; template<> struct MathTypeTraits: Implementation::MathTypeTraitsIntegral { - typedef std::int32_t NumericType; typedef float FloatingPointType; }; template<> struct MathTypeTraits: Implementation::MathTypeTraitsIntegral { - typedef std::uint32_t NumericType; typedef double FloatingPointType; }; template<> struct MathTypeTraits: Implementation::MathTypeTraitsIntegral { - typedef std::int32_t NumericType; typedef double FloatingPointType; }; template<> struct MathTypeTraits: Implementation::MathTypeTraitsIntegral { - typedef std::uint64_t NumericType; typedef long double FloatingPointType; }; template<> struct MathTypeTraits: Implementation::MathTypeTraitsIntegral { - typedef std::int64_t NumericType; typedef long double FloatingPointType; }; template<> struct MathTypeTraits: Implementation::MathTypeTraitsFloatingPoint { - typedef float NumericType; typedef float FloatingPointType; inline constexpr static float epsilon() { return FLOAT_EQUALITY_PRECISION; } }; template<> struct MathTypeTraits: Implementation::MathTypeTraitsFloatingPoint { - typedef float NumericType; typedef double FloatingPointType; inline constexpr static double epsilon() { return DOUBLE_EQUALITY_PRECISION; } diff --git a/src/Math/RectangularMatrix.h b/src/Math/RectangularMatrix.h index 46b133290..4bed38856 100644 --- a/src/Math/RectangularMatrix.h +++ b/src/Math/RectangularMatrix.h @@ -424,7 +424,7 @@ template Corrade::Utility::Debug op if(row != 0) debug << ",\n "; for(std::size_t col = 0; col != cols; ++col) { if(col != 0) debug << ", "; - debug << typename MathTypeTraits::NumericType(value[col][row]); + debug << value[col][row]; } } debug << ")"; diff --git a/src/Math/Vector.h b/src/Math/Vector.h index 483f335b5..eed04f4dd 100644 --- a/src/Math/Vector.h +++ b/src/Math/Vector.h @@ -324,7 +324,7 @@ template Corrade::Utility::Debug operator<<(Corrade:: debug.setFlag(Corrade::Utility::Debug::SpaceAfterEachValue, false); for(std::size_t i = 0; i != size; ++i) { if(i != 0) debug << ", "; - debug << typename MathTypeTraits::NumericType(value[i]); + debug << value[i]; } debug << ")"; debug.setFlag(Corrade::Utility::Debug::SpaceAfterEachValue, true);