Guard for clang>=16 instead of IntelLLVM

diff --git a/source/grid/grid_tools.cc b/source/grid/grid_tools.cc
index 7f261092d29788953a17002aaeffa19b777468b0..ffa7317bea7ec8b7268e2cc798bc78c24f8e8335 100644 (file)
--- a/source/grid/grid_tools.cc
+++ b/source/grid/grid_tools.cc
@@ -3014,8 +3014,9 @@ namespace GridTools
           {
             // Fixed in
             // https://github.com/boostorg/numeric_conversion/commit/50a1eae942effb0a9b90724323ef8f2a67e7984a
-#if defined(FEATURE_BOOST_BUNDLED_CONFIGURED) || \
-  !defined(__INTEL_LLVM_COMPILER) || BOOST_VERSION >= 108100
+#if defined(FEATURE_BOOST_BUNDLED_CONFIGURED) ||          \
+  !(defined(__clang_major__) && __clang_major__ >= 16) || \
+  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 81b75ebeab80e2da31030f798ec92a5c76ec9071..28b9694cd28ba6316c90a18994c1b9d67d63a8c6 100644 (file)
--- a/source/particles/particle_handler.cc
+++ b/source/particles/particle_handler.cc
@@ -1395,8 +1395,9 @@ namespace Particles
 
             // Fixed in
             // https://github.com/boostorg/numeric_conversion/commit/50a1eae942effb0a9b90724323ef8f2a67e7984a
-#if defined(FEATURE_BOOST_BUNDLED_CONFIGURED) || \
-  !defined(__INTEL_LLVM_COMPILER) || BOOST_VERSION >= 108100
+#if defined(FEATURE_BOOST_BUNDLED_CONFIGURED) ||          \
+  !(defined(__clang_major__) && __clang_major__ >= 16) || \
+  BOOST_VERSION >= 108100
           if (!found_cell)
             {
               // The particle is not in a neighbor of the old cell.