From 63ae4af8413719f7ca1776612db4ed24411dcd66 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Wed, 11 Jan 2023 08:49:43 -0500 Subject: [PATCH] Rename preprocessor variable to DEAL_II_WITH_BOOST_BUNDLED --- include/deal.II/base/config.h.in | 4 +++- source/grid/grid_tools.cc | 2 +- source/particles/particle_handler.cc | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in index 79146491b5..a6283badcc 100644 --- a/include/deal.II/base/config.h.in +++ b/include/deal.II/base/config.h.in @@ -39,7 +39,9 @@ #cmakedefine DEAL_II_WITH_ARPACK #cmakedefine DEAL_II_WITH_ARBORX #cmakedefine DEAL_II_WITH_ASSIMP -#cmakedefine FEATURE_BOOST_BUNDLED_CONFIGURED +#ifdef FEATURE_BOOST_BUNDLED_CONFIGURED +# define DEAL_II_WITH_BOOST_BUNDLED +#endif #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 36e2d8bcc7..27a92d06da 100644 --- a/source/grid/grid_tools.cc +++ b/source/grid/grid_tools.cc @@ -3017,7 +3017,7 @@ namespace GridTools // performance improvement disabling this branch is OK. // This is fixed in boost in // https://github.com/boostorg/numeric_conversion/commit/50a1eae942effb0a9b90724323ef8f2a67e7984a -#if defined(FEATURE_BOOST_BUNDLED_CONFIGURED) || \ +#if defined(DEAL_II_WITH_BOOST_BUNDLED) || \ !(defined(__clang_major__) && __clang_major__ >= 16) || \ BOOST_VERSION >= 108100 if (!used_vertices_rtree.empty()) diff --git a/source/particles/particle_handler.cc b/source/particles/particle_handler.cc index 1acfb2b42b..0bc71a019d 100644 --- a/source/particles/particle_handler.cc +++ b/source/particles/particle_handler.cc @@ -1400,7 +1400,7 @@ namespace Particles // workaround. // This is fixed in boost in // https://github.com/boostorg/numeric_conversion/commit/50a1eae942effb0a9b90724323ef8f2a67e7984a -#if defined(FEATURE_BOOST_BUNDLED_CONFIGURED) || \ +#if defined(DEAL_II_WITH_BOOST_BUNDLED) || \ !(defined(__clang_major__) && __clang_major__ >= 16) || \ BOOST_VERSION >= 108100 // The particle is not in a neighbor of the old cell. -- 2.39.5