Unconditionally include <Kokkos_Assert.hpp>

aprokop · Apr 5, 2024 · d5921d7 · d5921d7
1 parent 3a2d092
commit d5921d7
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 25 deletions.
diff --git a/src/details/ArborX_DetailsCartesianGrid.hpp b/src/details/ArborX_DetailsCartesianGrid.hpp
@@ -16,12 +16,8 @@
 #include <ArborX_GeometryTraits.hpp>
 #include <ArborX_HyperBox.hpp>
 
-#include <Kokkos_Macros.hpp>
-#if KOKKOS_VERSION >= 40200
 #include <Kokkos_Assert.hpp> // KOKKOS_ASSERT
-#else
-#include <impl/Kokkos_Error.hpp> // KOKKOS_ASSERT
-#endif
+#include <Kokkos_Macros.hpp>
 #include <Kokkos_MathematicalFunctions.hpp> // floor
 
 namespace ArborX::Details

diff --git a/src/details/ArborX_DetailsContainers.hpp b/src/details/ArborX_DetailsContainers.hpp
@@ -11,12 +11,8 @@
 #ifndef ARBORX_DETAILS_CONTAINERS_HPP
 #define ARBORX_DETAILS_CONTAINERS_HPP
 
-#include <Kokkos_Macros.hpp>
-#if KOKKOS_VERSION >= 40200
 #include <Kokkos_Assert.hpp> // KOKKOS_ASSERT
-#else
-#include <impl/Kokkos_Error.hpp> // KOKKOS_ASSERT
-#endif
+#include <Kokkos_Macros.hpp>
 
 #include <cstddef> // size_t, ptrdiff_t
 #include <utility> // move, forward

diff --git a/src/details/ArborX_DetailsHappyTreeFriends.hpp b/src/details/ArborX_DetailsHappyTreeFriends.hpp
@@ -12,12 +12,8 @@
 #ifndef ARBORX_DETAILS_HAPPY_TREE_FRIENDS_HPP
 #define ARBORX_DETAILS_HAPPY_TREE_FRIENDS_HPP
 
-#include <Kokkos_Macros.hpp>
-#if KOKKOS_VERSION >= 40200
 #include <Kokkos_Assert.hpp> // KOKKOS_ASSERT
-#else
-#include <impl/Kokkos_Error.hpp> // KOKKOS_ASSERT
-#endif
+#include <Kokkos_Macros.hpp>
 
 #include <type_traits>
 

diff --git a/src/geometry/ArborX_DetailsAlgorithms.hpp b/src/geometry/ArborX_DetailsAlgorithms.hpp
@@ -16,12 +16,8 @@
 #include <ArborX_DetailsKokkosExtMinMaxOperations.hpp> // min, max
 #include <ArborX_GeometryTraits.hpp>
 
-#include <Kokkos_Macros.hpp>
-#if KOKKOS_VERSION >= 40200
 #include <Kokkos_Assert.hpp> // KOKKOS_ASSERT
-#else
-#include <impl/Kokkos_Error.hpp> // KOKKOS_ASSERT
-#endif
+#include <Kokkos_Macros.hpp>
 #include <Kokkos_MathematicalFunctions.hpp> // isfinite
 
 namespace ArborX

diff --git a/src/geometry/ArborX_Ray.hpp b/src/geometry/ArborX_Ray.hpp
@@ -19,12 +19,8 @@
 #include <ArborX_Point.hpp>
 #include <ArborX_Sphere.hpp>
 
-#include <Kokkos_Macros.hpp>
-#if KOKKOS_VERSION >= 40200
 #include <Kokkos_Assert.hpp> // KOKKOS_ASSERT
-#else
-#include <impl/Kokkos_Error.hpp> // KOKKOS_ASSERT
-#endif
+#include <Kokkos_Macros.hpp>
 
 #include <cmath>