Merge pull request #858 from mborland/warnings

Fix warning 4146 and 4244 in ccmath
boostorg · Oct 30, 2022 · adc6dca · adc6dca
2 parents aa25b04 + 94201a8
commit adc6dca
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/include/boost/math/ccmath/isinf.hpp b/include/boost/math/ccmath/isinf.hpp
@@ -14,11 +14,18 @@
 namespace boost::math::ccmath {
 
 template <typename T>
-inline constexpr bool isinf(T x)
+constexpr bool isinf(T x) noexcept
 {
     if(BOOST_MATH_IS_CONSTANT_EVALUATED(x))
     {
-        return x == std::numeric_limits<T>::infinity() || -x == std::numeric_limits<T>::infinity();
+        if constexpr (std::numeric_limits<T>::is_signed)
+        {
+            return x == std::numeric_limits<T>::infinity() || -x == std::numeric_limits<T>::infinity();
+        }
+        else
+        {
+            return x == std::numeric_limits<T>::infinity();
+        }
     }
     else
     {

diff --git a/include/boost/math/ccmath/logb.hpp b/include/boost/math/ccmath/logb.hpp
@@ -29,7 +29,7 @@ inline constexpr T logb_impl(T arg) noexcept
     int exp = 0;
     boost::math::ccmath::frexp(arg, &exp);
 
-    return exp - 1;
+    return static_cast<T>(exp - 1);
 }
 
 } // Namespace detail