From: Daniel Arndt <arndtd@ornl.gov>
Date: Tue, 10 Jan 2023 23:19:33 +0000 (+0000)
Subject: Guard for clang>=16 instead of IntelLLVM
X-Git-Tag: v9.5.0-rc1~658^2~5
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3147e4bd60576188f1fcfdb3a930c79b9a8b012e;p=dealii.git

Guard for clang>=16 instead of IntelLLVM
---

diff --git a/source/grid/grid_tools.cc b/source/grid/grid_tools.cc
index 7f261092d2..ffa7317bea 100644
--- 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 81b75ebeab..28b9694cd2 100644
--- 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.