]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Guard Boost compilation error with IntelLLVM
authorDaniel Arndt <arndtd@ornl.gov>
Mon, 9 Jan 2023 20:10:55 +0000 (20:10 +0000)
committerDaniel Arndt <arndtd@ornl.gov>
Mon, 9 Jan 2023 20:11:49 +0000 (20:11 +0000)
source/grid/grid_tools.cc
source/particles/particle_handler.cc

index 61f11d7902712c4ec39be5c464a9b779f8c6a38f..9e6454e1701a899d7ab73553e2ab9bce2acb017d 100644 (file)
@@ -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);
index e55fe4da7f58ecf8c38a163df108106a4f20c441..1b143457b66b9abf2c95230e4806eb80c13b0961 100644 (file)
@@ -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)
             {

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.