Get rid of the extra variable when running spatial predicate

arborx · May 9, 2023 · 72da1f2 · 72da1f2
1 parent 92d0058
commit 72da1f2
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/src/details/ArborX_DetailsTreeTraversal.hpp b/src/details/ArborX_DetailsTreeTraversal.hpp
@@ -89,12 +89,9 @@ struct TreeTraversal<BVH, Predicates, Callback, SpatialPredicateTag>
   {
     auto const &predicate = Access::get(_predicates, queryIndex);
 
-    int node;
-    int next = HappyTreeFriends::getRoot(_bvh); // start with root
+    int node = HappyTreeFriends::getRoot(_bvh); // start with root
     do
     {
-      node = next;
-
       auto const leaf_node = HappyTreeFriends::leafIndex(_bvh, node);
       bool const is_leaf = HappyTreeFriends::isLeaf(_bvh, node);
 
@@ -129,20 +126,20 @@ struct TreeTraversal<BVH, Predicates, Callback, SpatialPredicateTag>
                   _callback, predicate,
                   HappyTreeFriends::getLeafPermutationIndex(_bvh, leaf_node)))
             return;
-          next = HappyTreeFriends::getRope(LeafNodeTag{}, _bvh, leaf_node);
+          node = HappyTreeFriends::getRope(LeafNodeTag{}, _bvh, leaf_node);
         }
         else
         {
-          next = HappyTreeFriends::getLeftChild(_bvh, node);
+          node = HappyTreeFriends::getLeftChild(_bvh, node);
         }
       }
       else
       {
-        next = (is_leaf
+        node = (is_leaf
                     ? HappyTreeFriends::getRope(LeafNodeTag{}, _bvh, leaf_node)
                     : HappyTreeFriends::getRope(InternalNodeTag{}, _bvh, node));
       }
-    } while (next != ROPE_SENTINEL);
+    } while (node != ROPE_SENTINEL);
   }
 };