From bd275dab2bd46fcca037c878301ce24aecac872c Mon Sep 17 00:00:00 2001
From: Andrey Prokopenko <prokopenkoav@ornl.gov>
Date: Thu, 7 Dec 2023 12:51:35 -0500
Subject: [PATCH] Integrate review feedback

---
 src/details/ArborX_DetailsHappyTreeFriends.hpp | 2 --
 src/details/ArborX_DetailsLegacy.hpp           | 2 +-
 src/details/ArborX_IndexableGetter.hpp         | 8 ++++----
 src/details/ArborX_PairValueIndex.hpp          | 5 ++---
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/details/ArborX_DetailsHappyTreeFriends.hpp b/src/details/ArborX_DetailsHappyTreeFriends.hpp
index 0b0e76c943..dd09b8e478 100644
--- 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
index 62680cf7c4..b279c2f269 100644
--- 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
index f39cf1453c..9202232be2 100644
--- 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
index 581c589057..798d858e9d 100644
--- 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)