]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Rename preprocessor variable to DEAL_II_WITH_BOOST_BUNDLED
authorDaniel Arndt <arndtd@ornl.gov>
Wed, 11 Jan 2023 13:49:43 +0000 (08:49 -0500)
committerDaniel Arndt <arndtd@ornl.gov>
Wed, 11 Jan 2023 13:49:43 +0000 (08:49 -0500)
include/deal.II/base/config.h.in
source/grid/grid_tools.cc
source/particles/particle_handler.cc

index 79146491b5a0289a70078b6b2a1acce62cbd4ff6..a6283badcc19b9d01e4fcacc197fe423235dbaab 100644 (file)
@@ -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
index 36e2d8bcc77ef1c9ad2babf23739817a1d35b266..27a92d06da563b4764d01b7ea8665089894e9998 100644 (file)
@@ -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())
index 1acfb2b42bce513b0f0cb17846f0e892e2c1b7cd..0bc71a019d546e6e2c948c9211de472cd9dcf37a 100644 (file)
@@ -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.

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.