Add BOOST_PREVENT_MACRO_SUBSTITUTION

boostorg · Mar 21, 2023 · b1a95fa · b1a95fa
1 parent 5a50ec7
commit b1a95fa
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/include/boost/math/ccmath/abs.hpp b/include/boost/math/ccmath/abs.hpp
@@ -31,7 +31,7 @@ namespace detail {
 template <typename T> 
 constexpr T abs_impl(T x) noexcept
 {
-    if (boost::math::ccmath::isnan(x))
+    if ((boost::math::ccmath::isnan)(x))
     {
         return std::numeric_limits<T>::quiet_NaN();
     }

diff --git a/include/boost/math/ccmath/isinf.hpp b/include/boost/math/ccmath/isinf.hpp
@@ -22,7 +22,7 @@
 namespace boost::math::ccmath {
 
 template <typename T>
-constexpr bool isinf(T x) noexcept
+constexpr bool isinf BOOST_PREVENT_MACRO_SUBSTITUTION(T x) noexcept
 {
     if(BOOST_MATH_IS_CONSTANT_EVALUATED(x))
     {
@@ -41,11 +41,11 @@ constexpr bool isinf(T x) noexcept
 
         if constexpr (!std::is_integral_v<T>)
         {
-            return isinf(x);
+            return (isinf)(x);
         }
         else
         {
-            return isinf(static_cast<double>(x));
+            return (isinf)(static_cast<double>(x));
         }
     }
 }

diff --git a/include/boost/math/ccmath/isnan.hpp b/include/boost/math/ccmath/isnan.hpp
@@ -21,7 +21,7 @@
 namespace boost::math::ccmath {
 
 template <typename T>
-inline constexpr bool isnan(T x)
+inline constexpr bool isnan BOOST_PREVENT_MACRO_SUBSTITUTION(T x)
 {
     if(BOOST_MATH_IS_CONSTANT_EVALUATED(x))
     {
@@ -33,11 +33,11 @@ inline constexpr bool isnan(T x)
 
         if constexpr (!std::is_integral_v<T>)
         {
-            return isnan(x);
+            return (isnan)(x);
         }
         else
         {
-            return isnan(static_cast<double>(x));
+            return (isnan)(static_cast<double>(x));
         }
     }
 }

diff --git a/include/boost/math/ccmath/ldexp.hpp b/include/boost/math/ccmath/ldexp.hpp
@@ -45,8 +45,8 @@ inline constexpr Real ldexp(Real arg, int exp) noexcept
     if(BOOST_MATH_IS_CONSTANT_EVALUATED(arg))
     {
         return boost::math::ccmath::abs(arg) == Real(0) ? arg :
-               boost::math::ccmath::isinf(arg) ? arg :
-               boost::math::ccmath::isnan(arg) ? arg :
+               (boost::math::ccmath::isinf)(arg) ? arg :
+               (boost::math::ccmath::isnan)(arg) ? arg :
                boost::math::ccmath::detail::ldexp_impl(arg, exp);
     }
     else

diff --git a/test/git_issue_430.cpp b/test/git_issue_430.cpp
@@ -7,9 +7,11 @@
 // See: https://godbolt.org/z/Ev4ManrsW
 
 #include <boost/math/special_functions/round.hpp>
+#include <boost/math/special_functions/next.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
 #include <cstdint>
+#include <cmath>
 
 template <typename Real>
 void test_llround_near_boundary()