diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__ranges/enable_view.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__ranges/enable_view.h index 1b8ad5b2ea..905b41e521 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__ranges/enable_view.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__ranges/enable_view.h @@ -31,24 +31,24 @@ #endif // no system header _LIBCUDACXX_BEGIN_NAMESPACE_RANGES -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER >= 2017 struct view_base { }; _LIBCUDACXX_BEGIN_NAMESPACE_RANGES_ABI -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER >= 2020 template requires is_class_v<_Derived> && same_as<_Derived, remove_cv_t<_Derived>> class view_interface; -#else +#else // ^^^ _CCCL_STD_VER >= 2020 ^^^ / vvv _CCCL_STD_VER <= 2017 vvv template && same_as<_Derived, remove_cv_t<_Derived>>, int> = 0> class view_interface; -#endif // _LIBCUDACXX_STD_VER < 17 +#endif // _CCCL_STD_VER <= 2017 _LIBCUDACXX_END_NAMESPACE_RANGES_ABI @@ -57,13 +57,13 @@ _LIBCUDACXX_TEMPLATE(class _Op, class _Yp) _LIBCUDACXX_INLINE_VISIBILITY void __is_derived_from_view_interface(const _Op*, const view_interface<_Yp>*); -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER >= 2020 template _LIBCUDACXX_INLINE_VAR constexpr bool enable_view = derived_from<_Tp, view_base> || requires { _CUDA_VRANGES::__is_derived_from_view_interface((_Tp*)nullptr, (_Tp*)nullptr); }; -#else +#else // ^^^ _CCCL_STD_VER >= 2020 ^^^ / vvv _CCCL_STD_VER <= 2017 vvv template _LIBCUDACXX_INLINE_VAR constexpr bool enable_view = derived_from<_Tp, view_base>; @@ -71,9 +71,9 @@ _LIBCUDACXX_INLINE_VAR constexpr bool enable_view = derived_from<_Tp, view_base> template _LIBCUDACXX_INLINE_VAR constexpr bool enable_view<_Tp, void_t> = true; -#endif // _LIBCUDACXX_STD_VER < 17 +#endif // _CCCL_STD_VER <= 2017 -#endif // _LIBCUDACXX_STD_VER > 14 +#endif // _CCCL_STD_VER >= 2017 _LIBCUDACXX_END_NAMESPACE_RANGES