optimize checkUpperLimit and checkLowerLimit in VarHolder.h avoid (#4072

) compile-time warnings when argument type is float and condition always true Co-authored-by: Alexander B <[email protected]>
pocoproject · Nov 27, 2023 · 0d2e3e8 · 0d2e3e8
1 parent 5ebd251
commit 0d2e3e8
Showing 1 changed file with 10 additions and 18 deletions.
diff --git a/Foundation/include/Poco/Dynamic/VarHolder.h b/Foundation/include/Poco/Dynamic/VarHolder.h
@@ -323,16 +323,8 @@ class Foundation_API VarHolder
 		poco_static_assert (std::numeric_limits<F>::is_signed);
 		poco_static_assert (std::numeric_limits<T>::is_signed);
 
-		if (std::numeric_limits<F>::is_integer)
-		{
-			checkUpperLimit<F,T>(from);
-			checkLowerLimit<F,T>(from);
-		}
-		else
-		{
-			checkUpperLimitFloat<F,T>(from);
-			checkLowerLimitFloat<F,T>(from);
-		}
+		checkUpperLimit<F,T>(from);
+		checkLowerLimit<F,T>(from);
 
 		to = static_cast<T>(from);
 	}
@@ -372,7 +364,7 @@ class Foundation_API VarHolder
 		to = static_cast<T>(from);
 	}
 
-	template <typename F, typename T>
+	template <typename F, typename T, std::enable_if_t<std::is_floating_point<F>::value, bool> = true>
 	void convertSignedFloatToUnsigned(const F& from, T& to) const
 		/// This function is meant for converting floating point data types to
 		/// unsigned integral data types. Negative values can not be converted and if one
@@ -387,7 +379,7 @@ class Foundation_API VarHolder
 
 		if (from < 0)
 			throw RangeException("Value too small.");
-		checkUpperLimitFloat<F,T>(from);
+		checkUpperLimit<F,T>(from);
 		to = static_cast<T>(from);
 	}
 
@@ -409,22 +401,22 @@ class Foundation_API VarHolder
 
 private:
 
-	template <typename F, typename T>
+	template <typename F, typename T, std::enable_if_t<std::is_integral<F>::value, bool> = true>
 	void checkUpperLimit(const F& from) const
 	{
 		if (from > std::numeric_limits<T>::max())
 			throw RangeException("Value too large.");
 	}
 
-	template <typename F, typename T>
+	template <typename F, typename T, std::enable_if_t<std::is_integral<F>::value, bool> = true>
 	void checkLowerLimit(const F& from) const
 	{
 		if (from < std::numeric_limits<T>::min())
 			throw RangeException("Value too small.");
 	}
 
-	template <typename F, typename T>
-	void checkUpperLimitFloat(const F& from) const
+	template <typename F, typename T, std::enable_if_t<std::is_floating_point<F>::value, bool> = true>
+	void checkUpperLimit(const F& from) const
 	{
 		if (std::is_floating_point<T>::value)
 		{
@@ -439,8 +431,8 @@ class Foundation_API VarHolder
 		}
 	}
 
-	template <typename F, typename T>
-	void checkLowerLimitFloat(const F& from) const
+	template <typename F, typename T, std::enable_if_t<std::is_floating_point<F>::value, bool> = true>
+	void checkLowerLimit(const F& from) const
 	{
 		if (std::is_floating_point<T>::value)
 		{