Remove old C++ version checks (#6494)

davebayer · web-flow · commit cb07e970a010 · 2025-11-05T15:43:49.000Z
diff --git a/cub/cub/util_cpp_dialect.cuh b/cub/cub/util_cpp_dialect.cuh
@@ -63,7 +63,7 @@ CUB_COMPILER_DEPRECATION(MSVC 2019(19.20 / 16.0 / 14.20));
 #  ifndef CCCL_IGNORE_DEPRECATED_CPP_DIALECT
 #    if _CCCL_STD_VER < 2017
 #      error CUB requires at least C++17. Define CCCL_IGNORE_DEPRECATED_CPP_DIALECT to suppress this message.
-#    endif // _CCCL_STD_VER >= 2017
+#    endif // _CCCL_STD_VER < 2017
 #  endif
 
 #  undef CUB_COMP_DEPR_IMPL
diff --git a/cudax/examples/vector.cuh b/cudax/examples/vector.cuh
@@ -31,7 +31,6 @@
 #include <cuda/experimental/__detail/utility.cuh>
 #include <cuda/experimental/__launch/param_kind.cuh>
 
-#if _CCCL_STD_VER >= 2017
 namespace cuda::experimental
 {
 using ::cuda::std::span;
@@ -144,4 +143,3 @@ private:
 } // namespace cuda::experimental
 
 #endif
-#endif
diff --git a/cudax/include/cuda/experimental/__hierarchy/dimensions.cuh b/cudax/include/cuda/experimental/__hierarchy/dimensions.cuh
@@ -16,7 +16,6 @@
 
 #include <cuda/std/__cccl/prologue.h>
 
-#if _CCCL_STD_VER >= 2017
 namespace cuda::experimental
 {
 template <typename T, size_t... Extents>
@@ -154,7 +153,6 @@ template <typename TyTrunc, typename Index, typename Dims>
 }
 } // namespace __detail
 } // namespace cuda::experimental
-#endif // _CCCL_STD_VER >= 2017
 
 #include <cuda/std/__cccl/epilogue.h>
 
diff --git a/cudax/include/cuda/experimental/__hierarchy/hierarchy_dimensions.cuh b/cudax/include/cuda/experimental/__hierarchy/hierarchy_dimensions.cuh
@@ -27,7 +27,6 @@
 
 #include <cuda/std/__cccl/prologue.h>
 
