Deprecate thrust universal iterator categories (#3461)

NVIDIA · Jan 22, 2025 · f59197d · f59197d
1 parent 67f625e
commit f59197d
Showing 1 changed file with 26 additions and 26 deletions.
diff --git a/thrust/thrust/iterator/detail/universal_categories.h b/thrust/thrust/iterator/detail/universal_categories.h
@@ -27,39 +27,36 @@
 #endif // no system header
 #include <thrust/iterator/iterator_categories.h>
 
-// XXX eliminate this file
-
+_CCCL_SUPPRESS_DEPRECATED_PUSH
 THRUST_NAMESPACE_BEGIN
 
 // define these types without inheritance to avoid ambiguous conversion to base classes
 
-struct input_universal_iterator_tag
+// deprecated [Since 2.8]
+struct CCCL_DEPRECATED input_universal_iterator_tag{operator input_host_iterator_tag(){return input_host_iterator_tag();
+}
+
+operator input_device_iterator_tag()
 {
-  operator input_host_iterator_tag()
-  {
-    return input_host_iterator_tag();
-  }
+  return input_device_iterator_tag();
+}
+}
+;
 
-  operator input_device_iterator_tag()
-  {
-    return input_device_iterator_tag();
-  }
-};
+// deprecated [Since 2.8]
+struct CCCL_DEPRECATED output_universal_iterator_tag{operator output_host_iterator_tag(){
+  return output_host_iterator_tag();
+}
 
-struct output_universal_iterator_tag
+operator output_device_iterator_tag()
 {
-  operator output_host_iterator_tag()
-  {
-    return output_host_iterator_tag();
-  }
-
-  operator output_device_iterator_tag()
-  {
-    return output_device_iterator_tag();
-  }
-};
+  return output_device_iterator_tag();
+}
+}
+;
 
-struct forward_universal_iterator_tag : input_universal_iterator_tag
+// deprecated [Since 2.8]
+struct CCCL_DEPRECATED forward_universal_iterator_tag : input_universal_iterator_tag
 {
   operator forward_host_iterator_tag()
   {
@@ -72,7 +69,8 @@ struct forward_universal_iterator_tag : input_universal_iterator_tag
   };
 };
 
-struct bidirectional_universal_iterator_tag : forward_universal_iterator_tag
+// deprecated [Since 2.8]
+struct CCCL_DEPRECATED bidirectional_universal_iterator_tag : forward_universal_iterator_tag
 {
   operator bidirectional_host_iterator_tag()
   {
@@ -95,7 +93,8 @@ struct one_degree_of_separation : T
 
 } // namespace detail
 
-struct random_access_universal_iterator_tag
+// deprecated [Since 2.8]
+struct CCCL_DEPRECATED random_access_universal_iterator_tag
 {
   // these conversions are all P0
   operator random_access_host_iterator_tag()
@@ -115,4 +114,5 @@ struct random_access_universal_iterator_tag
   }
 };
 
+_CCCL_SUPPRESS_DEPRECATED_POP
 THRUST_NAMESPACE_END