Integrate review feedback

arborx · Dec 7, 2023 · bd275da · bd275da
1 parent 615c70b
commit bd275da
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/src/details/ArborX_DetailsHappyTreeFriends.hpp b/src/details/ArborX_DetailsHappyTreeFriends.hpp
@@ -12,8 +12,6 @@
 #ifndef ARBORX_DETAILS_HAPPY_TREE_FRIENDS_HPP
 #define ARBORX_DETAILS_HAPPY_TREE_FRIENDS_HPP
 
-#include <ArborX_DetailsNode.hpp>
-
 #include <Kokkos_Macros.hpp>
 #if KOKKOS_VERSION >= 40200
 #include <Kokkos_Assert.hpp> // KOKKOS_ASSERT

diff --git a/src/details/ArborX_DetailsLegacy.hpp b/src/details/ArborX_DetailsLegacy.hpp
@@ -26,7 +26,7 @@ class LegacyValues
 
 public:
   using memory_space = typename Access::memory_space;
-  using value_type = Details::PairValueIndex<BoundingVolume>;
+  using value_type = Details::PairValueIndex<BoundingVolume, unsigned>;
   using size_type =
       Kokkos::detected_t<Details::AccessTraitsSizeArchetypeExpression, Access,
                          Primitives>;

diff --git a/src/details/ArborX_IndexableGetter.hpp b/src/details/ArborX_IndexableGetter.hpp
@@ -32,15 +32,15 @@ struct DefaultIndexableGetter
     return geometry;
   }
 
-  template <typename Value>
+  template <typename Value, typename Index>
   KOKKOS_FUNCTION Value const &
-  operator()(PairValueIndex<Value> const &pair) const
+  operator()(PairValueIndex<Value, Index> const &pair) const
   {
     return pair.value;
   }
 
-  template <typename Value>
-  KOKKOS_FUNCTION Value operator()(PairValueIndex<Value> &&pair) const
+  template <typename Value, typename Index>
+  KOKKOS_FUNCTION Value operator()(PairValueIndex<Value, Index> &&pair) const
   {
     return pair.value;
   }

diff --git a/src/details/ArborX_PairValueIndex.hpp b/src/details/ArborX_PairValueIndex.hpp
@@ -19,7 +19,7 @@
 namespace ArborX::Details
 {
 
-template <class Value, typename Index = unsigned>
+template <typename Value, typename Index = unsigned>
 struct PairValueIndex
 {
   static_assert(std::is_integral_v<Index>);
@@ -38,7 +38,7 @@ class AttachIndices
   Data _data;
 
   using memory_space = typename Data::memory_space;
-  using value_type = Details::PairValueIndex<typename Data::value_type>;
+  using value_type = Details::PairValueIndex<typename Data::value_type, Index>;
 
   AttachIndices(Values const &values)
       : _data{values}
@@ -60,7 +60,6 @@ struct ArborX::AccessTraits<ArborX::Details::AttachIndices<Values, Index>,
   using Self = ArborX::Details::AttachIndices<Values, Index>;
 
   using memory_space = typename Self::memory_space;
-  using value_type = typename Self::value_type;
 
   KOKKOS_FUNCTION static auto size(Self const &values) { return values.size(); }
   KOKKOS_FUNCTION static decltype(auto) get(Self const &values, int i)