Merge pull request #1047 from boostorg/develop

Merge ccmath updates to master
boostorg · Nov 7, 2023 · 42273bc · 42273bc
2 parents f4c3757 + 8c72a85
commit 42273bc
Show file tree

Hide file tree

Showing 33 changed files with 206 additions and 119 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -58,7 +58,7 @@ jobs:
         run: cp -r $GITHUB_WORKSPACE/* libs/math
         working-directory: ../boost-root
       - name: Install deps
-        run: python tools/boostdep/depinst/depinst.py math
+        run: python tools/boostdep/depinst/depinst.py math -I example -I tools
         working-directory: ../boost-root
       - name: Bootstrap
         run: ./bootstrap.sh
@@ -116,7 +116,7 @@ jobs:
         run: cp -r $GITHUB_WORKSPACE/* libs/math
         working-directory: ../boost-root
       - name: Install deps
-        run: python tools/boostdep/depinst/depinst.py math
+        run: python tools/boostdep/depinst/depinst.py math -I example -I tools
         working-directory: ../boost-root
       - name: Bootstrap
         run: ./bootstrap.sh
@@ -157,7 +157,7 @@ jobs:
         run: cp -r $GITHUB_WORKSPACE/* libs/math
         working-directory: ../boost-root
       - name: Install deps
-        run: python tools/boostdep/depinst/depinst.py math
+        run: python tools/boostdep/depinst/depinst.py math -I example -I tools
         working-directory: ../boost-root
       - name: Bootstrap
         run: ./bootstrap.sh
@@ -201,7 +201,7 @@ jobs:
         run: xcopy /s /e /q %GITHUB_WORKSPACE% libs\math
         working-directory: ../boost-root
       - name: Install deps
-        run: python tools/boostdep/depinst/depinst.py math
+        run: python tools/boostdep/depinst/depinst.py math -I example -I tools
         working-directory: ../boost-root
       - name: Bootstrap
         run: bootstrap
@@ -249,7 +249,7 @@ jobs:
         run: xcopy /s /e /q %GITHUB_WORKSPACE% libs\math
         working-directory: ../boost-root
       - name: Install deps
-        run: python tools/boostdep/depinst/depinst.py math
+        run: python tools/boostdep/depinst/depinst.py math -I example -I tools
         working-directory: ../boost-root
       - name: Bootstrap
         run: bootstrap
@@ -292,7 +292,7 @@ jobs:
         run: xcopy /s /e /q %GITHUB_WORKSPACE% libs\math
         working-directory: ../boost-root
       - name: Install deps
-        run: python tools/boostdep/depinst/depinst.py math
+        run: python tools/boostdep/depinst/depinst.py math -I example -I tools
         working-directory: ../boost-root
       - name: Bootstrap
         run: bootstrap
@@ -336,7 +336,7 @@ jobs:
       - name: Copy files
         run: C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && cp -r * ../boost-root/libs/math'
       - name: Install deps
-        run: C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE")/../boost-root && python tools/boostdep/depinst/depinst.py math'
+        run: C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE")/../boost-root && python tools/boostdep/depinst/depinst.py math -I example -I tools'
       - name: Bootstrap
         run: C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE")/../boost-root && ./bootstrap.sh'
       - name: Generate headers
@@ -466,7 +466,7 @@ jobs:
         run: cp -r $GITHUB_WORKSPACE/* libs/math
         working-directory: ../boost-root
       - name: Install deps
-        run: python tools/boostdep/depinst/depinst.py math
+        run: python tools/boostdep/depinst/depinst.py math -I example -I tools
         working-directory: ../boost-root
       - name: Bootstrap
         run: ./bootstrap.sh

diff --git a/include/boost/math/ccmath/abs.hpp b/include/boost/math/ccmath/abs.hpp
@@ -8,15 +8,16 @@
 #ifndef BOOST_MATH_CCMATH_ABS
 #define BOOST_MATH_CCMATH_ABS
 
-#include <boost/math/tools/assert.hpp>
 #include <boost/math/ccmath/detail/config.hpp>
-#include <boost/math/ccmath/isnan.hpp>
-#include <boost/math/ccmath/isinf.hpp>
 
 #ifdef BOOST_MATH_NO_CCMATH
 #error "The header <boost/math/abs.hpp> can only be used in C++17 and later."
 #endif
 
+#include <boost/math/tools/assert.hpp>
+#include <boost/math/ccmath/isnan.hpp>
+#include <boost/math/ccmath/isinf.hpp>
+
 namespace boost::math::ccmath {
 
 namespace detail {

diff --git a/include/boost/math/ccmath/ceil.hpp b/include/boost/math/ccmath/ceil.hpp
@@ -6,9 +6,12 @@
 #ifndef BOOST_MATH_CCMATH_CEIL_HPP
 #define BOOST_MATH_CCMATH_CEIL_HPP
 
-#include <cmath>
-#include <type_traits>
-#include <boost/math/tools/is_constant_evaluated.hpp>
+#include <boost/math/ccmath/detail/config.hpp>
+
+#ifdef BOOST_MATH_NO_CCMATH
+#error "The header <boost/math/ceil.hpp> can only be used in C++17 and later."
+#endif
+
 #include <boost/math/ccmath/floor.hpp>
 #include <boost/math/ccmath/abs.hpp>
 #include <boost/math/ccmath/isinf.hpp>

diff --git a/include/boost/math/ccmath/detail/config.hpp b/include/boost/math/ccmath/detail/config.hpp
@@ -15,10 +15,28 @@
 #include <boost/math/tools/is_standalone.hpp>
 
 #ifndef BOOST_MATH_STANDALONE
+
 #include <boost/config.hpp>
 #ifdef BOOST_NO_CXX17_IF_CONSTEXPR
 #  define BOOST_MATH_NO_CCMATH
 #endif
+
+#else // BOOST_MATH_STANDALONE
+
+#if defined(_MSC_VER)
+
+#if defined(_MSVC_LANG) && (_MSVC_LANG < 201703)
+#  define BOOST_MATH_NO_CCMATH
+#endif
+
+#else // _MSC_VER
+
+#if (__cplusplus < 201703)
+#  define BOOST_MATH_NO_CCMATH
+#endif
+
+#endif
+
 #endif
 
 #ifndef _MSC_VER

diff --git a/include/boost/math/ccmath/fabs.hpp b/include/boost/math/ccmath/fabs.hpp
@@ -8,6 +8,12 @@
 #ifndef BOOST_MATH_CCMATH_FABS
 #define BOOST_MATH_CCMATH_FABS
 
+#include <boost/math/ccmath/detail/config.hpp>
+
+#ifdef BOOST_MATH_NO_CCMATH
+#error "The header <boost/math/fabs.hpp> can only be used in C++17 and later."
+#endif
+
 #include <boost/math/ccmath/abs.hpp>
 
 namespace boost::math::ccmath {

diff --git a/include/boost/math/ccmath/fdim.hpp b/include/boost/math/ccmath/fdim.hpp
@@ -6,10 +6,12 @@
 #ifndef BOOST_MATH_CCMATH_FDIM_HPP
 #define BOOST_MATH_CCMATH_FDIM_HPP
 
-#include <cmath>
-#include <limits>
-#include <type_traits>
-#include <boost/math/tools/is_constant_evaluated.hpp>
+#include <boost/math/ccmath/detail/config.hpp>
+
+#ifdef BOOST_MATH_NO_CCMATH
+#error "The header <boost/math/fdim.hpp> can only be used in C++17 and later."
+#endif
+
 #include <boost/math/tools/promotion.hpp>
 #include <boost/math/ccmath/isnan.hpp>
 

diff --git a/include/boost/math/ccmath/floor.hpp b/include/boost/math/ccmath/floor.hpp
@@ -6,10 +6,12 @@
 #ifndef BOOST_MATH_CCMATH_FLOOR_HPP
 #define BOOST_MATH_CCMATH_FLOOR_HPP
 
-#include <cmath>
-#include <limits>
-#include <type_traits>
-#include <boost/math/tools/is_constant_evaluated.hpp>
+#include <boost/math/ccmath/detail/config.hpp>
+
+#ifdef BOOST_MATH_NO_CCMATH
+#error "The header <boost/math/floor.hpp> can only be used in C++17 and later."
+#endif
+
 #include <boost/math/ccmath/abs.hpp>
 #include <boost/math/ccmath/isinf.hpp>
 #include <boost/math/ccmath/isnan.hpp>

diff --git a/include/boost/math/ccmath/fma.hpp b/include/boost/math/ccmath/fma.hpp
@@ -7,13 +7,14 @@
 #define BOOST_MATH_CCMATH_FMA_HPP
 
 #include <boost/math/ccmath/detail/config.hpp>
-#include <boost/math/ccmath/isinf.hpp>
-#include <boost/math/ccmath/isnan.hpp>
 
 #ifdef BOOST_MATH_NO_CCMATH
 #error "The header <boost/math/fma.hpp> can only be used in C++17 and later."
 #endif
 
+#include <boost/math/ccmath/isinf.hpp>
+#include <boost/math/ccmath/isnan.hpp>
+
 namespace boost::math::ccmath {
 
 namespace detail {

diff --git a/include/boost/math/ccmath/fmax.hpp b/include/boost/math/ccmath/fmax.hpp
@@ -6,10 +6,12 @@
 #ifndef BOOST_MATH_CCMATH_FMAX_HPP
 #define BOOST_MATH_CCMATH_FMAX_HPP
 
-#include <cmath>
-#include <limits>
-#include <type_traits>
-#include <boost/math/tools/is_constant_evaluated.hpp>
+#include <boost/math/ccmath/detail/config.hpp>
+
+#ifdef BOOST_MATH_NO_CCMATH
+#error "The header <boost/math/fmax.hpp> can only be used in C++17 and later."
+#endif
+
 #include <boost/math/tools/promotion.hpp>
 #include <boost/math/ccmath/isnan.hpp>
 

diff --git a/include/boost/math/ccmath/fmin.hpp b/include/boost/math/ccmath/fmin.hpp
@@ -6,10 +6,12 @@
 #ifndef BOOST_MATH_CCMATH_FMIN_HPP
 #define BOOST_MATH_CCMATH_FMIN_HPP
 
-#include <cmath>
-#include <limits>
-#include <type_traits>
-#include <boost/math/tools/is_constant_evaluated.hpp>
+#include <boost/math/ccmath/detail/config.hpp>
+
+#ifdef BOOST_MATH_NO_CCMATH
+#error "The header <boost/math/fmin.hpp> can only be used in C++17 and later."
+#endif
+
 #include <boost/math/tools/promotion.hpp>
 #include <boost/math/ccmath/isnan.hpp>
 

diff --git a/include/boost/math/ccmath/fmod.hpp b/include/boost/math/ccmath/fmod.hpp
@@ -6,12 +6,14 @@
 #ifndef BOOST_MATH_CCMATH_FMOD_HPP
 #define BOOST_MATH_CCMATH_FMOD_HPP
 
-#include <cmath>
+#include <boost/math/ccmath/detail/config.hpp>
+
+#ifdef BOOST_MATH_NO_CCMATH
+#error "The header <boost/math/fmod.hpp> can only be used in C++17 and later."
+#endif
+
 #include <cstdint>
-#include <limits>
-#include <type_traits>
 #include <boost/math/tools/promotion.hpp>
-#include <boost/math/tools/is_constant_evaluated.hpp>
 #include <boost/math/ccmath/abs.hpp>
 #include <boost/math/ccmath/isinf.hpp>
 #include <boost/math/ccmath/isnan.hpp>

diff --git a/include/boost/math/ccmath/fpclassify.hpp b/include/boost/math/ccmath/fpclassify.hpp
@@ -6,10 +6,12 @@
 #ifndef BOOST_MATH_CCMATH_FPCLASSIFY
 #define BOOST_MATH_CCMATH_FPCLASSIFY
 
-#include <cmath>
-#include <limits>
-#include <type_traits>
-#include <boost/math/tools/is_constant_evaluated.hpp>
+#include <boost/math/ccmath/detail/config.hpp>
+
+#ifdef BOOST_MATH_NO_CCMATH
+#error "The header <boost/math/fpclassify.hpp> can only be used in C++17 and later."
+#endif
+
 #include <boost/math/special_functions/fpclassify.hpp>
 #include <boost/math/ccmath/abs.hpp>
 #include <boost/math/ccmath/isinf.hpp>

diff --git a/include/boost/math/ccmath/frexp.hpp b/include/boost/math/ccmath/frexp.hpp
@@ -7,9 +7,12 @@
 #ifndef BOOST_MATH_CCMATH_FREXP_HPP
 #define BOOST_MATH_CCMATH_FREXP_HPP
 
-#include <cmath>
-#include <limits>
-#include <type_traits>
+#include <boost/math/ccmath/detail/config.hpp>
+
+#ifdef BOOST_MATH_NO_CCMATH
+#error "The header <boost/math/frexp.hpp> can only be used in C++17 and later."
+#endif
+
 #include <boost/math/ccmath/isinf.hpp>
 #include <boost/math/ccmath/isnan.hpp>
 #include <boost/math/ccmath/isfinite.hpp>

diff --git a/include/boost/math/ccmath/hypot.hpp b/include/boost/math/ccmath/hypot.hpp
@@ -7,12 +7,14 @@
 #ifndef BOOST_MATH_CCMATH_HYPOT_HPP
 #define BOOST_MATH_CCMATH_HYPOT_HPP
 
-#include <cmath>
+#include <boost/math/ccmath/detail/config.hpp>
+
+#ifdef BOOST_MATH_NO_CCMATH
+#error "The header <boost/math/hypot.hpp> can only be used in C++17 and later."
+#endif
+
 #include <array>
-#include <limits>
-#include <type_traits>
 #include <boost/math/tools/config.hpp>
-#include <boost/math/tools/is_constant_evaluated.hpp>
 #include <boost/math/tools/promotion.hpp>
 #include <boost/math/ccmath/sqrt.hpp>
 #include <boost/math/ccmath/abs.hpp>

diff --git a/include/boost/math/ccmath/ilogb.hpp b/include/boost/math/ccmath/ilogb.hpp
@@ -6,9 +6,12 @@
 #ifndef BOOST_MATH_CCMATH_ILOGB_HPP
 #define BOOST_MATH_CCMATH_ILOGB_HPP
 
-#include <cmath>
-#include <type_traits>
-#include <boost/math/tools/is_constant_evaluated.hpp>
+#include <boost/math/ccmath/detail/config.hpp>
+
+#ifdef BOOST_MATH_NO_CCMATH
+#error "The header <boost/math/ilogb.hpp> can only be used in C++17 and later."
+#endif
+
 #include <boost/math/ccmath/logb.hpp>
 #include <boost/math/ccmath/isinf.hpp>
 #include <boost/math/ccmath/isnan.hpp>

diff --git a/include/boost/math/ccmath/isfinite.hpp b/include/boost/math/ccmath/isfinite.hpp
@@ -6,20 +6,15 @@
 #ifndef BOOST_MATH_CCMATH_ISFINITE
 #define BOOST_MATH_CCMATH_ISFINITE
 
-#include <cmath>
-#include <type_traits>
-#include <boost/math/tools/is_constant_evaluated.hpp>
-#include <boost/math/ccmath/isinf.hpp>
-#include <boost/math/ccmath/isnan.hpp>
+#include <boost/math/ccmath/detail/config.hpp>
 
-#include <boost/math/tools/is_standalone.hpp>
-#ifndef BOOST_MATH_STANDALONE
-#include <boost/config.hpp>
-#ifdef BOOST_NO_CXX17_IF_CONSTEXPR
-#error "The header <boost/math/norms.hpp> can only be used in C++17 and later."
-#endif
+#ifdef BOOST_MATH_NO_CCMATH
+#error "The header <boost/math/isfinite.hpp> can only be used in C++17 and later."
 #endif
 
+#include <boost/math/ccmath/isinf.hpp>
+#include <boost/math/ccmath/isnan.hpp>
+
 namespace boost::math::ccmath {
 
 template <typename T>

diff --git a/include/boost/math/ccmath/isgreater.hpp b/include/boost/math/ccmath/isgreater.hpp
@@ -6,9 +6,12 @@
 #ifndef BOOST_MATH_CCMATH_ISGREATER_HPP
 #define BOOST_MATH_CCMATH_ISGREATER_HPP
 
-#include <cmath>
-#include <limits>
-#include <boost/math/tools/is_constant_evaluated.hpp>
+#include <boost/math/ccmath/detail/config.hpp>
+
+#ifdef BOOST_MATH_NO_CCMATH
+#error "The header <boost/math/isgreater.hpp> can only be used in C++17 and later."
+#endif
+
 #include <boost/math/ccmath/isnan.hpp>
 
 namespace boost::math::ccmath {

diff --git a/include/boost/math/ccmath/isgreaterequal.hpp b/include/boost/math/ccmath/isgreaterequal.hpp
@@ -6,9 +6,12 @@
 #ifndef BOOST_MATH_CCMATH_ISGREATEREQUAL_HPP
 #define BOOST_MATH_CCMATH_ISGREATEREQUAL_HPP
 
-#include <cmath>
-#include <limits>
-#include <boost/math/tools/is_constant_evaluated.hpp>
+#include <boost/math/ccmath/detail/config.hpp>
+
+#ifdef BOOST_MATH_NO_CCMATH
+#error "The header <boost/math/islessequal.hpp> can only be used in C++17 and later."
+#endif
+
 #include <boost/math/ccmath/isnan.hpp>
 
 namespace boost::math::ccmath {

diff --git a/include/boost/math/ccmath/isless.hpp b/include/boost/math/ccmath/isless.hpp
@@ -6,9 +6,12 @@
 #ifndef BOOST_MATH_CCMATH_ISLESS_HPP
 #define BOOST_MATH_CCMATH_ISLESS_HPP
 
-#include <cmath>
-#include <limits>
-#include <boost/math/tools/is_constant_evaluated.hpp>
+#include <boost/math/ccmath/detail/config.hpp>
+
+#ifdef BOOST_MATH_NO_CCMATH
+#error "The header <boost/math/isless.hpp> can only be used in C++17 and later."
+#endif
+
 #include <boost/math/ccmath/isnan.hpp>
 
 namespace boost::math::ccmath {