-#if _CCCL_STD_VER >= 2017
 namespace cuda::experimental
 {
 /* TODO right now operator stacking can end up with a wrong unit, we could use below type, but we would need an explicit
@@ -398,9 +397,9 @@ struct hierarchy_dimensions
       : levels(ls)
   {}
 
-#  if !defined(_CCCL_NO_THREE_WAY_COMPARISON) && !_CCCL_COMPILER(MSVC, <, 19, 39) && !_CCCL_COMPILER(GCC, <, 12)
+#if !defined(_CCCL_NO_THREE_WAY_COMPARISON) && !_CCCL_COMPILER(MSVC, <, 19, 39) && !_CCCL_COMPILER(GCC, <, 12)
   [[nodiscard]] _CCCL_HIDE_FROM_ABI constexpr bool operator==(const hierarchy_dimensions&) const noexcept = default;
-#  else // ^^^ !_CCCL_NO_THREE_WAY_COMPARISON ^^^ / vvv _CCCL_NO_THREE_WAY_COMPARISON vvv
+#else // ^^^ !_CCCL_NO_THREE_WAY_COMPARISON ^^^ / vvv _CCCL_NO_THREE_WAY_COMPARISON vvv
   [[nodiscard]] _CCCL_API friend constexpr bool
   operator==(const hierarchy_dimensions& left, const hierarchy_dimensions& right) noexcept
   {
@@ -412,7 +411,7 @@ struct hierarchy_dimensions
   {
     return left.levels != right.levels;
   }
-#  endif // _CCCL_NO_THREE_WAY_COMPARISON
+#endif // _CCCL_NO_THREE_WAY_COMPARISON
 
 private:
   // This being static is a bit of a hack to make extents_type working without incomplete class member access
@@ -819,12 +818,12 @@ public:
     }
   }
 
-#  ifndef _CCCL_DOXYGEN_INVOKED // Do not document
+#ifndef _CCCL_DOXYGEN_INVOKED // Do not document
   constexpr hierarchy_dimensions combine([[maybe_unused]] __empty_hierarchy __empty) const
   {
     return *this;
   }
-#  endif // _CCCL_DOXYGEN_INVOKED
+#endif // _CCCL_DOXYGEN_INVOKED
 };
 
 /**
@@ -944,7 +943,6 @@ constexpr auto hierarchy_add_level(const hierarchy_dimensions<Unit, Levels...>&
   }
 }
 } // namespace cuda::experimental
-#endif // _CCCL_STD_VER >= 2017
 
 #include <cuda/std/__cccl/epilogue.h>
 
diff --git a/cudax/include/cuda/experimental/__hierarchy/hierarchy_levels.cuh b/cudax/include/cuda/experimental/__hierarchy/hierarchy_levels.cuh
@@ -19,7 +19,6 @@
 
 #include <cuda/std/__cccl/prologue.h>
 
-#if _CCCL_STD_VER >= 2017
 namespace cuda::experimental
 {
 namespace hierarchy
@@ -488,7 +487,6 @@ _CCCL_DEVICE auto index(const Unit&, const Level&)
 }
 } // namespace hierarchy
 } // namespace cuda::experimental
-#endif // _CCCL_STD_VER >= 2017
 
 #include <cuda/std/__cccl/epilogue.h>
 
diff --git a/cudax/include/cuda/experimental/__hierarchy/level_dimensions.cuh b/cudax/include/cuda/experimental/__hierarchy/level_dimensions.cuh
@@ -18,7 +18,6 @@
 
 #include <cuda/std/__cccl/prologue.h>
 
-#if _CCCL_STD_VER >= 2017
 namespace cuda::experimental
 {
 namespace __detail
@@ -128,9 +127,9 @@ struct level_dimensions
   _CCCL_HOST_DEVICE constexpr level_dimensions()
       : dims(){};
 
-#  if !defined(_CCCL_NO_THREE_WAY_COMPARISON) && !_CCCL_COMPILER(MSVC, <, 19, 39) && !_CCCL_COMPILER(GCC, <, 12)
+#if !defined(_CCCL_NO_THREE_WAY_COMPARISON) && !_CCCL_COMPILER(MSVC, <, 19, 39) && !_CCCL_COMPILER(GCC, <, 12)
   [[nodiscard]] _CCCL_HIDE_FROM_ABI constexpr bool operator==(const level_dimensions&) const noexcept = default;
-#  else // ^^^ !_CCCL_NO_THREE_WAY_COMPARISON ^^^ / vvv _CCCL_NO_THREE_WAY_COMPARISON vvv
+#else // ^^^ !_CCCL_NO_THREE_WAY_COMPARISON ^^^ / vvv _CCCL_NO_THREE_WAY_COMPARISON vvv
   [[nodiscard]] _CCCL_API friend constexpr bool
   operator==(const level_dimensions& left, const level_dimensions& right) noexcept
   {
@@ -142,7 +141,7 @@ struct level_dimensions
   {
     return left.dims != right.dims;
   }
-#  endif // _CCCL_NO_THREE_WAY_COMPARISON
+#endif // _CCCL_NO_THREE_WAY_COMPARISON
 };
 
 /**
@@ -217,7 +216,6 @@ _CCCL_HOST_DEVICE constexpr auto block_dims(T t) noexcept
   return level_dimensions<block_level, decltype(dims)>(dims);
 }
 } // namespace cuda::experimental
-#endif // _CCCL_STD_VER >= 2017
 
 #include <cuda/std/__cccl/epilogue.h>
 
diff --git a/examples/cudax/vector_add/vector.cuh b/examples/cudax/vector_add/vector.cuh
@@ -31,7 +31,6 @@
 #include <cuda/experimental/__detail/utility.cuh>
 #include <cuda/experimental/__launch/param_kind.cuh>
 
-#if _CCCL_STD_VER >= 2017
 namespace cuda::experimental
 {
 using ::cuda::std::span;
@@ -144,4 +143,3 @@ private:
 } // namespace cuda::experimental
 
 #endif
-#endif
diff --git a/libcudacxx/test/libcudacxx/heterogeneous/helpers.h b/libcudacxx/test/libcudacxx/heterogeneous/helpers.h
@@ -428,7 +428,6 @@ void validate_device_dynamic(tester_list<Testers...> testers, Args... args)
   permute_tests(test_harness, initial_launcher_list{});
 }
 
-#if _CCCL_STD_VER >= 2014
 template <typename T>
 struct manual_object
 {
@@ -470,7 +469,6 @@ struct manual_object
 
 template <typename T>
 __managed__ manual_object<T> managed_variable{};
-#endif
 
 template <typename Creator, typename Destroyer, typename Validator, std::size_t N>
 void validate_in_managed_memory_helper(const Creator& creator, const Destroyer& destroyer, Validator (&performers)[N])
@@ -529,7 +527,7 @@ void validate_managed(tester_list<Testers...>, Args... args)
   validate_in_managed_memory_helper(device_constructor, device_destructor, host_init_device_check);
   validate_in_managed_memory_helper(device_constructor, device_destructor, device_init_host_check);
 
-#if _CCCL_STD_VER >= 2014 && !defined(__clang__)
+#if !defined(__clang__)
   // The managed variable template part of this test is disabled under clang, pending nvbug 2790305 being fixed.
 
   auto host_variable_constructor = [args...]() -> T* {
diff --git a/thrust/thrust/detail/config/cpp_dialect.h b/thrust/thrust/detail/config/cpp_dialect.h
@@ -72,7 +72,7 @@ THRUST_COMPILER_DEPRECATION(MSVC 2019(19.20 / 16.0 / 14.20));
 #ifndef CCCL_IGNORE_DEPRECATED_CPP_DIALECT
 #  if _CCCL_STD_VER < 2017
 #    error Thrust requires at least C++17. Define CCCL_IGNORE_DEPRECATED_CPP_DIALECT to suppress this message.
-#  endif // _CCCL_STD_VER >= 2017
+#  endif // _CCCL_STD_VER < 2017
 #endif
 
 #undef THRUST_COMP_DEPR_IMPL

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`
`17`	`17`	`#include <cuda/std/__cccl/prologue.h>`
`18`	`18`
`19`		`-#if _CCCL_STD_VER >= 2017`
`20`	`19`	`namespace cuda::experimental`
`21`	`20`	`{`
`22`	`21`	`template <typename T, size_t... Extents>`
`@@ -154,7 +153,6 @@ template <typename TyTrunc, typename Index, typename Dims>`
`154`	`153`	`}`
`155`	`154`	`} // namespace __detail`
`156`	`155`	`} // namespace cuda::experimental`
`157`		`-#endif // _CCCL_STD_VER >= 2017`
`158`	`156`
`159`	`157`	`#include <cuda/std/__cccl/epilogue.h>`
`160`	`158`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@`
`27`	`27`
`28`	`28`	`#include <cuda/std/__cccl/prologue.h>`
`29`	`29`
`30`		`-#if _CCCL_STD_VER >= 2017`
`31`	`30`	`namespace cuda::experimental`
`32`	`31`	`{`
`33`	`32`	`/* TODO right now operator stacking can end up with a wrong unit, we could use below type, but we would need an explicit`
`@@ -398,9 +397,9 @@ struct hierarchy_dimensions`
`398`	`397`	`: levels(ls)`
`399`	`398`	`{}`
`400`	`399`
`401`		`-# if !defined(_CCCL_NO_THREE_WAY_COMPARISON) && !_CCCL_COMPILER(MSVC, <, 19, 39) && !_CCCL_COMPILER(GCC, <, 12)`
	`400`	`+#if !defined(_CCCL_NO_THREE_WAY_COMPARISON) && !_CCCL_COMPILER(MSVC, <, 19, 39) && !_CCCL_COMPILER(GCC, <, 12)`
`402`	`401`	`[[nodiscard]] _CCCL_HIDE_FROM_ABI constexpr bool operator==(const hierarchy_dimensions&) const noexcept = default;`
`403`		`-# else // ^^^ !_CCCL_NO_THREE_WAY_COMPARISON ^^^ / vvv _CCCL_NO_THREE_WAY_COMPARISON vvv`
	`402`	`+#else // ^^^ !_CCCL_NO_THREE_WAY_COMPARISON ^^^ / vvv _CCCL_NO_THREE_WAY_COMPARISON vvv`
`404`	`403`	`[[nodiscard]] _CCCL_API friend constexpr bool`
`405`	`404`	`operator==(const hierarchy_dimensions& left, const hierarchy_dimensions& right) noexcept`
`406`	`405`	`{`
`@@ -412,7 +411,7 @@ struct hierarchy_dimensions`
`412`	`411`	`{`
`413`	`412`	`return left.levels != right.levels;`
`414`	`413`	`}`
`415`		`-# endif // _CCCL_NO_THREE_WAY_COMPARISON`
	`414`	`+#endif // _CCCL_NO_THREE_WAY_COMPARISON`
`416`	`415`
`417`	`416`	`private:`
`418`	`417`	`// This being static is a bit of a hack to make extents_type working without incomplete class member access`
`@@ -819,12 +818,12 @@ public:`
`819`	`818`	`}`
`820`	`819`	`}`
`821`	`820`
`822`		`-# ifndef _CCCL_DOXYGEN_INVOKED // Do not document`
	`821`	`+#ifndef _CCCL_DOXYGEN_INVOKED // Do not document`
`823`	`822`	`constexpr hierarchy_dimensions combine([[maybe_unused]] __empty_hierarchy __empty) const`
`824`	`823`	`{`
`825`	`824`	`return *this;`
`826`	`825`	`}`
`827`		`-# endif // _CCCL_DOXYGEN_INVOKED`
	`826`	`+#endif // _CCCL_DOXYGEN_INVOKED`
`828`	`827`	`};`
`829`	`828`
`830`	`829`	`/**`
`@@ -944,7 +943,6 @@ constexpr auto hierarchy_add_level(const hierarchy_dimensions<Unit, Levels...>&`
`944`	`943`	`}`
`945`	`944`	`}`
`946`	`945`	`} // namespace cuda::experimental`
`947`		`-#endif // _CCCL_STD_VER >= 2017`
`948`	`946`
`949`	`947`	`#include <cuda/std/__cccl/epilogue.h>`
`950`	`948`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@`
`19`	`19`
`20`	`20`	`#include <cuda/std/__cccl/prologue.h>`
`21`	`21`
`22`		`-#if _CCCL_STD_VER >= 2017`
`23`	`22`	`namespace cuda::experimental`
`24`	`23`	`{`
`25`	`24`	`namespace hierarchy`
`@@ -488,7 +487,6 @@ _CCCL_DEVICE auto index(const Unit&, const Level&)`
`488`	`487`	`}`
`489`	`488`	`} // namespace hierarchy`
`490`	`489`	`} // namespace cuda::experimental`
`491`		`-#endif // _CCCL_STD_VER >= 2017`
`492`	`490`
`493`	`491`	`#include <cuda/std/__cccl/epilogue.h>`
`494`	`492`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@`
`18`	`18`
`19`	`19`	`#include <cuda/std/__cccl/prologue.h>`
`20`	`20`
`21`		`-#if _CCCL_STD_VER >= 2017`
`22`	`21`	`namespace cuda::experimental`
`23`	`22`	`{`
`24`	`23`	`namespace __detail`
`@@ -128,9 +127,9 @@ struct level_dimensions`
`128`	`127`	`_CCCL_HOST_DEVICE constexpr level_dimensions()`
`129`	`128`	`: dims(){};`
`130`	`129`
`131`		`-# if !defined(_CCCL_NO_THREE_WAY_COMPARISON) && !_CCCL_COMPILER(MSVC, <, 19, 39) && !_CCCL_COMPILER(GCC, <, 12)`
	`130`	`+#if !defined(_CCCL_NO_THREE_WAY_COMPARISON) && !_CCCL_COMPILER(MSVC, <, 19, 39) && !_CCCL_COMPILER(GCC, <, 12)`
`132`	`131`	`[[nodiscard]] _CCCL_HIDE_FROM_ABI constexpr bool operator==(const level_dimensions&) const noexcept = default;`
`133`		`-# else // ^^^ !_CCCL_NO_THREE_WAY_COMPARISON ^^^ / vvv _CCCL_NO_THREE_WAY_COMPARISON vvv`
	`132`	`+#else // ^^^ !_CCCL_NO_THREE_WAY_COMPARISON ^^^ / vvv _CCCL_NO_THREE_WAY_COMPARISON vvv`
`134`	`133`	`[[nodiscard]] _CCCL_API friend constexpr bool`
`135`	`134`	`operator==(const level_dimensions& left, const level_dimensions& right) noexcept`
`136`	`135`	`{`
`@@ -142,7 +141,7 @@ struct level_dimensions`
`142`	`141`	`{`
`143`	`142`	`return left.dims != right.dims;`
`144`	`143`	`}`
`145`		`-# endif // _CCCL_NO_THREE_WAY_COMPARISON`
	`144`	`+#endif // _CCCL_NO_THREE_WAY_COMPARISON`
`146`	`145`	`};`
`147`	`146`
`148`	`147`	`/**`
`@@ -217,7 +216,6 @@ _CCCL_HOST_DEVICE constexpr auto block_dims(T t) noexcept`
`217`	`216`	`return level_dimensions<block_level, decltype(dims)>(dims);`
`218`	`217`	`}`
`219`	`218`	`} // namespace cuda::experimental`
`220`		`-#endif // _CCCL_STD_VER >= 2017`
`221`	`219`
`222`	`220`	`#include <cuda/std/__cccl/epilogue.h>`
`223`	`221`