Fix CI issues

arborx · Sep 14, 2024 · f553a85 · f553a85
1 parent 8bcb3fa
commit f553a85
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/src/geometry/ArborX_Box.hpp b/src/geometry/ArborX_Box.hpp
@@ -59,6 +59,34 @@ struct Box
        Details::KokkosExt::ArithmeticTraits::finite_min<float>::value,
        Details::KokkosExt::ArithmeticTraits::finite_min<float>::value}};
 
+  [[deprecated("Use expand(Box, Box) instead.")]] KOKKOS_FUNCTION Box &
+  operator+=(Box const &other)
+  {
+    using Kokkos::max;
+    using Kokkos::min;
+
+    for (int d = 0; d < 3; ++d)
+    {
+      minCorner()[d] = min(minCorner()[d], other.minCorner()[d]);
+      maxCorner()[d] = max(maxCorner()[d], other.maxCorner()[d]);
+    }
+    return *this;
+  }
+
+  [[deprecated("Use expand(Box, Point) instead.")]] KOKKOS_FUNCTION Box &
+  operator+=(Point<3> const &point)
+  {
+    using Kokkos::max;
+    using Kokkos::min;
+
+    for (int d = 0; d < 3; ++d)
+    {
+      minCorner()[d] = min(minCorner()[d], point[d]);
+      maxCorner()[d] = max(maxCorner()[d], point[d]);
+    }
+    return *this;
+  }
+
 // FIXME Temporary workaround until we clarify requirements on the Kokkos side.
 #if defined(KOKKOS_ENABLE_OPENMPTARGET) || defined(KOKKOS_ENABLE_SYCL)
 private:

diff --git a/test/ArborX_BoostRTreeHelpers.hpp b/test/ArborX_BoostRTreeHelpers.hpp
@@ -216,7 +216,7 @@ performQueries(RTree<Indexable> const &rtree, UserPredicates const &predicates)
   static_assert(Kokkos::SpaceAccessibility<typename Predicates::memory_space,
                                            Kokkos::HostSpace>::accessible);
 
-  Predicates queries{predicates};
+  Predicates queries{predicates}; // NOLINT
 
   using Value = typename RTree<Indexable>::value_type;
   int const n_queries = queries.size();