Cherry-pick fix into bundled boost

diff --git a/bundled/boost-1.70.0/include/boost/numeric/conversion/detail/int_float_mixture.hpp b/bundled/boost-1.70.0/include/boost/numeric/conversion/detail/int_float_mixture.hpp
index 464e52753fe0488ac95091c36ffe3f8d0f414839..7690d07a205793b669bbf85ae56b3b53ec87afcc 100644 (file)
--- a/bundled/boost-1.70.0/include/boost/numeric/conversion/detail/int_float_mixture.hpp
+++ b/bundled/boost-1.70.0/include/boost/numeric/conversion/detail/int_float_mixture.hpp
@@ -16,15 +16,15 @@
 #include "boost/numeric/conversion/int_float_mixture_enum.hpp"
 #include "boost/numeric/conversion/detail/meta.hpp"
 
-#include "boost/mpl/integral_c.hpp"
+#include "boost/type_traits/integral_constant.hpp"
 
 namespace boost { namespace numeric { namespace convdetail
 {
   // Integral Constants for 'IntFloatMixture'
-  typedef mpl::integral_c<int_float_mixture_enum, integral_to_integral> int2int_c ;
-  typedef mpl::integral_c<int_float_mixture_enum, integral_to_float>    int2float_c ;
-  typedef mpl::integral_c<int_float_mixture_enum, float_to_integral>    float2int_c ;
-  typedef mpl::integral_c<int_float_mixture_enum, float_to_float>       float2float_c ;
+  typedef boost::integral_constant<int_float_mixture_enum, integral_to_integral> int2int_c ;
+  typedef boost::integral_constant<int_float_mixture_enum, integral_to_float>    int2float_c ;
+  typedef boost::integral_constant<int_float_mixture_enum, float_to_integral>    float2int_c ;
+  typedef boost::integral_constant<int_float_mixture_enum, float_to_float>       float2float_c ;
 
   // Metafunction:
   //

diff --git a/bundled/boost-1.70.0/include/boost/numeric/conversion/detail/sign_mixture.hpp b/bundled/boost-1.70.0/include/boost/numeric/conversion/detail/sign_mixture.hpp
index c7f9e42afe8b998d3bdeb85e301f13fa4f18d6f1..fde1584092769ba54844bd028626e657c44ec8e6 100644 (file)
--- a/bundled/boost-1.70.0/include/boost/numeric/conversion/detail/sign_mixture.hpp
+++ b/bundled/boost-1.70.0/include/boost/numeric/conversion/detail/sign_mixture.hpp
@@ -16,15 +16,15 @@
 #include "boost/numeric/conversion/sign_mixture_enum.hpp"
 #include "boost/numeric/conversion/detail/meta.hpp"
 
-#include "boost/mpl/integral_c.hpp"
+#include "boost/type_traits/integral_constant.hpp"
 
 namespace boost { namespace numeric { namespace convdetail
 {
   // Integral Constants for 'SignMixture'
-  typedef mpl::integral_c<sign_mixture_enum, unsigned_to_unsigned> unsig2unsig_c ;
-  typedef mpl::integral_c<sign_mixture_enum, signed_to_signed>     sig2sig_c ;
-  typedef mpl::integral_c<sign_mixture_enum, signed_to_unsigned>   sig2unsig_c ;
-  typedef mpl::integral_c<sign_mixture_enum, unsigned_to_signed>   unsig2sig_c ;
+  typedef boost::integral_constant<sign_mixture_enum, unsigned_to_unsigned> unsig2unsig_c ;
+  typedef boost::integral_constant<sign_mixture_enum, signed_to_signed>     sig2sig_c ;
+  typedef boost::integral_constant<sign_mixture_enum, signed_to_unsigned>   sig2unsig_c ;
+  typedef boost::integral_constant<sign_mixture_enum, unsigned_to_signed>   unsig2sig_c ;
 
   // Metafunction:
   //

diff --git a/bundled/boost-1.70.0/include/boost/numeric/conversion/detail/udt_builtin_mixture.hpp b/bundled/boost-1.70.0/include/boost/numeric/conversion/detail/udt_builtin_mixture.hpp
index 36dbc491b5ee4268b0cdd20b41df741f0c38dba3..a39d29fd2979aeb27003a1606eb64ecd1b9a6f40 100644 (file)
--- a/bundled/boost-1.70.0/include/boost/numeric/conversion/detail/udt_builtin_mixture.hpp
+++ b/bundled/boost-1.70.0/include/boost/numeric/conversion/detail/udt_builtin_mixture.hpp
@@ -15,15 +15,15 @@
 #include "boost/numeric/conversion/udt_builtin_mixture_enum.hpp"
 #include "boost/numeric/conversion/detail/meta.hpp"
 
-#include "boost/mpl/integral_c.hpp"
+#include "boost/type_traits/integral_constant.hpp"
 
 namespace boost { namespace numeric { namespace convdetail
 {
   // Integral Constants for 'UdtMixture'
-  typedef mpl::integral_c<udt_builtin_mixture_enum, builtin_to_builtin> builtin2builtin_c ;
-  typedef mpl::integral_c<udt_builtin_mixture_enum, builtin_to_udt>     builtin2udt_c ;
-  typedef mpl::integral_c<udt_builtin_mixture_enum, udt_to_builtin>     udt2builtin_c ;
-  typedef mpl::integral_c<udt_builtin_mixture_enum, udt_to_udt>         udt2udt_c ;
+  typedef boost::integral_constant<udt_builtin_mixture_enum, builtin_to_builtin> builtin2builtin_c ;
+  typedef boost::integral_constant<udt_builtin_mixture_enum, builtin_to_udt>     builtin2udt_c ;
+  typedef boost::integral_constant<udt_builtin_mixture_enum, udt_to_builtin>     udt2builtin_c ;
+  typedef boost::integral_constant<udt_builtin_mixture_enum, udt_to_udt>         udt2udt_c ;
 
   // Metafunction:
   //

diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in
index e4f3b488fa01baa76776572998e83bc27871c42b..79146491b5a0289a70078b6b2a1acce62cbd4ff6 100644 (file)
--- a/include/deal.II/base/config.h.in
+++ b/include/deal.II/base/config.h.in
@@ -39,6 +39,7 @@
 #cmakedefine DEAL_II_WITH_ARPACK
 #cmakedefine DEAL_II_WITH_ARBORX
 #cmakedefine DEAL_II_WITH_ASSIMP
+#cmakedefine FEATURE_BOOST_BUNDLED_CONFIGURED
 #cmakedefine DEAL_II_WITH_CGAL
 #cmakedefine DEAL_II_WITH_COMPLEX_VALUES
 #cmakedefine DEAL_II_WITH_CUDA

diff --git a/source/grid/grid_tools.cc b/source/grid/grid_tools.cc
index 1c458b7f384671ee7f8e7a7858b66eeb316e4dfe..7f261092d29788953a17002aaeffa19b777468b0 100644 (file)
--- a/source/grid/grid_tools.cc
+++ b/source/grid/grid_tools.cc
@@ -3014,7 +3014,8 @@ namespace GridTools
           {
             // Fixed in
             // https://github.com/boostorg/numeric_conversion/commit/50a1eae942effb0a9b90724323ef8f2a67e7984a
-#if !defined(__INTEL_LLVM_COMPILER) || BOOST_VERSION >= 108100
+#if defined(FEATURE_BOOST_BUNDLED_CONFIGURED) || \
+  !defined(__INTEL_LLVM_COMPILER) || BOOST_VERSION >= 108100
             if (!used_vertices_rtree.empty())
               {
                 // If we have an rtree at our disposal, use it.

diff --git a/source/particles/particle_handler.cc b/source/particles/particle_handler.cc
index 2c089e3acc5c6e05a95dceaea87b3a604a4ee759..81b75ebeab80e2da31030f798ec92a5c76ec9071 100644 (file)
--- a/source/particles/particle_handler.cc
+++ b/source/particles/particle_handler.cc
@@ -1395,7 +1395,8 @@ namespace Particles
 
             // Fixed in
             // https://github.com/boostorg/numeric_conversion/commit/50a1eae942effb0a9b90724323ef8f2a67e7984a
-#if !defined(__INTEL_LLVM_COMPILER) || BOOST_VERSION >= 108100
+#if defined(FEATURE_BOOST_BUNDLED_CONFIGURED) || \
+  !defined(__INTEL_LLVM_COMPILER) || BOOST_VERSION >= 108100
           if (!found_cell)
             {
               // The particle is not in a neighbor of the old cell.