From 344e4eaae7be99ebf774bcca99f42c97785defa3 Mon Sep 17 00:00:00 2001
From: Yunsong Wang <yunsongw@nvidia.com>
Date: Mon, 28 Oct 2024 14:31:48 -0700
Subject: [PATCH] Use std::pair as the return type in host API

---
 include/cuco/detail/static_set/static_set.inl |  2 +-
 include/cuco/static_set.cuh                   | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/cuco/detail/static_set/static_set.inl b/include/cuco/detail/static_set/static_set.inl
index 90af70707..3e0434031 100644
--- a/include/cuco/detail/static_set/static_set.inl
+++ b/include/cuco/detail/static_set/static_set.inl
@@ -346,7 +346,7 @@ template <class Key,
           class Allocator,
           class Storage>
 template <typename InputIt, typename OutputIt1, typename OutputIt2>
-cuda::std::pair<OutputIt1, OutputIt2>
+std::pair<OutputIt1, OutputIt2>
 static_set<Key, Extent, Scope, KeyEqual, ProbingScheme, Allocator, Storage>::retrieve(
   InputIt first,
   InputIt last,
diff --git a/include/cuco/static_set.cuh b/include/cuco/static_set.cuh
index 28ade4efb..eb4b4a242 100644
--- a/include/cuco/static_set.cuh
+++ b/include/cuco/static_set.cuh
@@ -28,7 +28,6 @@
 #include <cuco/utility/traits.hpp>
 
 #include <cuda/atomic>
-#include <cuda/std/utility>
 #include <cuda/stream_ref>
 #include <thrust/functional.h>
 
@@ -38,6 +37,7 @@
 
 #include <cstddef>
 #include <type_traits>
+#include <utility>
 
 namespace cuco {
 /**
@@ -617,11 +617,11 @@ class static_set {
    * @return The iterator indicating the last valid pair in the output
    */
   template <typename InputIt, typename OutputIt1, typename OutputIt2>
-  cuda::std::pair<OutputIt1, OutputIt2> retrieve(InputIt first,
-                                                 InputIt last,
-                                                 OutputIt1 output_probe,
-                                                 OutputIt2 output_match,
-                                                 cuda::stream_ref stream = {}) const;
+  std::pair<OutputIt1, OutputIt2> retrieve(InputIt first,
+                                           InputIt last,
+                                           OutputIt1 output_probe,
+                                           OutputIt2 output_match,
+                                           cuda::stream_ref stream = {}) const;
 
   /**
    * @brief Asynchronously retrieves the matched key in the set corresponding to all probe keys in