From bd2e1dbd704b816a06ed6b08c8252e73b4e47c45 Mon Sep 17 00:00:00 2001
From: Yunsong Wang <yunsongw@nvidia.com>
Date: Mon, 2 Dec 2024 16:48:22 -0800
Subject: [PATCH] Rename output iterator types

---
 include/cuco/detail/static_map/static_map.inl |  8 ++++----
 .../static_multimap/static_multimap.inl       |  8 ++++----
 include/cuco/static_map.cuh                   | 20 +++++++++----------
 include/cuco/static_multimap.cuh              | 20 +++++++++----------
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/include/cuco/detail/static_map/static_map.inl b/include/cuco/detail/static_map/static_map.inl
index 94a5a7dd1..4f870a735 100644
--- a/include/cuco/detail/static_map/static_map.inl
+++ b/include/cuco/detail/static_map/static_map.inl
@@ -620,13 +620,13 @@ template <class Key,
           class ProbingScheme,
           class Allocator,
           class Storage>
-template <typename InputIt, typename OutputIt1, typename OutputIt2>
-std::pair<OutputIt1, OutputIt2>
+template <typename InputIt, typename OutputProbeIt, typename OutputMatchIt>
+std::pair<OutputProbeIt, OutputMatchIt>
 static_map<Key, T, Extent, Scope, KeyEqual, ProbingScheme, Allocator, Storage>::retrieve(
   InputIt first,
   InputIt last,
-  OutputIt1 output_probe,
-  OutputIt2 output_match,
+  OutputProbeIt output_probe,
+  OutputMatchIt output_match,
   cuda::stream_ref stream) const
 {
   return impl_->retrieve(first, last, output_probe, output_match, this->ref(op::retrieve), stream);
diff --git a/include/cuco/detail/static_multimap/static_multimap.inl b/include/cuco/detail/static_multimap/static_multimap.inl
index 934953363..1e8366827 100644
--- a/include/cuco/detail/static_multimap/static_multimap.inl
+++ b/include/cuco/detail/static_multimap/static_multimap.inl
@@ -447,13 +447,13 @@ template <class Key,
           class ProbingScheme,
           class Allocator,
           class Storage>
-template <typename InputIt, typename OutputIt1, typename OutputIt2>
-std::pair<OutputIt1, OutputIt2>
+template <typename InputIt, typename OutputProbeIt, typename OutputMatchIt>
+std::pair<OutputProbeIt, OutputMatchIt>
 static_multimap<Key, T, Extent, Scope, KeyEqual, ProbingScheme, Allocator, Storage>::retrieve(
   InputIt first,
   InputIt last,
-  OutputIt1 output_probe,
-  OutputIt2 output_match,
+  OutputProbeIt output_probe,
+  OutputMatchIt output_match,
   cuda::stream_ref stream) const
 {
   return impl_->retrieve(first, last, output_probe, output_match, this->ref(op::retrieve), stream);
diff --git a/include/cuco/static_map.cuh b/include/cuco/static_map.cuh
index 795e1c6f2..ee4657ace 100644
--- a/include/cuco/static_map.cuh
+++ b/include/cuco/static_map.cuh
@@ -929,10 +929,10 @@ class static_map {
    * @note Behavior is undefined if the given key has multiple matches in the set.
    *
    * @tparam InputIt Device accessible input iterator
-   * @tparam OutputIt1 Device accessible output iterator whose `value_type` can be constructed from
-   * `ProbeKey`
-   * @tparam OutputIt2 Device accessible output iterator whose `value_type` can be constructed from
-   * map's `value_type`
+   * @tparam OutputProbeIt Device accessible output iterator whose `value_type` can be constructed
+   * from `ProbeKey`
+   * @tparam OutputMatchIt Device accessible output iterator whose `value_type` can be constructed
+   * from map's `value_type`
    *
    * @param first Beginning of the sequence of probe keys
    * @param last End of the sequence of probe keys
@@ -942,12 +942,12 @@ class static_map {
    *
    * @return The iterator indicating the last valid pair in the output
    */
-  template <typename InputIt, typename OutputIt1, typename OutputIt2>
-  std::pair<OutputIt1, OutputIt2> retrieve(InputIt first,
-                                           InputIt last,
-                                           OutputIt1 output_probe,
-                                           OutputIt2 output_match,
-                                           cuda::stream_ref stream = {}) const;
+  template <typename InputIt, typename OutputProbeIt, typename OutputMatchIt>
+  std::pair<OutputProbeIt, OutputMatchIt> retrieve(InputIt first,
+                                                   InputIt last,
+                                                   OutputProbeIt output_probe,
+                                                   OutputMatchIt output_match,
+                                                   cuda::stream_ref stream = {}) const;
 
   /**
    * @brief Retrieves all of the keys and their associated values contained in the map
diff --git a/include/cuco/static_multimap.cuh b/include/cuco/static_multimap.cuh
index bbb411a8c..ccc10780e 100644
--- a/include/cuco/static_multimap.cuh
+++ b/include/cuco/static_multimap.cuh
@@ -680,10 +680,10 @@ class static_multimap {
    * @note Behavior is undefined if the given key has multiple matches in the set.
    *
    * @tparam InputIt Device accessible input iterator
-   * @tparam OutputIt1 Device accessible output iterator whose `value_type` can be constructed from
-   * `ProbeKey`
-   * @tparam OutputIt2 Device accessible output iterator whose `value_type` can be constructed from
-   * multimap's `value_type`
+   * @tparam OutputProbeIt Device accessible output iterator whose `value_type` can be constructed
+   * from `ProbeKey`
+   * @tparam OutputMatchIt Device accessible output iterator whose `value_type` can be constructed
+   * from multimap's `value_type`
    *
    * @param first Beginning of the sequence of probe keys
    * @param last End of the sequence of probe keys
@@ -693,12 +693,12 @@ class static_multimap {
    *
    * @return The iterator indicating the last valid pair in the output
    */
-  template <typename InputIt, typename OutputIt1, typename OutputIt2>
-  std::pair<OutputIt1, OutputIt2> retrieve(InputIt first,
-                                           InputIt last,
-                                           OutputIt1 output_probe,
-                                           OutputIt2 output_match,
-                                           cuda::stream_ref stream = {}) const;
+  template <typename InputIt, typename OutputProbeIt, typename OutputMatchIt>
+  std::pair<OutputProbeIt, OutputMatchIt> retrieve(InputIt first,
+                                                   InputIt last,
+                                                   OutputProbeIt output_probe,
+                                                   OutputMatchIt output_match,
+                                                   cuda::stream_ref stream = {}) const;
 
   /**
    * @brief Retrieves all of the keys and their associated values contained in the multimap