From c6f892fc6663bca73ee331abd9e31f3d759edca9 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 6 Oct 2022 23:48:53 +0100 Subject: [PATCH] Changed scaling template parameter --- include/etl/scaled_rounding.h | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/include/etl/scaled_rounding.h b/include/etl/scaled_rounding.h index ff875acbf..d8a97da34 100644 --- a/include/etl/scaled_rounding.h +++ b/include/etl/scaled_rounding.h @@ -37,14 +37,13 @@ SOFTWARE. namespace etl { - template struct scaled_rounding_t { typedef typename etl::conditional::value, int32_t, uint32_t>::type type; }; - //***************************************************************************** + //***************************************************************************** /// A set of rounding algorithms for scaled integrals. /// \tparam T The integral type. /// \tparam SCALING The scaling factor. @@ -64,7 +63,7 @@ namespace etl /// \param value Scaled integral. /// \return Unscaled, rounded integral. //*************************************************************************** - template + template T round_ceiling_unscaled(T value) { ETL_STATIC_ASSERT(etl::is_integral::value, "Type must be an integral"); @@ -85,7 +84,7 @@ namespace etl /// \param value Scaled integral. /// \return Scaled, rounded integral. //*************************************************************************** - template + template T round_ceiling_scaled(T value) { typedef typename scaled_rounding_t::type scale_t; @@ -98,7 +97,7 @@ namespace etl /// \param value Scaled integral. /// \return Unscaled, rounded integral. //*************************************************************************** - template + template T round_floor_unscaled(T value) { ETL_STATIC_ASSERT(etl::is_integral::value, "Type must be an integral"); @@ -119,7 +118,7 @@ namespace etl /// \param value Scaled integral. /// \return Scaled, rounded integral. //*************************************************************************** - template + template T round_floor_scaled(T value) { typedef typename scaled_rounding_t::type scale_t; @@ -133,7 +132,7 @@ namespace etl /// \param value Scaled integral. /// \return Unscaled, rounded integral. //*************************************************************************** - template + template T round_half_up_unscaled(T value) { ETL_STATIC_ASSERT(etl::is_integral::value, "Type must be an integral"); @@ -156,7 +155,7 @@ namespace etl /// \param value Scaled integral. /// \return Scaled, rounded integral. //*************************************************************************** - template + template T round_half_up_scaled(T value) { typedef typename scaled_rounding_t::type scale_t; @@ -170,7 +169,7 @@ namespace etl /// \param value Scaled integral. /// \return Unscaled, rounded integral. //*************************************************************************** - template + template T round_half_down_unscaled(T value) { ETL_STATIC_ASSERT(etl::is_integral::value, "Type must be an integral"); @@ -193,7 +192,7 @@ namespace etl /// \param value Scaled integral. /// \return Scaled, rounded integral. //*************************************************************************** - template + template T round_half_down_scaled(T value) { typedef typename scaled_rounding_t::type scale_t; @@ -206,7 +205,7 @@ namespace etl /// \param value Scaled integral. /// \return Unscaled, rounded integral. //*************************************************************************** - template + template T round_zero_unscaled(T value) { ETL_STATIC_ASSERT(etl::is_integral::value, "Type must be an integral"); @@ -220,7 +219,7 @@ namespace etl /// \param value Scaled integral. /// \return Scaled, rounded integral. //*************************************************************************** - template + template T round_zero_scaled(T value) { typedef typename scaled_rounding_t::type scale_t; @@ -233,7 +232,7 @@ namespace etl /// \param value Scaled integral. /// \return Unscaled, rounded integral. //*************************************************************************** - template + template T round_infinity_unscaled(T value) { ETL_STATIC_ASSERT(etl::is_integral::value, "Type must be an integral"); @@ -254,7 +253,7 @@ namespace etl /// \param value Scaled integral. /// \return Scaled, rounded integral. //*************************************************************************** - template + template T round_infinity_scaled(T value) { typedef typename scaled_rounding_t::type scale_t; @@ -268,7 +267,7 @@ namespace etl /// \param value Scaled integral. /// \return Unscaled, rounded integral. //*************************************************************************** - template + template T round_half_even_unscaled(T value) { ETL_STATIC_ASSERT(etl::is_integral::value, "Type must be an integral"); @@ -299,7 +298,7 @@ namespace etl /// \param value Scaled integral. /// \return Scaled, rounded integral. //*************************************************************************** - template + template T round_half_even_scaled(T value) { typedef typename scaled_rounding_t::type scale_t; @@ -313,7 +312,7 @@ namespace etl /// \param value Scaled integral. /// \return Unscaled, rounded integral. //*************************************************************************** - template + template T round_half_odd_unscaled(T value) { ETL_STATIC_ASSERT(etl::is_integral::value, "Type must be an integral"); @@ -344,7 +343,7 @@ namespace etl /// \param value Scaled integral. /// \return Scaled, rounded integral. //*************************************************************************** - template + template T round_half_odd_scaled(T value) { typedef typename scaled_rounding_t::type scale_t;