From 037baf23c9ebe5fd9f7a0bba7db08268a10a0469 Mon Sep 17 00:00:00 2001
From: Daniel Juenger <2955913+sleeepyjack@users.noreply.github.com>
Date: Wed, 11 Oct 2023 13:05:02 +0000
Subject: [PATCH] Fix after merge

---
 include/cuco/detail/static_map/static_map.inl | 12 ++++++++----
 include/cuco/detail/static_set/static_set.inl | 16 ++++++++++------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/include/cuco/detail/static_map/static_map.inl b/include/cuco/detail/static_map/static_map.inl
index e4075da90..9249d4fa1 100644
--- a/include/cuco/detail/static_map/static_map.inl
+++ b/include/cuco/detail/static_map/static_map.inl
@@ -418,7 +418,8 @@ template <class Key,
 void static_map<Key, T, Extent, Scope, KeyEqual, ProbingScheme, Allocator, Storage>::rehash(
   cuda_stream_ref stream)
 {
-  auto const is_filled = static_map_ns::detail::slot_is_filled<Key, T>(this->empty_key_sentinel());
+  auto const is_filled = static_map_ns::detail::slot_is_filled<Key, T>(this->empty_key_sentinel(),
+                                                                       this->erased_key_sentinel());
   this->impl_->rehash(*this, is_filled, stream);
 }
 
@@ -433,7 +434,8 @@ template <class Key,
 void static_map<Key, T, Extent, Scope, KeyEqual, ProbingScheme, Allocator, Storage>::rehash(
   size_type capacity, cuda_stream_ref stream)
 {
-  auto const is_filled = static_map_ns::detail::slot_is_filled<Key, T>(this->empty_key_sentinel());
+  auto const is_filled = static_map_ns::detail::slot_is_filled<Key, T>(this->empty_key_sentinel(),
+                                                                       this->erased_key_sentinel());
   auto const extent    = make_window_extent<static_map>(capacity);
   this->impl_->rehash(extent, *this, is_filled, stream);
 }
@@ -449,7 +451,8 @@ template <class Key,
 void static_map<Key, T, Extent, Scope, KeyEqual, ProbingScheme, Allocator, Storage>::rehash_async(
   cuda_stream_ref stream)
 {
-  auto const is_filled = static_map_ns::detail::slot_is_filled<Key, T>(this->empty_key_sentinel());
+  auto const is_filled = static_map_ns::detail::slot_is_filled<Key, T>(this->empty_key_sentinel(),
+                                                                       this->erased_key_sentinel());
   this->impl_->rehash_async(*this, is_filled, stream);
 }
 
@@ -464,7 +467,8 @@ template <class Key,
 void static_map<Key, T, Extent, Scope, KeyEqual, ProbingScheme, Allocator, Storage>::rehash_async(
   size_type capacity, cuda_stream_ref stream)
 {
-  auto const is_filled = static_map_ns::detail::slot_is_filled<Key, T>(this->empty_key_sentinel());
+  auto const is_filled = static_map_ns::detail::slot_is_filled<Key, T>(this->empty_key_sentinel(),
+                                                                       this->erased_key_sentinel());
   auto const extent    = make_window_extent<static_map>(capacity);
   this->impl_->rehash_async(extent, *this, is_filled, stream);
 }
diff --git a/include/cuco/detail/static_set/static_set.inl b/include/cuco/detail/static_set/static_set.inl
index ed2581ea1..6ee49ce02 100644
--- a/include/cuco/detail/static_set/static_set.inl
+++ b/include/cuco/detail/static_set/static_set.inl
@@ -345,7 +345,8 @@ template <class Key,
 void static_set<Key, Extent, Scope, KeyEqual, ProbingScheme, Allocator, Storage>::rehash(
   cuda_stream_ref stream)
 {
-  auto const is_filled = static_set_ns::detail::slot_is_filled(this->empty_key_sentinel());
+  auto const is_filled =
+    static_set_ns::detail::slot_is_filled(this->empty_key_sentinel(), this->erased_key_sentinel());
   this->impl_->rehash(*this, is_filled, stream);
 }
 
@@ -359,8 +360,9 @@ template <class Key,
 void static_set<Key, Extent, Scope, KeyEqual, ProbingScheme, Allocator, Storage>::rehash(
   size_type capacity, cuda_stream_ref stream)
 {
-  auto const is_filled = static_set_ns::detail::slot_is_filled(this->empty_key_sentinel());
-  auto const extent    = make_window_extent<static_set>(capacity);
+  auto const is_filled =
+    static_set_ns::detail::slot_is_filled(this->empty_key_sentinel(), this->erased_key_sentinel());
+  auto const extent = make_window_extent<static_set>(capacity);
   this->impl_->rehash(extent, *this, is_filled, stream);
 }
 
@@ -374,7 +376,8 @@ template <class Key,
 void static_set<Key, Extent, Scope, KeyEqual, ProbingScheme, Allocator, Storage>::rehash_async(
   cuda_stream_ref stream)
 {
-  auto const is_filled = static_set_ns::detail::slot_is_filled(this->empty_key_sentinel());
+  auto const is_filled =
+    static_set_ns::detail::slot_is_filled(this->empty_key_sentinel(), this->erased_key_sentinel());
   this->impl_->rehash_async(*this, is_filled, stream);
 }
 
@@ -388,8 +391,9 @@ template <class Key,
 void static_set<Key, Extent, Scope, KeyEqual, ProbingScheme, Allocator, Storage>::rehash_async(
   size_type capacity, cuda_stream_ref stream)
 {
-  auto const is_filled = static_set_ns::detail::slot_is_filled(this->empty_key_sentinel());
-  auto const extent    = make_window_extent<static_set>(capacity);
+  auto const is_filled =
+    static_set_ns::detail::slot_is_filled(this->empty_key_sentinel(), this->erased_key_sentinel());
+  auto const extent = make_window_extent<static_set>(capacity);
   this->impl_->rehash_async(extent, *this, is_filled, stream);
 }