From 06332597691c2f80e3dad659b24620fc5058f973 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Mon, 9 Jan 2023 20:10:55 +0000 Subject: [PATCH] Guard Boost compilation error with IntelLLVM --- source/grid/grid_tools.cc | 2 ++ source/particles/particle_handler.cc | 2 ++ 2 files changed, 4 insertions(+) diff --git a/source/grid/grid_tools.cc b/source/grid/grid_tools.cc index 61f11d7902..9e6454e170 100644 --- a/source/grid/grid_tools.cc +++ b/source/grid/grid_tools.cc @@ -3012,6 +3012,7 @@ namespace GridTools } else { +#if !defined(__INTEL_LLVM_COMPILER) || BOOST_VERSION >= 108100 if (!used_vertices_rtree.empty()) { // If we have an rtree at our disposal, use it. @@ -3040,6 +3041,7 @@ namespace GridTools closest_vertex_index = res[0].second; } else +#endif { closest_vertex_index = GridTools::find_closest_vertex( mapping, mesh, p, marked_vertices); diff --git a/source/particles/particle_handler.cc b/source/particles/particle_handler.cc index e55fe4da7f..1b143457b6 100644 --- a/source/particles/particle_handler.cc +++ b/source/particles/particle_handler.cc @@ -1393,6 +1393,7 @@ namespace Particles } } +#if !defined(__INTEL_LLVM_COMPILER) || BOOST_VERSION >= 108100 if (!found_cell) { // The particle is not in a neighbor of the old cell. @@ -1427,6 +1428,7 @@ namespace Particles } } } +#endif if (!found_cell) { -- 2.39.5