Rely on the host stl to provide ranges

NVIDIA · Oct 30, 2024 · 6b279a3 · 6b279a3
1 parent b9b3508
commit 6b279a3
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/span b/libcudacxx/include/cuda/std/detail/libcxx/include/span
@@ -201,9 +201,10 @@ _CCCL_INLINE_VAR constexpr bool __is_std_span<span<_Tp, _Extent>> = true;
 template <class _From, class _To>
 _LIBCUDACXX_CONCEPT __span_array_convertible = _CCCL_TRAIT(is_convertible, _From (*)[], _To (*)[]);
 
-#  if _CCCL_STD_VER >= 2020 && !defined(_CCCL_COMPILER_MSVC_2017)
+// We want to eensure that span interacts nicely with containers that might not have had the ranges treatment
+#  if defined(__cpp_lib_ranges) && !defined(_CCCL_COMPILER_MSVC_2017)
 #    define _CCCL_SPAN_USES_RANGES
-#  endif // _CCCL_STD_VER >= 2020 && !_CCCL_COMPILER_MSVC_2017
+#  endif // __cpp_lib_ranges && !_CCCL_COMPILER_MSVC_2017
 
 #  if defined(_CCCL_SPAN_USES_RANGES)
 template <class _Range, class _ElementType>