From: Daniel Arndt <arndtd@ornl.gov>
Date: Tue, 10 Jan 2023 17:25:56 +0000 (+0000)
Subject: Cherry-pick fix into bundled boost
X-Git-Tag: v9.5.0-rc1~658^2~6
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20c2cf2120cfc3a9598402ec62cece4d50b89aab;p=dealii.git

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 464e52753f..7690d07a20 100644
--- 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 c7f9e42afe..fde1584092 100644
--- 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 36dbc491b5..a39d29fd29 100644
--- 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 e4f3b488fa..79146491b5 100644
--- 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 1c458b7f38..7f261092d2 100644
--- 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 2c089e3acc..81b75ebeab 100644
--- 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.