diff --git a/cub/cub/detail/cpp_compatibility.cuh b/cub/cub/detail/cpp_compatibility.cuh index 54c6418fcc5..adab0dae29b 100644 --- a/cub/cub/detail/cpp_compatibility.cuh +++ b/cub/cub/detail/cpp_compatibility.cuh @@ -27,7 +27,7 @@ # pragma system_header #endif // no system header -#if CUB_CPP_DIALECT >= 2017 && __cpp_if_constexpr +#if _CCCL_STD_VER >= 2017 && __cpp_if_constexpr # define CUB_IF_CONSTEXPR if constexpr # define CUB_ELSE_IF_CONSTEXPR else if constexpr #else diff --git a/cub/cub/detail/type_traits.cuh b/cub/cub/detail/type_traits.cuh index 46bc0598de6..b2002519dd6 100644 --- a/cub/cub/detail/type_traits.cuh +++ b/cub/cub/detail/type_traits.cuh @@ -53,7 +53,7 @@ namespace detail { template using invoke_result_t = -#if CUB_CPP_DIALECT < 2017 +#if _CCCL_STD_VER < 2017 typename ::cuda::std::result_of::type; #else // 2017+ ::cuda::std::invoke_result_t; diff --git a/cub/cub/thread/thread_operators.cuh b/cub/cub/thread/thread_operators.cuh index ad9b657f709..c9f354f6a74 100644 --- a/cub/cub/thread/thread_operators.cuh +++ b/cub/cub/thread/thread_operators.cuh @@ -78,7 +78,7 @@ struct InequalityWrapper } }; -#if CUB_CPP_DIALECT > 2011 +#if _CCCL_STD_VER > 2011 using Equality = ::cuda::std::equal_to<>; using Inequality = ::cuda::std::not_equal_to<>; using Sum = ::cuda::std::plus<>; diff --git a/cub/cub/util_cpp_dialect.cuh b/cub/cub/util_cpp_dialect.cuh index 6f476fa807e..3e43a01ece1 100644 --- a/cub/cub/util_cpp_dialect.cuh +++ b/cub/cub/util_cpp_dialect.cuh @@ -41,7 +41,7 @@ #include -#ifndef DOXYGEN_SHOULD_SKIP_THIS // Do not document +#ifndef DOXYGEN_SHOULD_SKIP_THIS // Do not document // Deprecation warnings may be silenced by defining the following macros. These // may be combined. @@ -73,38 +73,7 @@ # define CUB_IGNORE_DEPRECATED_COMPILER #endif -// Define this to override the built-in detection. -#ifndef CUB_CPP_DIALECT - -// MSVC does not define __cplusplus correctly. _MSVC_LANG is used instead. -// This macro is only defined in MSVC 2015U3+. -# ifdef _MSVC_LANG // Do not replace with CUB_HOST_COMPILER test (see above) -// MSVC2015 reports C++14 but lacks extended constexpr support. Treat as C++11. -# if CUB_MSVC_VERSION < 1910 && _MSVC_LANG > 201103L /* MSVC < 2017 && CPP > 2011 */ -# define CUB_CPLUSPLUS 201103L /* Fix to 2011 */ -# else -# define CUB_CPLUSPLUS _MSVC_LANG /* We'll trust this for now. */ -# endif // MSVC 2015 C++14 fix -# else -# define CUB_CPLUSPLUS __cplusplus -# endif - -// Detect current dialect: -# if CUB_CPLUSPLUS < 201103L -# define CUB_CPP_DIALECT 2003 -# elif CUB_CPLUSPLUS < 201402L -# define CUB_CPP_DIALECT 2011 -# elif CUB_CPLUSPLUS < 201703L -# define CUB_CPP_DIALECT 2014 -# elif CUB_CPLUSPLUS == 201703L -# define CUB_CPP_DIALECT 2017 -# elif CUB_CPLUSPLUS > 201703L // unknown, but is higher than 2017. -# define CUB_CPP_DIALECT 2020 -# endif - -# undef CUB_CPLUSPLUS // cleanup - -#endif // !CUB_CPP_DIALECT +#define CUB_CPP_DIALECT _CCCL_STD_VER // Define CUB_COMPILER_DEPRECATION macro: #if CUB_HOST_COMPILER == CUB_HOST_COMPILER_MSVC @@ -144,10 +113,10 @@ #ifndef CUB_IGNORE_DEPRECATED_DIALECT // Dialect checks: -# if CUB_CPP_DIALECT < 2011 +# if _CCCL_STD_VER < 2011 // = 2014 +#elif _CCCL_STD_VER >= 2014 # define CUB_DEPRECATED [[deprecated]] # define CUB_DEPRECATED_BECAUSE(MSG) [[deprecated(MSG)]] #elif CUB_HOST_COMPILER == CUB_HOST_COMPILER_MSVC diff --git a/cub/docs/repo.toml b/cub/docs/repo.toml index eed418d51e9..5fc7ed395e0 100644 --- a/cub/docs/repo.toml +++ b/cub/docs/repo.toml @@ -84,6 +84,7 @@ doxygen_aliases = [ # more information on the format can be found at: # https://www.doxygen.nl/manual/config.html#cfg_predefined doxygen_predefined = [ + "_CCCL_STD_VER", "CUB_DISABLE_NAMESPACE_MAGIC", "CUB_IGNORE_NAMESPACE_MAGIC_ERROR", "CUB_NAMESPACE_BEGIN=namespace cub {", diff --git a/cub/examples/block/example_block_reduce_dyn_smem.cu b/cub/examples/block/example_block_reduce_dyn_smem.cu index 2c2ce24c32e..69efa4f1692 100644 --- a/cub/examples/block/example_block_reduce_dyn_smem.cu +++ b/cub/examples/block/example_block_reduce_dyn_smem.cu @@ -47,7 +47,7 @@ #include "../../test/test_util.h" // Some implementation details rely on c++14 -#if CUB_CPP_DIALECT >= 2014 +#if _CCCL_STD_VER >= 2014 using namespace cub; @@ -86,7 +86,7 @@ __global__ void BlockReduceKernel( // shared memory byte-array extern __shared__ __align__(alignof(ShmemLayout)) char smem[]; - + // cast to lvalue reference of expected type auto& temp_storage = reinterpret_cast(smem); diff --git a/cub/test/test_warning_suppression.cuh b/cub/test/test_warning_suppression.cuh index 4187dd13369..9f46d454751 100644 --- a/cub/test/test_warning_suppression.cuh +++ b/cub/test/test_warning_suppression.cuh @@ -34,7 +34,7 @@ // This can be fixed with `if constexpr` when available, but there's no way to // silence these pre-C++17. #if CUB_HOST_COMPILER == CUB_HOST_COMPILER_MSVC -# if CUB_CPP_DIALECT < 2017 +# if _CCCL_STD_VER < 2017 # pragma warning(disable:4127) # endif #endif diff --git a/libcudacxx/include/cuda/memory_resource b/libcudacxx/include/cuda/memory_resource index a95ab201aa5..1dd7b20f477 100644 --- a/libcudacxx/include/cuda/memory_resource +++ b/libcudacxx/include/cuda/memory_resource @@ -91,7 +91,7 @@ class resource_ref { #include -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 _LIBCUDACXX_BEGIN_NAMESPACE_CUDA /////////////////////////////////////////////////////////////////////////////// @@ -233,7 +233,7 @@ _LIBCUDACXX_CONCEPT async_resource = _LIBCUDACXX_FRAGMENT(__async_resource_, _Re /// \concept resource_with /// \brief The \c resource_with concept template -#if _LIBCUDACXX_STD_VER < 17 +#if _CCCL_STD_VER < 2017 _LIBCUDACXX_CONCEPT resource_with = resource<_Resource>&& _CUDA_VSTD::conjunction_v<_CUDA_VSTD::bool_constant>...>; #else @@ -243,7 +243,7 @@ _LIBCUDACXX_CONCEPT resource_with = resource<_Resource> && (has_property<_Resour /// \concept async_resource_with /// \brief The \c async_resource_with concept template -#if _LIBCUDACXX_STD_VER < 17 +#if _CCCL_STD_VER < 2017 _LIBCUDACXX_CONCEPT async_resource_with = async_resource<_Resource> && _CUDA_VSTD::conjunction_v<_CUDA_VSTD::bool_constant>...>; #else @@ -530,7 +530,7 @@ public: , _Filtered_vtable<_Properties...>(_Filtered_vtable<_Properties...>::template _Create<_Resource>()) {} - #if _LIBCUDACXX_STD_VER > 14 + #if _CCCL_STD_VER > 2014 _LIBCUDACXX_TEMPLATE(class... _OtherProperties) _LIBCUDACXX_REQUIRES( (_CUDA_VSTD::_One_of<_Properties, _OtherProperties...> && ...)) #else @@ -544,7 +544,7 @@ public: , _Filtered_vtable<_Properties...>(__ref) {} - #if _LIBCUDACXX_STD_VER > 14 + #if _CCCL_STD_VER > 2014 _LIBCUDACXX_TEMPLATE(class... _OtherProperties) _LIBCUDACXX_REQUIRES( (_Alloc_type == _AllocType::_Default) && (_CUDA_VSTD::_One_of<_Properties, _OtherProperties...> && ...)) @@ -560,7 +560,7 @@ public: , _Filtered_vtable<_Properties...>(__ref) {} - #if _LIBCUDACXX_STD_VER > 14 + #if _CCCL_STD_VER > 2014 _LIBCUDACXX_TEMPLATE(class... _OtherProperties) _LIBCUDACXX_REQUIRES((sizeof...(_Properties) == sizeof...(_OtherProperties)) && (_CUDA_VSTD::_One_of<_Properties, _OtherProperties...> && ...)) @@ -576,7 +576,7 @@ public: && this->__static_vtable->__equal_fn(this->__object, __right.__object); } - #if _LIBCUDACXX_STD_VER > 14 + #if _CCCL_STD_VER > 2014 _LIBCUDACXX_TEMPLATE(class... _OtherProperties) _LIBCUDACXX_REQUIRES( (sizeof...(_Properties) == sizeof...(_OtherProperties)) && (_CUDA_VSTD::_One_of<_Properties, _OtherProperties...> && ...)) @@ -623,7 +623,7 @@ struct host_accessible{}; } // namespace mr _LIBCUDACXX_END_NAMESPACE_CUDA -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 #include diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/CMakeLists.txt b/libcudacxx/include/cuda/std/detail/libcxx/include/CMakeLists.txt index 5420d5d8689..f9c84eb926d 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/CMakeLists.txt +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/CMakeLists.txt @@ -48,6 +48,9 @@ set(files __bsd_locale_fallbacks.h __errc __cccl_config + __cccl/dialect.h + __cccl/version.h + __cccl/visibility.h __concepts/__concept_macros.h __concepts/_One_of.h __concepts/arithmetic.h diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__algorithm/copy.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__algorithm/copy.h index dd600cfc9ee..ca932ffa79c 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__algorithm/copy.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__algorithm/copy.h @@ -48,13 +48,13 @@ template inline _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX17 bool __dispatch_memmove(_Up* __result, _Tp* __first, const size_t __n) { -#if _LIBCUDACXX_STD_VER >= 20 +#if _CCCL_STD_VER >= 2020 if (_CUDA_VSTD::is_constant_evaluated()) { return false; } else -#endif // _LIBCUDACXX_STD_VER >= 20 +#endif // _CCCL_STD_VER >= 2020 { // For now, we only ever use memmove on host // clang-format off diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__algorithm/equal.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__algorithm/equal.h index a48b2b40dcf..3424217a7fe 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__algorithm/equal.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__algorithm/equal.h @@ -49,7 +49,7 @@ equal(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first return _CUDA_VSTD::equal(__first1, __last1, __first2, __equal_to{}); } -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template _LIBCUDACXX_NODISCARD_EXT inline _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX11 bool __equal(_InputIterator1 __first1, @@ -119,7 +119,7 @@ equal(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first typename iterator_traits<_InputIterator1>::iterator_category(), typename iterator_traits<_InputIterator2>::iterator_category()); } -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__algorithm/is_permutation.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__algorithm/is_permutation.h index fb7a8df439a..7517ed16f20 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__algorithm/is_permutation.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__algorithm/is_permutation.h @@ -108,7 +108,7 @@ is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIt return _CUDA_VSTD::is_permutation(__first1, __last1, __first2, __equal_to{}); } -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template _LIBCUDACXX_NODISCARD_EXT inline _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX11 bool __is_permutation( @@ -245,7 +245,7 @@ is_permutation( __iterator_category_type<_ForwardIterator1>{}, __iterator_category_type<_ForwardIterator2>{}); } -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__algorithm/mismatch.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__algorithm/mismatch.h index e5644b6810a..88853a36119 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__algorithm/mismatch.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__algorithm/mismatch.h @@ -50,7 +50,7 @@ _LIBCUDACXX_NODISCARD_EXT inline _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VI return _CUDA_VSTD::mismatch(__first1, __last1, __first2, __equal_to{}); } -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template _LIBCUDACXX_NODISCARD_EXT inline _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX11 pair<_InputIterator1, _InputIterator2> @@ -77,7 +77,7 @@ _LIBCUDACXX_NODISCARD_EXT inline _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VI { return _CUDA_VSTD::mismatch(__first1, __last1, __first2, __last2, __equal_to{}); } -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__algorithm/search.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__algorithm/search.h index 4549c93551b..0a63a6436eb 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__algorithm/search.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__algorithm/search.h @@ -172,7 +172,7 @@ _LIBCUDACXX_NODISCARD_EXT inline _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VI return _CUDA_VSTD::search(__first1, __last1, __first2, __last2, __equal_to{}); } -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 template _LIBCUDACXX_NODISCARD_EXT inline _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX11 _ForwardIterator diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__bit_reference b/libcudacxx/include/cuda/std/detail/libcxx/include/__bit_reference index 14377c0b1bc..513899d3733 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__bit_reference +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__bit_reference @@ -1113,7 +1113,7 @@ private: public: _LIBCUDACXX_INLINE_VISIBILITY __bit_iterator() noexcept -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 : __seg_(nullptr), __ctz_(0) #endif {} diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__cccl/dialect.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__cccl/dialect.h new file mode 100644 index 00000000000..fca065cb29e --- /dev/null +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__cccl/dialect.h @@ -0,0 +1,44 @@ +//===----------------------------------------------------------------------===// +// +// Part of libcu++, the C++ Standard Library for your entire system, +// under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES. +// +//===----------------------------------------------------------------------===// + +#ifndef __CCCL_DIALECT_H +#define __CCCL_DIALECT_H + +#if defined(_CCCL_COMPILER_MSVC) +# if _MSVC_LANG <= 201103L +# define _CCCL_STD_VER 2011 +# elif _MSVC_LANG <= 201402L +# define _CCCL_STD_VER 2014 +# elif _MSVC_LANG <= 201703L +# define _CCCL_STD_VER 2017 +# elif _MSVC_LANG <= 202002L +# define _CCCL_STD_VER 2020 +# else +# define _CCCL_STD_VER 2023 // current year, or date of c++2b ratification +# endif +#else // ^^^ _CCCL_COMPILER_MSVC ^^^ / vvv !_CCCL_COMPILER_MSVC vvv +# if __cplusplus <= 199711L +# define _CCCL_STD_VER 2003 +# elif __cplusplus <= 201103L +# define _CCCL_STD_VER 2011 +# elif __cplusplus <= 201402L +# define _CCCL_STD_VER 2014 +# elif __cplusplus <= 201703L +# define _CCCL_STD_VER 2017 +# elif __cplusplus <= 202002L +# define _CCCL_STD_VER 2020 +# elif __cplusplus <= 202302L +# define _CCCL_STD_VER 2023 +# else +# define _CCCL_STD_VER 2024 // current year, or date of c++2c ratification +# endif +#endif // !_CCCL_COMPILER_MSVC + +#endif // __CCCL_DIALECT_H diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__cccl_config b/libcudacxx/include/cuda/std/detail/libcxx/include/__cccl_config index 06e8aada87e..4c990fc8419 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__cccl_config +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__cccl_config @@ -165,6 +165,7 @@ # define _CCCL_NV_DIAG_DEFAULT(_WARNING) #endif // other compilers +#include "__cccl/dialect.h" #include "__cccl/visibility.h" #endif // __CCCL_CONFIG diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/_One_of.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/_One_of.h index 5e4d1389595..82460cf12fe 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/_One_of.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/_One_of.h @@ -28,13 +28,13 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 template _LIBCUDACXX_CONCEPT _One_of = (is_same_v<_Ty, _Others> || ...); -#elif _LIBCUDACXX_STD_VER > 11 +#elif _CCCL_STD_VER > 2011 template _LIBCUDACXX_CONCEPT _One_of = _LIBCUDACXX_TRAIT(disjunction, is_same<_Ty, _Others>...); -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/__concept_macros.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/__concept_macros.h index 93375b7b3ce..b6351d6abed 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/__concept_macros.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/__concept_macros.h @@ -26,7 +26,7 @@ # pragma system_header #endif // no system header -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 #define _LIBCUDACXX_PP_CAT_(_Xp, ...) _Xp##__VA_ARGS__ #define _LIBCUDACXX_PP_CAT(_Xp, ...) _LIBCUDACXX_PP_CAT_(_Xp, __VA_ARGS__) @@ -166,7 +166,7 @@ _LIBCUDACXX_PP_CAT3(_LIBCUDACXX_PP_EAT_TYPENAME_, __VA_ARGS__) #define _LIBCUDACXX_PP_EAT_TYPENAME_typename -#if (defined(__cpp_concepts) && _LIBCUDACXX_STD_VER >= 20) || \ +#if (defined(__cpp_concepts) && _CCCL_STD_VER >= 2020) || \ defined(_LIBCUDACXX_DOXYGEN_INVOKED) #define _LIBCUDACXX_CONCEPT concept @@ -248,7 +248,7 @@ // _LIBCUDACXX_REQUIRES( Concept1 _LIBCUDACXX_AND Concept2<_Bp>) // void foo(A a, _Bp b) // {} -#if (defined(__cpp_concepts) && _LIBCUDACXX_STD_VER >= 20) +#if (defined(__cpp_concepts) && _CCCL_STD_VER >= 2020) #define _LIBCUDACXX_TEMPLATE(...) template <__VA_ARGS__> #define _LIBCUDACXX_REQUIRES(...) requires __VA_ARGS__ #define _LIBCUDACXX_AND && @@ -294,6 +294,6 @@ _LIBCUDACXX_INLINE_VAR constexpr int _Requires = 0; #endif } // namespace _Concept -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 #endif //_CUDA___CONCEPTS diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/arithmetic.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/arithmetic.h index 5808d7d1dbb..ee881936839 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/arithmetic.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/arithmetic.h @@ -32,7 +32,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 // [concepts.arithmetic], arithmetic concepts @@ -54,7 +54,7 @@ _LIBCUDACXX_CONCEPT __libcpp_unsigned_integer = __libcpp_is_unsigned_integer<_Tp template _LIBCUDACXX_CONCEPT __libcpp_signed_integer = __libcpp_is_signed_integer<_Tp>::value; -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/assignable.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/assignable.h index 3d9522466c2..67fccfd8664 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/assignable.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/assignable.h @@ -31,7 +31,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 // [concept.assignable] @@ -43,7 +43,7 @@ concept assignable_from = { __lhs = _CUDA_VSTD::forward<_Rhs>(__rhs) } -> same_as<_Lhs>; }; -#elif _LIBCUDACXX_STD_VER > 11 +#elif _CCCL_STD_VER > 2011 template _LIBCUDACXX_CONCEPT_FRAGMENT( @@ -57,7 +57,7 @@ _LIBCUDACXX_CONCEPT_FRAGMENT( template _LIBCUDACXX_CONCEPT assignable_from = _LIBCUDACXX_FRAGMENT(__assignable_from_, _Lhs, _Rhs); -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/boolean_testable.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/boolean_testable.h index 4a6c97a17ea..000bff3daf8 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/boolean_testable.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/boolean_testable.h @@ -28,7 +28,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 // [concepts.booleantestable] @@ -40,7 +40,7 @@ concept __boolean_testable = __boolean_testable_impl<_Tp> && requires(_Tp&& __t) { !_CUDA_VSTD::forward<_Tp>(__t) } -> __boolean_testable_impl; }; -#elif _LIBCUDACXX_STD_VER > 11 +#elif _CCCL_STD_VER > 2011 template _LIBCUDACXX_CONCEPT __boolean_testable_impl = convertible_to<_Tp, bool>; @@ -56,7 +56,7 @@ _LIBCUDACXX_CONCEPT_FRAGMENT( template _LIBCUDACXX_CONCEPT __boolean_testable = _LIBCUDACXX_FRAGMENT(__boolean_testable_, _Tp); -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/class_or_enum.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/class_or_enum.h index df59bd78dd4..6a9568c1ffe 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/class_or_enum.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/class_or_enum.h @@ -30,7 +30,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template _LIBCUDACXX_CONCEPT __class_or_enum = _LIBCUDACXX_TRAIT(is_class, _Tp) || _LIBCUDACXX_TRAIT(is_union, _Tp) || _LIBCUDACXX_TRAIT(is_enum, _Tp); @@ -40,7 +40,7 @@ _LIBCUDACXX_CONCEPT __class_or_enum = _LIBCUDACXX_TRAIT(is_class, _Tp) || _LIBCU template _LIBCUDACXX_CONCEPT __workaround_52970 = _LIBCUDACXX_TRAIT(is_class, remove_cvref_t<_Tp>) || _LIBCUDACXX_TRAIT(is_union, remove_cvref_t<_Tp>); -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/common_reference_with.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/common_reference_with.h index b54e78be12c..104cf42a354 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/common_reference_with.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/common_reference_with.h @@ -31,7 +31,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 // [concept.commonref] @@ -41,7 +41,7 @@ concept common_reference_with = convertible_to<_Tp, common_reference_t<_Tp, _Up>> && convertible_to<_Up, common_reference_t<_Tp, _Up>>; -#elif _LIBCUDACXX_STD_VER > 11 +#elif _CCCL_STD_VER > 2011 template _LIBCUDACXX_CONCEPT_FRAGMENT( @@ -67,7 +67,7 @@ _LIBCUDACXX_CONCEPT_FRAGMENT( template _LIBCUDACXX_CONCEPT common_reference_with = _LIBCUDACXX_FRAGMENT(__common_reference_with_, _Tp, _Up); -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/common_with.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/common_with.h index 8fb9fcb7963..e00d50e8c24 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/common_with.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/common_with.h @@ -31,7 +31,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 // [concept.common] @@ -51,7 +51,7 @@ concept common_with = add_lvalue_reference_t, add_lvalue_reference_t>>; -#elif _LIBCUDACXX_STD_VER > 11 +#elif _CCCL_STD_VER > 2011 template _LIBCUDACXX_CONCEPT_FRAGMENT( @@ -95,7 +95,7 @@ _LIBCUDACXX_CONCEPT_FRAGMENT( template _LIBCUDACXX_CONCEPT common_with = _LIBCUDACXX_FRAGMENT(__common_with_, _Tp, _Up); -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/constructible.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/constructible.h index c338467d857..bd7549b3968 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/constructible.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/constructible.h @@ -30,7 +30,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 // [concept.constructible] template @@ -58,7 +58,7 @@ concept copy_constructible = constructible_from<_Tp, const _Tp&> && convertible_to && constructible_from<_Tp, const _Tp> && convertible_to; -#elif _LIBCUDACXX_STD_VER > 11 +#elif _CCCL_STD_VER > 2011 template _LIBCUDACXX_CONCEPT_FRAGMENT( @@ -118,7 +118,7 @@ _LIBCUDACXX_CONCEPT_FRAGMENT( template _LIBCUDACXX_CONCEPT copy_constructible = _LIBCUDACXX_FRAGMENT(__copy_constructible_, _Tp); -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/convertible_to.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/convertible_to.h index 5ac5f4cc42c..1fb718298c2 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/convertible_to.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/convertible_to.h @@ -28,7 +28,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 // [concept.convertible] @@ -39,7 +39,7 @@ concept convertible_to = static_cast<_To>(_CUDA_VSTD::declval<_From>()); }; -#elif _LIBCUDACXX_STD_VER > 11 +#elif _CCCL_STD_VER > 2011 #if defined(_LIBCUDACXX_COMPILER_MSVC) _LIBCUDACXX_NV_DIAG_SUPPRESS(1211) // nonstandard cast to array type ignored @@ -71,7 +71,7 @@ _LIBCUDACXX_CONCEPT convertible_to = _LIBCUDACXX_FRAGMENT(__convertible_to_, _Fr _LIBCUDACXX_NV_DIAG_DEFAULT(1211) // nonstandard cast to array type ignored #endif // _LIBCUDACXX_COMPILER_MSVC -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/copyable.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/copyable.h index 8a4b6dede36..6aae4990524 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/copyable.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/copyable.h @@ -29,7 +29,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 // [concepts.object] @@ -41,7 +41,7 @@ concept copyable = assignable_from<_Tp&, const _Tp&> && assignable_from<_Tp&, const _Tp>; -#elif _LIBCUDACXX_STD_VER > 11 +#elif _CCCL_STD_VER > 2011 template _LIBCUDACXX_CONCEPT_FRAGMENT( @@ -57,7 +57,7 @@ _LIBCUDACXX_CONCEPT_FRAGMENT( template _LIBCUDACXX_CONCEPT copyable = _LIBCUDACXX_FRAGMENT(__copyable_,_Tp); -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/derived_from.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/derived_from.h index 0075ae97c4e..acc39c85461 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/derived_from.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/derived_from.h @@ -29,7 +29,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 // [concept.derived] @@ -38,7 +38,7 @@ concept derived_from = is_base_of_v<_Bp, _Dp> && is_convertible_v; -#elif _LIBCUDACXX_STD_VER > 11 +#elif _CCCL_STD_VER > 2011 template _LIBCUDACXX_CONCEPT_FRAGMENT( @@ -51,7 +51,7 @@ _LIBCUDACXX_CONCEPT_FRAGMENT( template _LIBCUDACXX_CONCEPT derived_from = _LIBCUDACXX_FRAGMENT(__derived_from_, _Dp, _Bp); -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/destructible.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/destructible.h index 2bb831945d7..2051e39296a 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/destructible.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/destructible.h @@ -32,7 +32,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 #if defined(_LIBCUDACXX_COMPILER_MSVC) @@ -71,7 +71,7 @@ _LIBCUDACXX_CONCEPT destructible = __destructible<_Tp>; #endif // !_LIBCUDACXX_COMPILER_MSVC -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/different_from.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/different_from.h index f157d3c7119..db6d62dd270 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/different_from.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/different_from.h @@ -28,12 +28,12 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template _LIBCUDACXX_CONCEPT __different_from = !same_as, remove_cvref_t<_Up>>; -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/equality_comparable.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/equality_comparable.h index c2b9d1166cd..c6e6b74db72 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/equality_comparable.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/equality_comparable.h @@ -30,7 +30,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 // [concept.equalitycomparable] @@ -56,7 +56,7 @@ concept equality_comparable_with = __make_const_lvalue_ref<_Up>>> && __weakly_equality_comparable_with<_Tp, _Up>; -#elif _LIBCUDACXX_STD_VER > 11 +#elif _CCCL_STD_VER > 2011 template _LIBCUDACXX_CONCEPT_FRAGMENT( @@ -104,7 +104,7 @@ _LIBCUDACXX_CONCEPT_FRAGMENT( template _LIBCUDACXX_CONCEPT equality_comparable_with = _LIBCUDACXX_FRAGMENT(__equality_comparable_with_, _Tp, _Up); -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/invocable.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/invocable.h index 33ad53c0704..8a3f219ebd0 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/invocable.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/invocable.h @@ -28,7 +28,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 // [concept.invocable] @@ -48,7 +48,7 @@ concept __invoke_constructible = requires(_Fun&& __fun, _Args&&... __args) { _CUDA_VSTD::invoke(_CUDA_VSTD::forward<_Fun>(__fun), _CUDA_VSTD::forward<_Args>(__args)...)); }; -#elif _LIBCUDACXX_STD_VER > 11 +#elif _CCCL_STD_VER > 2011 template _LIBCUDACXX_CONCEPT_FRAGMENT( @@ -73,7 +73,7 @@ _LIBCUDACXX_CONCEPT_FRAGMENT( template _LIBCUDACXX_CONCEPT __invoke_constructible = _LIBCUDACXX_FRAGMENT(__invoke_constructible_, _Fun, _Args...); -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/movable.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/movable.h index 233af6d63ba..46d4f0bc384 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/movable.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/movable.h @@ -30,7 +30,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 template concept movable = @@ -39,7 +39,7 @@ concept movable = assignable_from<_Tp&, _Tp> && swappable<_Tp>; -#elif _LIBCUDACXX_STD_VER > 11 +#elif _CCCL_STD_VER > 2011 // [concepts.object] template @@ -55,7 +55,7 @@ _LIBCUDACXX_CONCEPT_FRAGMENT( template _LIBCUDACXX_CONCEPT movable = _LIBCUDACXX_FRAGMENT(_Movable_, _Tp); -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/predicate.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/predicate.h index f3b54c313be..2ecaba3334f 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/predicate.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/predicate.h @@ -29,13 +29,13 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 template concept predicate = regular_invocable<_Fn, _Args...> && __boolean_testable>; -#elif _LIBCUDACXX_STD_VER > 11 +#elif _CCCL_STD_VER > 2011 // [concept.predicate] template @@ -49,7 +49,7 @@ _LIBCUDACXX_CONCEPT_FRAGMENT( template _LIBCUDACXX_CONCEPT predicate = _LIBCUDACXX_FRAGMENT(_Predicate_, _Fn, _Args...); -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/regular.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/regular.h index e3dbf1fd837..98609f283f2 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/regular.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/regular.h @@ -28,14 +28,14 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 // [concept.object] template concept regular = semiregular<_Tp> && equality_comparable<_Tp>; -#elif _LIBCUDACXX_STD_VER > 11 +#elif _CCCL_STD_VER > 2011 // [concept.object] @@ -50,7 +50,7 @@ _LIBCUDACXX_CONCEPT_FRAGMENT( template _LIBCUDACXX_CONCEPT regular = _LIBCUDACXX_FRAGMENT(__regular_, _Tp); -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/relation.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/relation.h index 8a5da7ad81a..decce7fe285 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/relation.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/relation.h @@ -27,7 +27,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 // [concept.relation] @@ -46,7 +46,7 @@ concept equivalence_relation = relation<_Rp, _Tp, _Up>; template concept strict_weak_order = relation<_Rp, _Tp, _Up>; -#elif _LIBCUDACXX_STD_VER > 11 +#elif _CCCL_STD_VER > 2011 template _LIBCUDACXX_CONCEPT_FRAGMENT( @@ -71,7 +71,7 @@ _LIBCUDACXX_CONCEPT equivalence_relation = relation<_Rp, _Tp, _Up>; template _LIBCUDACXX_CONCEPT strict_weak_order = relation<_Rp, _Tp, _Up>; -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/same_as.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/same_as.h index 0ba84b5cbe6..85dd5779fc7 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/same_as.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/same_as.h @@ -27,7 +27,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 // [concept.same] @@ -37,7 +37,7 @@ _LIBCUDACXX_CONCEPT __same_as_impl = _IsSame<_Tp, _Up>::value; template _LIBCUDACXX_CONCEPT same_as = __same_as_impl<_Tp, _Up> && __same_as_impl<_Up, _Tp>; -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/semiregular.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/semiregular.h index 208fefeb638..158a2af7394 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/semiregular.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/semiregular.h @@ -28,14 +28,14 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 // [concept.object] template concept semiregular = copyable<_Tp> && default_initializable<_Tp>; -#elif _LIBCUDACXX_STD_VER > 11 +#elif _CCCL_STD_VER > 2011 // [concept.object] @@ -50,7 +50,7 @@ _LIBCUDACXX_CONCEPT_FRAGMENT( template _LIBCUDACXX_CONCEPT semiregular = _LIBCUDACXX_FRAGMENT(__semiregular_, _Tp); -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/swappable.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/swappable.h index b2a93adf471..38f4b18cc03 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/swappable.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/swappable.h @@ -43,7 +43,7 @@ _LIBCUDACXX_NV_DIAG_SUPPRESS(461) // nonstandard cast to array type ignored #endif // _LIBCUDACXX_COMPILER_MSVC -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 _LIBCUDACXX_BEGIN_NAMESPACE_RANGES @@ -54,7 +54,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_CPO(__swap) template void swap(_Tp&, _Tp&) = delete; -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 template concept __unqualified_swappable_with = (__class_or_enum> || __class_or_enum>) && @@ -91,10 +91,10 @@ _LIBCUDACXX_BEGIN_NAMESPACE_CPO(__swap) template _LIBCUDACXX_CONCEPT __exchangeable = _LIBCUDACXX_FRAGMENT(__exchangeable_, _Tp); -#endif // _LIBCUDACXX_STD_VER < 20 +#endif // _CCCL_STD_VER < 2020 -#if _LIBCUDACXX_STD_VER > 17 && !defined(_LIBCUDACXX_COMPILER_NVHPC) // nvbug4051640 +#if _CCCL_STD_VER > 2017 && !defined(_LIBCUDACXX_COMPILER_NVHPC) // nvbug4051640 struct __fn; _LIBCUDACXX_NV_DIAG_SUPPRESS(2642) @@ -110,7 +110,7 @@ _LIBCUDACXX_NV_DIAG_DEFAULT(2642) #else template _LIBCUDACXX_INLINE_VAR constexpr bool __swappable_arrays = false; -#endif // _LIBCUDACXX_STD_VER < 20 || defined(_LIBCUDACXX_COMPILER_NVHPC) +#endif // _CCCL_STD_VER < 2020 || defined(_LIBCUDACXX_COMPILER_NVHPC) template @@ -149,7 +149,7 @@ _LIBCUDACXX_NV_DIAG_DEFAULT(2642) } }; -#if _LIBCUDACXX_STD_VER < 20 || defined(_LIBCUDACXX_COMPILER_NVHPC) +#if _CCCL_STD_VER < 2020 || defined(_LIBCUDACXX_COMPILER_NVHPC) template _LIBCUDACXX_CONCEPT_FRAGMENT( __swappable_arrays_, @@ -162,7 +162,7 @@ _LIBCUDACXX_NV_DIAG_DEFAULT(2642) template _LIBCUDACXX_INLINE_VAR constexpr bool __swappable_arrays<_Tp, _Up, _Size, void_t>> = _LIBCUDACXX_FRAGMENT(__swappable_arrays_, _Tp, _Up, _CUDA_VSTD::integral_constant); -#endif // _LIBCUDACXX_STD_VER < 20 || defined(_LIBCUDACXX_COMPILER_NVHPC) +#endif // _CCCL_STD_VER < 2020 || defined(_LIBCUDACXX_COMPILER_NVHPC) template _LIBCUDACXX_INLINE_VAR constexpr bool __noexcept_swappable_arrays<_Tp, _Up, void_t>> = @@ -177,7 +177,7 @@ _LIBCUDACXX_END_NAMESPACE_RANGES _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 template concept swappable = requires(_Tp& __a, _Tp& __b) { _CUDA_VRANGES::swap(__a, __b); }; @@ -218,7 +218,7 @@ _LIBCUDACXX_CONCEPT swappable_with = _LIBCUDACXX_FRAGMENT(__swappable_with_, _Tp _LIBCUDACXX_END_NAMESPACE_STD -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 #if defined(_LIBCUDACXX_COMPILER_MSVC) _LIBCUDACXX_NV_DIAG_DEFAULT(461) // nonstandard cast to array type ignored diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/totally_ordered.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/totally_ordered.h index 9b9a2815d11..3aae97821a3 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/totally_ordered.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/totally_ordered.h @@ -30,7 +30,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 // [concept.totallyordered] @@ -60,7 +60,7 @@ concept totally_ordered_with = __make_const_lvalue_ref<_Up>>> && __partially_ordered_with<_Tp, _Up>; -#elif _LIBCUDACXX_STD_VER > 11 +#elif _CCCL_STD_VER > 2011 template _LIBCUDACXX_CONCEPT_FRAGMENT( @@ -106,7 +106,7 @@ _LIBCUDACXX_CONCEPT_FRAGMENT( template _LIBCUDACXX_CONCEPT totally_ordered_with = _LIBCUDACXX_FRAGMENT(__totally_ordered_with_, _Tp, _Up);; -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__config b/libcudacxx/include/cuda/std/detail/libcxx/include/__config index bf04a0067a1..c1f5f570002 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__config +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__config @@ -116,35 +116,9 @@ extern "C++" { # define _LIBCUDACXX_ABI_VERSION 1 #endif -#ifndef _LIBCUDACXX_STD_VER -# if defined(_MSC_VER) -# if _MSVC_LANG <= 201103L -# define _LIBCUDACXX_STD_VER 11 -# elif _MSVC_LANG <= 201402L -# define _LIBCUDACXX_STD_VER 14 -# elif _MSVC_LANG <= 201703L -# define _LIBCUDACXX_STD_VER 17 -# elif _MSVC_LANG <= 202002L -# define _LIBCUDACXX_STD_VER 20 -# else -# define _LIBCUDACXX_STD_VER 23 // current year, or date of c++2b ratification -# endif -# else -# if __cplusplus <= 201103L -# define _LIBCUDACXX_STD_VER 11 -# elif __cplusplus <= 201402L -# define _LIBCUDACXX_STD_VER 14 -# elif __cplusplus <= 201703L -# define _LIBCUDACXX_STD_VER 17 -# elif __cplusplus <= 202002L -# define _LIBCUDACXX_STD_VER 20 -# else -# define _LIBCUDACXX_STD_VER 23 // current year, or date of c++2b ratification -# endif -# endif -#endif // _LIBCUDACXX_STD_VER +#define _LIBCUDACXX_STD_VER _CCCL_STD_VER -#if _LIBCUDACXX_STD_VER < 11 +#if _CCCL_STD_VER < 2011 # error libcu++ requires C++11 or later #endif @@ -531,12 +505,12 @@ extern "C++" { #endif // __check_builtin(builtin_is_constant_evaluated) // NVCC and NVRTC in C++11 mode freaks out about `__builtin_is_constant_evaluated`. -#if _LIBCUDACXX_STD_VER < 14 \ +#if _CCCL_STD_VER < 2014 \ && (defined(_LIBCUDACXX_COMPILER_NVCC) \ || defined(_LIBCUDACXX_COMPILER_NVRTC) \ || defined(_LIBCUDACXX_COMPILER_NVHPC)) #undef _LIBCUDACXX_IS_CONSTANT_EVALUATED -#endif // _LIBCUDACXX_STD_VER < 14 && defined(_LIBCUDACXX_COMPILER_NVCC) +#endif // _CCCL_STD_VER < 2014 && defined(_LIBCUDACXX_COMPILER_NVCC) #if __check_builtin(builtin_launder) \ || (defined(_LIBCUDACXX_COMPILER_GCC) && _GNUC_VER >= 700) @@ -1013,7 +987,7 @@ typedef __char32_t char32_t; // NVCC cannot properly handle some deductions occuring within NOEXCEPT // C++17 mode causes reference instatiation errors in tuple #if (_GNUC_VER >= 702 && _GNUC_VER <= 805) -#if defined(_LIBCUDACXX_COMPILER_NVCC) && _LIBCUDACXX_STD_VER == 17 +#if defined(_LIBCUDACXX_COMPILER_NVCC) && _CCCL_STD_VER == 2017 #define _LIBCUDACXX_NO_TUPLE_NOEXCEPT #endif #endif @@ -1070,7 +1044,7 @@ typedef __char32_t char32_t; #define _LIBCUDACXX_MSVC_HAS_NO_ISO_INTRIN #endif -#if _LIBCUDACXX_STD_VER < 14 +#if _CCCL_STD_VER < 2014 #define _LIBCUDACXX_HAS_NO_CXX14_CONSTEXPR #define _LIBCUDACXX_HAS_NO_VARIABLE_TEMPLATES #endif @@ -1533,7 +1507,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD _LIBCUDACXX_END_NAMESPACE_STD _LIBCUDACXX_BEGIN_NAMESPACE_RANGES _LIBCUDACXX_END_NAMESPACE_RANGES #endif -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 #define _LIBCUDACXX_BEGIN_NAMESPACE_RANGES_ABI inline namespace __cxx20 { #else #define _LIBCUDACXX_BEGIN_NAMESPACE_RANGES_ABI inline namespace __cxx17 { @@ -1543,7 +1517,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_RANGES _LIBCUDACXX_END_NAMESPACE_RANGES #define _LIBCUDACXX_BEGIN_NAMESPACE_CPO(_CPO) namespace _CPO { _LIBCUDACXX_BEGIN_NAMESPACE_RANGES_ABI #define _LIBCUDACXX_END_NAMESPACE_CPO } } -#if _LIBCUDACXX_STD_VER >= 17 +#if _CCCL_STD_VER >= 2017 #define _LIBCUDACXX_BEGIN_NAMESPACE_FILESYSTEM \ _LIBCUDACXX_BEGIN_NAMESPACE_STD inline namespace __fs { namespace filesystem { #else @@ -1677,7 +1651,7 @@ typedef unsigned int char32_t; #define _LIBCUDACXX_WCTYPE_IS_MASK #endif -#if _LIBCUDACXX_STD_VER <= 17 || !defined(__cpp_char8_t) +#if _CCCL_STD_VER <= 2017 || !defined(__cpp_char8_t) #define _LIBCUDACXX_NO_HAS_CHAR8_T #endif @@ -1690,7 +1664,7 @@ typedef unsigned int char32_t; && !defined(_LIBCUDACXX_CUDACC_BELOW_11_3) # if __has_attribute(deprecated) # define _LIBCUDACXX_DEPRECATED __attribute__ ((deprecated)) -# elif _LIBCUDACXX_STD_VER > 11 +# elif _CCCL_STD_VER > 2011 # define _LIBCUDACXX_DEPRECATED [[deprecated]] # else # define _LIBCUDACXX_DEPRECATED @@ -1701,43 +1675,43 @@ typedef unsigned int char32_t; #define _LIBCUDACXX_DEPRECATED_IN_CXX11 _LIBCUDACXX_DEPRECATED -#if _LIBCUDACXX_STD_VER >= 14 +#if _CCCL_STD_VER >= 2014 # define _LIBCUDACXX_DEPRECATED_IN_CXX14 _LIBCUDACXX_DEPRECATED #else # define _LIBCUDACXX_DEPRECATED_IN_CXX14 #endif -#if _LIBCUDACXX_STD_VER >= 17 +#if _CCCL_STD_VER >= 2017 # define _LIBCUDACXX_DEPRECATED_IN_CXX17 _LIBCUDACXX_DEPRECATED #else # define _LIBCUDACXX_DEPRECATED_IN_CXX17 #endif -#if _LIBCUDACXX_STD_VER >= 20 +#if _CCCL_STD_VER >= 2020 # define _LIBCUDACXX_DEPRECATED_IN_CXX20 _LIBCUDACXX_DEPRECATED #else # define _LIBCUDACXX_DEPRECATED_IN_CXX20 #endif -#if _LIBCUDACXX_STD_VER <= 11 +#if _CCCL_STD_VER <= 2011 # define _LIBCUDACXX_EXPLICIT_AFTER_CXX11 #else # define _LIBCUDACXX_EXPLICIT_AFTER_CXX11 explicit #endif -#if _LIBCUDACXX_STD_VER > 11 && !defined(_LIBCUDACXX_HAS_NO_CXX14_CONSTEXPR) +#if _CCCL_STD_VER > 2011 && !defined(_LIBCUDACXX_HAS_NO_CXX14_CONSTEXPR) # define _LIBCUDACXX_CONSTEXPR_AFTER_CXX11 constexpr #else # define _LIBCUDACXX_CONSTEXPR_AFTER_CXX11 #endif -#if _LIBCUDACXX_STD_VER > 14 && !defined(_LIBCUDACXX_HAS_NO_CXX14_CONSTEXPR) +#if _CCCL_STD_VER > 2014 && !defined(_LIBCUDACXX_HAS_NO_CXX14_CONSTEXPR) # define _LIBCUDACXX_CONSTEXPR_AFTER_CXX14 constexpr #else # define _LIBCUDACXX_CONSTEXPR_AFTER_CXX14 #endif -#if _LIBCUDACXX_STD_VER > 17 && !defined(_LIBCUDACXX_HAS_NO_CXX14_CONSTEXPR) +#if _CCCL_STD_VER > 2017 && !defined(_LIBCUDACXX_HAS_NO_CXX14_CONSTEXPR) # define _LIBCUDACXX_CONSTEXPR_AFTER_CXX17 constexpr #else # define _LIBCUDACXX_CONSTEXPR_AFTER_CXX17 @@ -1758,7 +1732,7 @@ typedef unsigned int char32_t; // The _LIBCUDACXX_NODISCARD_ATTRIBUTE should only be used to define other // NODISCARD macros to the correct attribute. -#if __has_cpp_attribute(nodiscard) || (defined(_LIBCUDACXX_COMPILER_MSVC) && _LIBCUDACXX_STD_VER > 14) +#if __has_cpp_attribute(nodiscard) || (defined(_LIBCUDACXX_COMPILER_MSVC) && _CCCL_STD_VER > 2014) # define _LIBCUDACXX_NODISCARD_ATTRIBUTE [[nodiscard]] #elif defined(_LIBCUDACXX_COMPILER_CLANG) # define _LIBCUDACXX_NODISCARD_ATTRIBUTE [[clang::warn_unused_result]] @@ -1813,13 +1787,13 @@ typedef unsigned int char32_t; #endif #if !defined(_LIBCUDACXX_DISABLE_NODISCARD_AFTER_CXX17) && \ - (_LIBCUDACXX_STD_VER > 17 || defined(_LIBCUDACXX_ENABLE_NODISCARD)) + (_CCCL_STD_VER > 2017 || defined(_LIBCUDACXX_ENABLE_NODISCARD)) # define _LIBCUDACXX_NODISCARD_AFTER_CXX17 _LIBCUDACXX_NODISCARD_ATTRIBUTE #else # define _LIBCUDACXX_NODISCARD_AFTER_CXX17 #endif -#if _LIBCUDACXX_STD_VER > 14 && defined(__cpp_inline_variables) && (__cpp_inline_variables >= 201606L) +#if _CCCL_STD_VER > 2014 && defined(__cpp_inline_variables) && (__cpp_inline_variables >= 201606L) # define _LIBCUDACXX_INLINE_VAR inline #else # define _LIBCUDACXX_INLINE_VAR @@ -2223,7 +2197,7 @@ extern "C" _LIBCUDACXX_FUNC_VIS void __sanitizer_annotate_contiguous_container( // '-Wctad-maybe-unsupported' compiler warning when CTAD is used in user code // with these classes. #if (!defined(_LIBCUDACXX_COMPILER_GCC) || __GNUC__ > 6) \ - && _LIBCUDACXX_STD_VER >= 17 + && _CCCL_STD_VER >= 2017 # define _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(_ClassName) \ template \ _ClassName(typename _Tag::__allow_ctad...) -> _ClassName<_Tag...> @@ -2244,7 +2218,7 @@ extern "C" _LIBCUDACXX_FUNC_VIS void __sanitizer_annotate_contiguous_container( # define _LIBCUDACXX_CPO_ACCESSIBILITY _LIBCUDACXX_INLINE_VAR constexpr #endif -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 # define _LIBCUDACXX_TRAIT(__TRAIT, ...) __TRAIT##_v<__VA_ARGS__> #else # define _LIBCUDACXX_TRAIT(__TRAIT, ...) __TRAIT<__VA_ARGS__>::value @@ -2253,7 +2227,7 @@ extern "C" _LIBCUDACXX_FUNC_VIS void __sanitizer_annotate_contiguous_container( // Older nvcc do not handle the constraint of `construct_at` in earlier std modes // So to preserve our performance optimization we default to the unconstrained // `__construct_at` and only in C++20 use `construct_at` -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 # define _LIBCUDACXX_CONSTRUCT_AT(_LOCATION, ...) \ _CUDA_VSTD::construct_at(_CUDA_VSTD::addressof(_LOCATION), __VA_ARGS__) #else diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__cuda/barrier.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__cuda/barrier.h index 7563ef6a7f4..c19e1c22335 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__cuda/barrier.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__cuda/barrier.h @@ -948,9 +948,9 @@ void __cp_async_shared_global(char * __dest, const char * __src) { // If `if constexpr` is not available, this function gets instantiated even // if is not called. Do not static_assert in that case. -#if _LIBCUDACXX_STD_VER >= 17 +#if _CCCL_STD_VER >= 2017 static_assert(_Copy_size == 4 || _Copy_size == 8 || _Copy_size == 16, "cp.async.shared.global requires a copy size of 4, 8, or 16."); -#endif // _LIBCUDACXX_STD_VER >= 17 +#endif // _CCCL_STD_VER >= 2017 asm volatile( "cp.async.ca.shared.global [%0], [%1], %2, %2;" @@ -980,9 +980,9 @@ inline __device__ void __cp_async_shared_global_mechanism(_Group __g, char * __dest, const char * __src, _CUDA_VSTD::size_t __size) { // If `if constexpr` is not available, this function gets instantiated even // if is not called. Do not static_assert in that case. -#if _LIBCUDACXX_STD_VER >= 17 +#if _CCCL_STD_VER >= 2017 static_assert(4 <= _Alignment, "cp.async requires at least 4-byte alignment"); -#endif // _LIBCUDACXX_STD_VER >= 17 +#endif // _CCCL_STD_VER >= 2017 // Maximal copy size is 16. constexpr int __copy_size = (_Alignment > 16) ? 16 : _Alignment; diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__expected/bad_expected_access.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__expected/bad_expected_access.h index 7bc5276aa68..7c0fbd4c1df 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__expected/bad_expected_access.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__expected/bad_expected_access.h @@ -24,7 +24,7 @@ # pragma system_header #endif // no system header -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 _LIBCUDACXX_BEGIN_NAMESPACE_STD @@ -74,6 +74,6 @@ class bad_expected_access : public bad_expected_access { _LIBCUDACXX_END_NAMESPACE_STD -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 #endif // _LIBCUDACXX___EXPECTED_BAD_EXPECTED_ACCESS_H diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__expected/expected.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__expected/expected.h index 1550b16d2ea..25adc543800 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__expected/expected.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__expected/expected.h @@ -68,7 +68,7 @@ # pragma system_header #endif // no system header -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 _LIBCUDACXX_BEGIN_NAMESPACE_STD @@ -987,12 +987,12 @@ class expected : private __expected_move_assign<_Tp, _Err> } } -#if _LIBCUDACXX_STD_VER < 20 +#if _CCCL_STD_VER < 2020 friend _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY constexpr bool operator!=(const expected& __x, const expected& __y) { return !(__x == __y); } -#endif // _LIBCUDACXX_STD_VER < 20 +#endif // _CCCL_STD_VER < 2020 _LIBCUDACXX_TEMPLATE(class _T2, class _E2) _LIBCUDACXX_REQUIRES( (!_LIBCUDACXX_TRAIT(is_void, _T2))) @@ -1009,14 +1009,14 @@ class expected : private __expected_move_assign<_Tp, _Err> } } -#if _LIBCUDACXX_STD_VER < 20 +#if _CCCL_STD_VER < 2020 _LIBCUDACXX_TEMPLATE(class _T2, class _E2) _LIBCUDACXX_REQUIRES( (!_LIBCUDACXX_TRAIT(is_void, _T2))) friend _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY constexpr bool operator!=(const expected& __x, const expected<_T2, _E2>& __y) { return !(__x == __y); } -#endif // _LIBCUDACXX_STD_VER < 20 +#endif // _CCCL_STD_VER < 2020 _LIBCUDACXX_TEMPLATE(class _T2) _LIBCUDACXX_REQUIRES( (!__expected::__is_expected_nonvoid<_T2>)) @@ -1024,7 +1024,7 @@ class expected : private __expected_move_assign<_Tp, _Err> bool operator==(const expected& __x, const _T2& __v) { return __x.__has_val_ && static_cast(__x.__union_.__val_ == __v); } -#if _LIBCUDACXX_STD_VER < 20 +#if _CCCL_STD_VER < 2020 _LIBCUDACXX_TEMPLATE(class _T2) _LIBCUDACXX_REQUIRES( (!__expected::__is_expected_nonvoid<_T2>)) friend _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY constexpr @@ -1043,14 +1043,14 @@ class expected : private __expected_move_assign<_Tp, _Err> bool operator!=(const _T2& __v, const expected& __x) { return !__x.__has_val_ || static_cast(__x.__union_.__val_ != __v); } -#endif // _LIBCUDACXX_STD_VER < 20 +#endif // _CCCL_STD_VER < 2020 template friend _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY constexpr bool operator==(const expected& __x, const unexpected<_E2>& __e) { return !__x.__has_val_ && static_cast(__x.__union_.__unex_ == __e.error()); } -#if _LIBCUDACXX_STD_VER < 20 +#if _CCCL_STD_VER < 2020 template friend _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY constexpr bool operator==(const unexpected<_E2>& __e, const expected& __x) { @@ -1066,7 +1066,7 @@ class expected : private __expected_move_assign<_Tp, _Err> bool operator!=(const unexpected<_E2>& __e, const expected& __x) { return __x.__has_val_ || static_cast(__x.__union_.__unex_ != __e.error()); } -#endif // _LIBCUDACXX_STD_VER < 20 +#endif // _CCCL_STD_VER < 2020 }; @@ -1735,7 +1735,7 @@ class expected : private __expected_move_assign return __x.__has_val_ || static_cast(__x.__union_.__unex_ == __y.error()); } } -#if _LIBCUDACXX_STD_VER < 20 +#if _CCCL_STD_VER < 2020 friend _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY constexpr bool operator!=(const expected& __x, const expected& __y) noexcept { return !(__x == __y); @@ -1751,7 +1751,7 @@ class expected : private __expected_move_assign return __x.__has_val_ || static_cast(__x.__union_.__unex_ == __y.error()); } } -#if _LIBCUDACXX_STD_VER < 20 +#if _CCCL_STD_VER < 2020 template friend _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY constexpr bool operator!=(const expected& __x, const expected& __y) noexcept { @@ -1764,7 +1764,7 @@ class expected : private __expected_move_assign bool operator==(const expected& __x, const unexpected<_E2>& __y) noexcept { return !__x.__has_val_ && static_cast(__x.__union_.__unex_ == __y.error()); } -#if _LIBCUDACXX_STD_VER < 20 +#if _CCCL_STD_VER < 2020 template friend _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY constexpr bool operator==(const unexpected<_E2>& __y, const expected& __x) noexcept { @@ -1785,6 +1785,6 @@ class expected : private __expected_move_assign _LIBCUDACXX_END_NAMESPACE_STD -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 #endif // _LIBCUDACXX___EXPECTED_EXPECTED_H diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__expected/expected_base.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__expected/expected_base.h index c8cc960e13e..54c82b50b34 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__expected/expected_base.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__expected/expected_base.h @@ -53,7 +53,7 @@ # pragma system_header #endif // no system header -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 _LIBCUDACXX_BEGIN_NAMESPACE_STD @@ -1043,6 +1043,6 @@ using __expected_void_sfinae_assign_base_t = __sfinae_assign_base< _LIBCUDACXX_END_NAMESPACE_STD -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 #endif // _LIBCUDACXX___EXPECTED_EXPECTED_BASE_H diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__expected/unexpect.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__expected/unexpect.h index f9a0f8a522d..8f015a6bc3d 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__expected/unexpect.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__expected/unexpect.h @@ -21,7 +21,7 @@ # pragma system_header #endif // no system header -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 _LIBCUDACXX_BEGIN_NAMESPACE_STD @@ -33,6 +33,6 @@ _LIBCUDACXX_CPO_ACCESSIBILITY unexpect_t unexpect{}; _LIBCUDACXX_END_NAMESPACE_STD -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 #endif // _LIBCUDACXX___EXPECTED_UNEXPECT_H diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__expected/unexpected.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__expected/unexpected.h index 7020365c1ae..b617bd6cf00 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__expected/unexpected.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__expected/unexpected.h @@ -41,7 +41,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template class unexpected; @@ -145,7 +145,7 @@ class unexpected { noexcept(static_cast(__lhs.error() == __rhs.error()))) { return __lhs.error() == __rhs.error(); } -#if _LIBCUDACXX_STD_VER < 20 +#if _CCCL_STD_VER < 2020 template _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_NODISCARD_EXT friend constexpr bool operator!=(const unexpected& __lhs, const unexpected<_UErr>& __rhs) noexcept( @@ -158,12 +158,12 @@ class unexpected { _Err __unex_; }; -#if _LIBCUDACXX_STD_VER > 14 && !defined(_LIBCUDACXX_HAS_NO_DEDUCTION_GUIDES) +#if _CCCL_STD_VER > 2014 && !defined(_LIBCUDACXX_HAS_NO_DEDUCTION_GUIDES) template unexpected(_Err) -> unexpected<_Err>; -#endif // _LIBCUDACXX_STD_VER > 14 && !defined(_LIBCUDACXX_HAS_NO_DEDUCTION_GUIDES) +#endif // _CCCL_STD_VER > 2014 && !defined(_LIBCUDACXX_HAS_NO_DEDUCTION_GUIDES) -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/binary_function.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/binary_function.h index 961c21a88b1..4459203daf7 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/binary_function.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/binary_function.h @@ -24,7 +24,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER <= 14 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION) +#if _CCCL_STD_VER <= 2014 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION) template struct _LIBCUDACXX_TEMPLATE_VIS _LIBCUDACXX_DEPRECATED_IN_CXX11 binary_function @@ -34,17 +34,17 @@ struct _LIBCUDACXX_TEMPLATE_VIS _LIBCUDACXX_DEPRECATED_IN_CXX11 binary_function typedef _Result result_type; }; -#endif // _LIBCUDACXX_STD_VER <= 14 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION) +#endif // _CCCL_STD_VER <= 2014 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION) template struct __binary_function_keep_layout_base { -#if _LIBCUDACXX_STD_VER <= 17 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_BINDER_TYPEDEFS) +#if _CCCL_STD_VER <= 2017 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_BINDER_TYPEDEFS) using first_argument_type _LIBCUDACXX_DEPRECATED_IN_CXX17 = _Arg1; using second_argument_type _LIBCUDACXX_DEPRECATED_IN_CXX17 = _Arg2; using result_type _LIBCUDACXX_DEPRECATED_IN_CXX17 = _Result; #endif }; -#if _LIBCUDACXX_STD_VER <= 14 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION) +#if _CCCL_STD_VER <= 2014 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION) _LIBCUDACXX_DIAGNOSTIC_PUSH _LIBCUDACXX_CLANG_DIAGNOSTIC_IGNORED("-Wdeprecated-declarations") _LIBCUDACXX_GCC_DIAGNOSTIC_IGNORED("-Wdeprecated-declarations") diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/binary_negate.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/binary_negate.h index 9b45f479fc9..34883f2c93e 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/binary_negate.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/binary_negate.h @@ -27,7 +27,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER <= 17 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_NEGATORS) +#if _CCCL_STD_VER <= 2017 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_NEGATORS) template class _LIBCUDACXX_TEMPLATE_VIS _LIBCUDACXX_DEPRECATED_IN_CXX17 binary_negate @@ -52,7 +52,7 @@ _LIBCUDACXX_DEPRECATED_IN_CXX17 inline _LIBCUDACXX_CONSTEXPR_AFTER_CXX11 _LIBCUD binary_negate<_Predicate> not2(const _Predicate& __pred) {return binary_negate<_Predicate>(__pred);} -#endif // _LIBCUDACXX_STD_VER <= 17 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_NEGATORS) +#endif // _CCCL_STD_VER <= 2017 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_NEGATORS) _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/bind.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/bind.h index 9e573a23320..da35d1c7ea4 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/bind.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/bind.h @@ -58,7 +58,7 @@ struct is_bind_expression : _If< is_bind_expression<__remove_cvref_t<_Tp> > > {}; -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 template inline constexpr size_t is_bind_expression_v = is_bind_expression<_Tp>::value; #endif @@ -70,7 +70,7 @@ struct is_placeholder : _If< is_placeholder<__remove_cvref_t<_Tp> > > {}; -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 template inline constexpr size_t is_placeholder_v = is_placeholder<_Tp>::value; #endif diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/bind_back.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/bind_back.h index 927511f3c7e..e8f6f7d34e0 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/bind_back.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/bind_back.h @@ -38,7 +38,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 template > struct __bind_back_op; @@ -72,7 +72,7 @@ constexpr auto __bind_back(_Fn&& __f, _Args&&... __args) -> decltype( __bind_back_t, tuple...>>(_CUDA_VSTD::forward<_Fn>(__f), _CUDA_VSTD::forward_as_tuple(_CUDA_VSTD::forward<_Args>(__args)...))) { return __bind_back_t, tuple...>>(_CUDA_VSTD::forward<_Fn>(__f), _CUDA_VSTD::forward_as_tuple(_CUDA_VSTD::forward<_Args>(__args)...)); } -#endif // _LIBCUDACXX_STD_VER > 14 +#endif // _CCCL_STD_VER > 2014 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/bind_front.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/bind_front.h index 33b334d3f3f..db9b51437cf 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/bind_front.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/bind_front.h @@ -35,7 +35,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 struct __bind_front_op { template @@ -75,7 +75,7 @@ constexpr auto bind_front(_Fn&& __f, _Args&&... __args) noexcept(is_nothrow_cons return __bind_front_t, decay_t<_Args>...>(_CUDA_VSTD::forward<_Fn>(__f), _CUDA_VSTD::forward<_Args>(__args)...); } -#endif // _LIBCUDACXX_STD_VER > 14 +#endif // _CCCL_STD_VER > 2014 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/binder1st.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/binder1st.h index efc95155612..a4559e1b49f 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/binder1st.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/binder1st.h @@ -27,7 +27,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER <= 14 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_BINDERS) +#if _CCCL_STD_VER <= 2014 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_BINDERS) template class _LIBCUDACXX_TEMPLATE_VIS _LIBCUDACXX_DEPRECATED_IN_CXX11 binder1st @@ -56,7 +56,7 @@ binder1st<__Operation> bind1st(const __Operation& __op, const _Tp& __x) {return binder1st<__Operation>(__op, __x);} -#endif // _LIBCUDACXX_STD_VER <= 14 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_BINDERS) +#endif // _CCCL_STD_VER <= 2014 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_BINDERS) _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/binder2nd.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/binder2nd.h index 999e9051837..eca94ddc79c 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/binder2nd.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/binder2nd.h @@ -27,7 +27,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER <= 14 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_BINDERS) +#if _CCCL_STD_VER <= 2014 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_BINDERS) template class _LIBCUDACXX_TEMPLATE_VIS _LIBCUDACXX_DEPRECATED_IN_CXX11 binder2nd @@ -56,7 +56,7 @@ binder2nd<__Operation> bind2nd(const __Operation& __op, const _Tp& __x) {return binder2nd<__Operation>(__op, __x);} -#endif // _LIBCUDACXX_STD_VER <= 14 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_BINDERS) +#endif // _CCCL_STD_VER <= 2014 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_BINDERS) _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/compose.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/compose.h index c7a9fdb2b50..989315136e6 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/compose.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/compose.h @@ -30,7 +30,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 struct __compose_op { template @@ -53,7 +53,7 @@ constexpr auto __compose(_Fn1&& __f1, _Fn2&& __f2) -> decltype( __compose_t, decay_t<_Fn2>>(_CUDA_VSTD::forward<_Fn1>(__f1), _CUDA_VSTD::forward<_Fn2>(__f2))) { return __compose_t, decay_t<_Fn2>>(_CUDA_VSTD::forward<_Fn1>(__f1), _CUDA_VSTD::forward<_Fn2>(__f2)); } -#endif // _LIBCUDACXX_STD_VER > 14 +#endif // _CCCL_STD_VER > 2014 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/default_searcher.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/default_searcher.h index fc790aea052..880fe95c546 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/default_searcher.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/default_searcher.h @@ -33,7 +33,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD #ifndef __cuda_std__ -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 // default searcher template> @@ -61,7 +61,7 @@ class _LIBCUDACXX_TEMPLATE_VIS default_searcher { }; _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(default_searcher); -#endif // _LIBCUDACXX_STD_VER > 14 +#endif // _CCCL_STD_VER > 2014 #endif // __cuda_std__ _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/function.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/function.h index b1cb54c6c48..0e635827372 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/function.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/function.h @@ -1006,7 +1006,7 @@ class _LIBCUDACXX_TEMPLATE_VIS function<_Rp(_ArgTypes...)> template> function(_Fp); -#if _LIBCUDACXX_STD_VER <= 14 +#if _CCCL_STD_VER <= 2014 template _LIBCUDACXX_INLINE_VISIBILITY function(allocator_arg_t, const _Alloc&) noexcept {} @@ -1032,7 +1032,7 @@ class _LIBCUDACXX_TEMPLATE_VIS function<_Rp(_ArgTypes...)> // function modifiers: void swap(function&) noexcept; -#if _LIBCUDACXX_STD_VER <= 14 +#if _CCCL_STD_VER <= 2014 template _LIBCUDACXX_INLINE_VISIBILITY void assign(_Fp&& __f, const _Alloc& __a) @@ -1062,7 +1062,7 @@ class _LIBCUDACXX_TEMPLATE_VIS function<_Rp(_ArgTypes...)> #endif // _LIBCUDACXX_NO_RTTI }; -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 template function(_Rp(*)(_Ap...)) -> function<_Rp(_Ap...)>; @@ -1107,12 +1107,12 @@ struct __strip_signature<_Rp (_Gp::*) (_Ap...) const volatile & noexcept> { usin template::type> function(_Fp) -> function<_Stripped>; -#endif // _LIBCUDACXX_STD_VER > 14 +#endif // _CCCL_STD_VER > 2014 template function<_Rp(_ArgTypes...)>::function(const function& __f) : __f_(__f.__f_) {} -#if _LIBCUDACXX_STD_VER <= 14 +#if _CCCL_STD_VER <= 2014 template template function<_Rp(_ArgTypes...)>::function(allocator_arg_t, const _Alloc&, @@ -1123,7 +1123,7 @@ template function<_Rp(_ArgTypes...)>::function(function&& __f) noexcept : __f_(_CUDA_VSTD::move(__f.__f_)) {} -#if _LIBCUDACXX_STD_VER <= 14 +#if _CCCL_STD_VER <= 2014 template template function<_Rp(_ArgTypes...)>::function(allocator_arg_t, const _Alloc&, @@ -1135,7 +1135,7 @@ template template function<_Rp(_ArgTypes...)>::function(_Fp __f) : __f_(_CUDA_VSTD::move(__f)) {} -#if _LIBCUDACXX_STD_VER <= 14 +#if _CCCL_STD_VER <= 2014 template template function<_Rp(_ArgTypes...)>::function(allocator_arg_t, const _Alloc& __a, diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/hash.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/hash.h index 711a06ee2e4..c5dcf1ee4b8 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/hash.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/hash.h @@ -647,7 +647,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS hash : public __enum_hash<_Tp> { }; -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 template <> struct _LIBCUDACXX_TEMPLATE_VIS hash @@ -673,7 +673,7 @@ using __has_enabled_hash _LIBCUDACXX_NODEBUG_TYPE = integral_constant::value >; -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 template using __enable_hash_helper_imp _LIBCUDACXX_NODEBUG_TYPE = _Type; diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/identity.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/identity.h index 0c561124103..8c183d91fc3 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/identity.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/identity.h @@ -36,7 +36,7 @@ struct __identity { using is_transparent = void; }; -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 struct identity { template @@ -47,7 +47,7 @@ struct identity { using is_transparent = void; }; -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/invoke.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/invoke.h index 6be9dd5cfef..cc184009f02 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/invoke.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/invoke.h @@ -507,7 +507,7 @@ struct __invoke_void_return_wrapper<_Ret, true> } }; -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 // is_invocable @@ -558,7 +558,7 @@ invoke(_Fn&& __f, _Args&&... __args) return _CUDA_VSTD::__invoke(_CUDA_VSTD::forward<_Fn>(__f), _CUDA_VSTD::forward<_Args>(__args)...); } -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/is_transparent.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/is_transparent.h index 45d5aaba2e4..42f83d0e6ef 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/is_transparent.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/is_transparent.h @@ -28,7 +28,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template struct __is_transparent : false_type {}; diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/mem_fun_ref.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/mem_fun_ref.h index 0ccf76d93fd..e4d8972b0a0 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/mem_fun_ref.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/mem_fun_ref.h @@ -28,7 +28,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER <= 14 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_BINDERS) +#if _CCCL_STD_VER <= 2014 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_BINDERS) template class _LIBCUDACXX_TEMPLATE_VIS _LIBCUDACXX_DEPRECATED_IN_CXX11 mem_fun_t @@ -174,7 +174,7 @@ const_mem_fun1_ref_t<_Sp,_Tp,_Ap> mem_fun_ref(_Sp (_Tp::*__f)(_Ap) const) {return const_mem_fun1_ref_t<_Sp,_Tp,_Ap>(__f);} -#endif // _LIBCUDACXX_STD_VER <= 14 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_BINDERS) +#endif // _CCCL_STD_VER <= 2014 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_BINDERS) _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/not_fn.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/not_fn.h index 4b6b0fb3ccd..547b16a833b 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/not_fn.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/not_fn.h @@ -33,7 +33,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 struct __not_fn_op { template @@ -70,7 +70,7 @@ _LIBCUDACXX_CONSTEXPR_AFTER_CXX17 auto not_fn(_Fn&& __f) { return __not_fn_t>(_CUDA_VSTD::forward<_Fn>(__f)); } -#endif // _LIBCUDACXX_STD_VER > 14 +#endif // _CCCL_STD_VER > 2014 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/operations.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/operations.h index 2fb6df4d6f1..61ac850ef8f 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/operations.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/operations.h @@ -31,7 +31,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD // Arithmetic operations -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template #else template @@ -47,7 +47,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS plus }; _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(plus); -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template <> struct _LIBCUDACXX_TEMPLATE_VIS plus { @@ -62,7 +62,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS plus }; #endif -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template #else template @@ -78,7 +78,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS minus }; _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(minus); -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template <> struct _LIBCUDACXX_TEMPLATE_VIS minus { @@ -93,7 +93,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS minus }; #endif -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template #else template @@ -109,7 +109,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS multiplies }; _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(multiplies); -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template <> struct _LIBCUDACXX_TEMPLATE_VIS multiplies { @@ -124,7 +124,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS multiplies }; #endif -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template #else template @@ -140,7 +140,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS divides }; _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(divides); -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template <> struct _LIBCUDACXX_TEMPLATE_VIS divides { @@ -155,7 +155,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS divides }; #endif -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template #else template @@ -171,7 +171,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS modulus }; _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(modulus); -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template <> struct _LIBCUDACXX_TEMPLATE_VIS modulus { @@ -186,7 +186,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS modulus }; #endif -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template #else template @@ -202,7 +202,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS negate }; _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(negate); -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template <> struct _LIBCUDACXX_TEMPLATE_VIS negate { @@ -219,7 +219,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS negate // Bitwise operations -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template #else template @@ -235,7 +235,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS bit_and }; _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(bit_and); -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template <> struct _LIBCUDACXX_TEMPLATE_VIS bit_and { @@ -250,7 +250,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS bit_and }; #endif -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template struct _LIBCUDACXX_TEMPLATE_VIS bit_not : __unary_function<_Tp, _Tp> @@ -276,7 +276,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS bit_not }; #endif -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template #else template @@ -292,7 +292,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS bit_or }; _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(bit_or); -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template <> struct _LIBCUDACXX_TEMPLATE_VIS bit_or { @@ -307,7 +307,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS bit_or }; #endif -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template #else template @@ -323,7 +323,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS bit_xor }; _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(bit_xor); -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template <> struct _LIBCUDACXX_TEMPLATE_VIS bit_xor { @@ -340,7 +340,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS bit_xor // Comparison operations -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template #else template @@ -356,7 +356,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS equal_to }; _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(equal_to); -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template <> struct _LIBCUDACXX_TEMPLATE_VIS equal_to { @@ -371,7 +371,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS equal_to }; #endif -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template #else template @@ -387,7 +387,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS not_equal_to }; _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(not_equal_to); -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template <> struct _LIBCUDACXX_TEMPLATE_VIS not_equal_to { @@ -402,7 +402,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS not_equal_to }; #endif -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template #else template @@ -418,7 +418,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS less }; _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(less); -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template <> struct _LIBCUDACXX_TEMPLATE_VIS less { @@ -433,7 +433,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS less }; #endif -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template #else template @@ -449,7 +449,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS less_equal }; _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(less_equal); -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template <> struct _LIBCUDACXX_TEMPLATE_VIS less_equal { @@ -464,7 +464,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS less_equal }; #endif -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template #else template @@ -480,7 +480,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS greater_equal }; _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(greater_equal); -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template <> struct _LIBCUDACXX_TEMPLATE_VIS greater_equal { @@ -495,7 +495,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS greater_equal }; #endif -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template #else template @@ -511,7 +511,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS greater }; _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(greater); -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template <> struct _LIBCUDACXX_TEMPLATE_VIS greater { @@ -528,7 +528,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS greater // Logical operations -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template #else template @@ -544,7 +544,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS logical_and }; _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(logical_and); -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template <> struct _LIBCUDACXX_TEMPLATE_VIS logical_and { @@ -559,7 +559,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS logical_and }; #endif -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template #else template @@ -575,7 +575,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS logical_not }; _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(logical_not); -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template <> struct _LIBCUDACXX_TEMPLATE_VIS logical_not { @@ -590,7 +590,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS logical_not }; #endif -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template #else template @@ -606,7 +606,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS logical_or }; _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(logical_or); -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template <> struct _LIBCUDACXX_TEMPLATE_VIS logical_or { diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/perfect_forward.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/perfect_forward.h index 98e56389927..57e293bbe8b 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/perfect_forward.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/perfect_forward.h @@ -37,7 +37,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 template struct __perfect_forward_impl; @@ -110,7 +110,7 @@ struct __perfect_forward_impl<_Op, index_sequence<_Idx...>, _BoundArgs...> { template using __perfect_forward = __perfect_forward_impl<_Op, index_sequence_for<_Args...>, _Args...>; -#endif // _LIBCUDACXX_STD_VER > 14 +#endif // _CCCL_STD_VER > 2014 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/pointer_to_binary_function.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/pointer_to_binary_function.h index bbcfb96396d..d220af30eb2 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/pointer_to_binary_function.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/pointer_to_binary_function.h @@ -27,7 +27,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER <= 14 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_BINDERS) +#if _CCCL_STD_VER <= 2014 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_BINDERS) template class _LIBCUDACXX_TEMPLATE_VIS _LIBCUDACXX_DEPRECATED_IN_CXX11 pointer_to_binary_function diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/pointer_to_unary_function.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/pointer_to_unary_function.h index f5f8b25247c..d7fbe8e77f5 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/pointer_to_unary_function.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/pointer_to_unary_function.h @@ -27,7 +27,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER <= 14 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_BINDERS) +#if _CCCL_STD_VER <= 2014 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_BINDERS) template class _LIBCUDACXX_TEMPLATE_VIS _LIBCUDACXX_DEPRECATED_IN_CXX11 pointer_to_unary_function @@ -47,7 +47,7 @@ pointer_to_unary_function<_Arg,_Result> ptr_fun(_Result (*__f)(_Arg)) {return pointer_to_unary_function<_Arg,_Result>(__f);} -#endif // _LIBCUDACXX_STD_VER <= 14 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_BINDERS) +#endif // _CCCL_STD_VER <= 2014 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_BINDERS) _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/ranges_operations.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/ranges_operations.h index 7445367470a..cf3ae8bdc1a 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/ranges_operations.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/ranges_operations.h @@ -26,7 +26,7 @@ # pragma system_header #endif // no system header -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 _LIBCUDACXX_BEGIN_NAMESPACE_RANGES _LIBCUDACXX_BEGIN_NAMESPACE_RANGES_ABI @@ -105,7 +105,7 @@ struct greater_equal { _LIBCUDACXX_END_NAMESPACE_RANGES_ABI _LIBCUDACXX_END_NAMESPACE_RANGES -#endif // _LIBCUDACXX_STD_VER > 14 +#endif // _CCCL_STD_VER > 2014 #endif // _LIBCUDACXX___FUNCTIONAL_RANGES_OPERATIONS_H diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/reference_wrapper.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/reference_wrapper.h index 19c4529d035..55f60964b3c 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/reference_wrapper.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/reference_wrapper.h @@ -63,7 +63,7 @@ class _LIBCUDACXX_TEMPLATE_VIS reference_wrapper : public __weak_result_type<_Tp _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX17 typename __invoke_of::type operator() (_ArgTypes&&... __args) const -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 // Since is_nothrow_invocable requires C++11 LWG3764 is not backported // to earlier versions. noexcept(_LIBCUDACXX_TRAIT(is_nothrow_invocable, _Tp&, _ArgTypes...)) @@ -73,7 +73,7 @@ class _LIBCUDACXX_TEMPLATE_VIS reference_wrapper : public __weak_result_type<_Tp } }; -#if _LIBCUDACXX_STD_VER > 14 && !defined(_LIBCUDACXX_HAS_NO_DEDUCTION_GUIDES) +#if _CCCL_STD_VER > 2014 && !defined(_LIBCUDACXX_HAS_NO_DEDUCTION_GUIDES) template _LIBCUDACXX_HOST_DEVICE reference_wrapper(_Tp&) -> reference_wrapper<_Tp>; #endif diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/unary_function.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/unary_function.h index d06fc3d75bb..a61f7d605a3 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/unary_function.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/unary_function.h @@ -23,7 +23,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER <= 14 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION) +#if _CCCL_STD_VER <= 2014 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION) template struct _LIBCUDACXX_TEMPLATE_VIS _LIBCUDACXX_DEPRECATED_IN_CXX11 unary_function @@ -32,16 +32,16 @@ struct _LIBCUDACXX_TEMPLATE_VIS _LIBCUDACXX_DEPRECATED_IN_CXX11 unary_function typedef _Result result_type; }; -#endif // _LIBCUDACXX_STD_VER <= 14 +#endif // _CCCL_STD_VER <= 2014 template struct __unary_function_keep_layout_base { -#if _LIBCUDACXX_STD_VER <= 17 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_BINDER_TYPEDEFS) +#if _CCCL_STD_VER <= 2017 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_BINDER_TYPEDEFS) using argument_type _LIBCUDACXX_DEPRECATED_IN_CXX17 = _Arg; using result_type _LIBCUDACXX_DEPRECATED_IN_CXX17 = _Result; #endif }; -#if _LIBCUDACXX_STD_VER <= 14 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION) +#if _CCCL_STD_VER <= 2014 || defined(_LIBCUDACXX_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION) _LIBCUDACXX_DIAGNOSTIC_PUSH _LIBCUDACXX_CLANG_DIAGNOSTIC_IGNORED("-Wdeprecated-declarations") _LIBCUDACXX_GCC_DIAGNOSTIC_IGNORED("-Wdeprecated-declarations") diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/unary_negate.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/unary_negate.h index 97448758b25..2e58ab05d81 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/unary_negate.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/unary_negate.h @@ -27,7 +27,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER <= 17 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_NEGATORS) +#if _CCCL_STD_VER <= 2017 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_NEGATORS) template class _LIBCUDACXX_TEMPLATE_VIS _LIBCUDACXX_DEPRECATED_IN_CXX17 unary_negate @@ -49,7 +49,7 @@ _LIBCUDACXX_DEPRECATED_IN_CXX17 inline _LIBCUDACXX_CONSTEXPR_AFTER_CXX11 _LIBCUD unary_negate<_Predicate> not1(const _Predicate& __pred) {return unary_negate<_Predicate>(__pred);} -#endif // _LIBCUDACXX_STD_VER <= 17 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_NEGATORS) +#endif // _CCCL_STD_VER <= 2017 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_NEGATORS) _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/unwrap_ref.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/unwrap_ref.h index 398ff118919..ca92e8fdf67 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/unwrap_ref.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/unwrap_ref.h @@ -36,7 +36,7 @@ struct __unwrap_reference > { typedef _LIBCUDACXX_NODEBUG template struct decay; -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 template struct unwrap_reference : __unwrap_reference<_Tp> { }; @@ -48,11 +48,11 @@ struct unwrap_ref_decay : unwrap_reference::type> { }; template using unwrap_ref_decay_t = typename unwrap_ref_decay<_Tp>::type; -#endif // _LIBCUDACXX_STD_VER > 17 +#endif // _CCCL_STD_VER > 2017 template struct __unwrap_ref_decay -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 : unwrap_ref_decay<_Tp> #else : __unwrap_reference::type> diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/weak_result_type.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/weak_result_type.h index 8c5b5232d89..33a162e8f61 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/weak_result_type.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional/weak_result_type.h @@ -100,7 +100,7 @@ struct __weak_result_type_imp // bool is true : public __maybe_derive_from_unary_function<_Tp>, public __maybe_derive_from_binary_function<_Tp> { -#if _LIBCUDACXX_STD_VER <= 17 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_BINDER_TYPEDEFS) +#if _CCCL_STD_VER <= 2017 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_BINDER_TYPEDEFS) using result_type _LIBCUDACXX_NODEBUG_TYPE _LIBCUDACXX_DEPRECATED_IN_CXX17 = typename _Tp::result_type; #endif }; @@ -123,7 +123,7 @@ struct __weak_result_type template struct __weak_result_type<_Rp ()> { -#if _LIBCUDACXX_STD_VER <= 17 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_BINDER_TYPEDEFS) +#if _CCCL_STD_VER <= 2017 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_BINDER_TYPEDEFS) using result_type _LIBCUDACXX_NODEBUG_TYPE _LIBCUDACXX_DEPRECATED_IN_CXX17 = _Rp; #endif }; @@ -131,7 +131,7 @@ struct __weak_result_type<_Rp ()> template struct __weak_result_type<_Rp (&)()> { -#if _LIBCUDACXX_STD_VER <= 17 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_BINDER_TYPEDEFS) +#if _CCCL_STD_VER <= 2017 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_BINDER_TYPEDEFS) using result_type _LIBCUDACXX_NODEBUG_TYPE _LIBCUDACXX_DEPRECATED_IN_CXX17 = _Rp; #endif }; @@ -139,7 +139,7 @@ struct __weak_result_type<_Rp (&)()> template struct __weak_result_type<_Rp (*)()> { -#if _LIBCUDACXX_STD_VER <= 17 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_BINDER_TYPEDEFS) +#if _CCCL_STD_VER <= 2017 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_BINDER_TYPEDEFS) using result_type _LIBCUDACXX_NODEBUG_TYPE _LIBCUDACXX_DEPRECATED_IN_CXX17 = _Rp; #endif }; @@ -237,7 +237,7 @@ struct __weak_result_type<_Rp (_Cp::*)(_A1) const volatile> template struct __weak_result_type<_Rp (_A1, _A2, _A3, _A4...)> { -#if _LIBCUDACXX_STD_VER <= 17 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_BINDER_TYPEDEFS) +#if _CCCL_STD_VER <= 2017 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_BINDER_TYPEDEFS) using result_type _LIBCUDACXX_NODEBUG_TYPE _LIBCUDACXX_DEPRECATED_IN_CXX17 = _Rp; #endif }; @@ -245,7 +245,7 @@ struct __weak_result_type<_Rp (_A1, _A2, _A3, _A4...)> template struct __weak_result_type<_Rp (&)(_A1, _A2, _A3, _A4...)> { -#if _LIBCUDACXX_STD_VER <= 17 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_BINDER_TYPEDEFS) +#if _CCCL_STD_VER <= 2017 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_BINDER_TYPEDEFS) using result_type _LIBCUDACXX_NODEBUG_TYPE _LIBCUDACXX_DEPRECATED_IN_CXX17 = _Rp; #endif }; @@ -253,7 +253,7 @@ struct __weak_result_type<_Rp (&)(_A1, _A2, _A3, _A4...)> template struct __weak_result_type<_Rp (*)(_A1, _A2, _A3, _A4...)> { -#if _LIBCUDACXX_STD_VER <= 17 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_BINDER_TYPEDEFS) +#if _CCCL_STD_VER <= 2017 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_BINDER_TYPEDEFS) using result_type _LIBCUDACXX_NODEBUG_TYPE _LIBCUDACXX_DEPRECATED_IN_CXX17 = _Rp; #endif }; @@ -261,7 +261,7 @@ struct __weak_result_type<_Rp (*)(_A1, _A2, _A3, _A4...)> template struct __weak_result_type<_Rp (_Cp::*)(_A1, _A2, _A3...)> { -#if _LIBCUDACXX_STD_VER <= 17 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_BINDER_TYPEDEFS) +#if _CCCL_STD_VER <= 2017 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_BINDER_TYPEDEFS) using result_type _LIBCUDACXX_NODEBUG_TYPE _LIBCUDACXX_DEPRECATED_IN_CXX17 = _Rp; #endif }; @@ -269,7 +269,7 @@ struct __weak_result_type<_Rp (_Cp::*)(_A1, _A2, _A3...)> template struct __weak_result_type<_Rp (_Cp::*)(_A1, _A2, _A3...) const> { -#if _LIBCUDACXX_STD_VER <= 17 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_BINDER_TYPEDEFS) +#if _CCCL_STD_VER <= 2017 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_BINDER_TYPEDEFS) using result_type _LIBCUDACXX_NODEBUG_TYPE _LIBCUDACXX_DEPRECATED_IN_CXX17 = _Rp; #endif }; @@ -277,7 +277,7 @@ struct __weak_result_type<_Rp (_Cp::*)(_A1, _A2, _A3...) const> template struct __weak_result_type<_Rp (_Cp::*)(_A1, _A2, _A3...) volatile> { -#if _LIBCUDACXX_STD_VER <= 17 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_BINDER_TYPEDEFS) +#if _CCCL_STD_VER <= 2017 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_BINDER_TYPEDEFS) using result_type _LIBCUDACXX_NODEBUG_TYPE _LIBCUDACXX_DEPRECATED_IN_CXX17 = _Rp; #endif }; @@ -285,7 +285,7 @@ struct __weak_result_type<_Rp (_Cp::*)(_A1, _A2, _A3...) volatile> template struct __weak_result_type<_Rp (_Cp::*)(_A1, _A2, _A3...) const volatile> { -#if _LIBCUDACXX_STD_VER <= 17 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_BINDER_TYPEDEFS) +#if _CCCL_STD_VER <= 2017 || defined(_LIBCUDACXX_ENABLE_CXX20_REMOVED_BINDER_TYPEDEFS) using result_type _LIBCUDACXX_NODEBUG_TYPE _LIBCUDACXX_DEPRECATED_IN_CXX17 = _Rp; #endif }; diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional_base b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional_base index b3a3b064adb..cd0d45f2c5b 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__functional_base +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__functional_base @@ -84,7 +84,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS uses_allocator { }; -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 template _LIBCUDACXX_INLINE_VAR constexpr size_t uses_allocator_v = uses_allocator<_Tp, _Alloc>::value; #endif diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__fwd/span.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__fwd/span.h index 4bb75bf8803..90a1a2f17ad 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__fwd/span.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__fwd/span.h @@ -27,7 +27,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 _LIBCUDACXX_INLINE_VAR constexpr size_t dynamic_extent = static_cast(-1); template class span; diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__fwd/string.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__fwd/string.h index 6086f44adf4..755004f4175 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__fwd/string.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__fwd/string.h @@ -65,7 +65,7 @@ using u8string = basic_string; using u16string = basic_string; using u32string = basic_string; -#if _LIBCUDACXX_STD_VER >= 17 +#if _CCCL_STD_VER >= 2017 namespace pmr { template > @@ -86,7 +86,7 @@ using u32string = basic_string; } // namespace pmr -#endif // _LIBCUDACXX_STD_VER >= 17 +#endif // _CCCL_STD_VER >= 2017 // clang-format off template @@ -99,7 +99,7 @@ class _LIBCUDACXX_PREFERRED_NAME(string) #endif _LIBCUDACXX_PREFERRED_NAME(u16string) _LIBCUDACXX_PREFERRED_NAME(u32string) -#if _LIBCUDACXX_STD_VER >= 17 +#if _CCCL_STD_VER >= 2017 _LIBCUDACXX_PREFERRED_NAME(pmr::string) # ifndef _LIBCUDACXX_HAS_NO_WIDE_CHARACTERS _LIBCUDACXX_PREFERRED_NAME(pmr::wstring) diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__hash_table b/libcudacxx/include/cuda/std/detail/libcxx/include/__hash_table index fe07ded5374..88c3dadc305 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__hash_table +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__hash_table @@ -858,7 +858,7 @@ public: template friend class __hash_map_node_destructor; }; -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 template struct __generic_container_node_destructor; @@ -1154,7 +1154,7 @@ public: return __emplace_unique_key_args(_NodeTypes::__get_key(__x), __x); } -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 template _LIBCUDACXX_INLINE_VISIBILITY _InsertReturnType __node_handle_insert_unique(_NodeHandle&& __nh); @@ -1250,7 +1250,7 @@ public: __equal_range_multi(const _Key& __k) const; void swap(__hash_table& __u) -#if _LIBCUDACXX_STD_VER <= 11 +#if _CCCL_STD_VER <= 2011 noexcept( __is_nothrow_swappable::value && __is_nothrow_swappable::value && (!allocator_traits<__pointer_allocator>::propagate_on_container_swap::value @@ -2162,7 +2162,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__emplace_hint_multi( return __r; } -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 template template _LIBCUDACXX_INLINE_VISIBILITY @@ -2292,7 +2292,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_handle_merge_multi( __node_insert_multi_perform(__src_ptr, __pn); } } -#endif // _LIBCUDACXX_STD_VER > 14 +#endif // _CCCL_STD_VER > 2014 template void @@ -2699,7 +2699,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__equal_range_multi( template void __hash_table<_Tp, _Hash, _Equal, _Alloc>::swap(__hash_table& __u) -#if _LIBCUDACXX_STD_VER <= 11 +#if _CCCL_STD_VER <= 2011 noexcept( __is_nothrow_swappable::value && __is_nothrow_swappable::value && (!allocator_traits<__pointer_allocator>::propagate_on_container_swap::value diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/access.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/access.h index 84cfdeab540..7ed921d88f3 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/access.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/access.h @@ -63,7 +63,7 @@ _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX11 auto end(const _ return __c.end(); } -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX11 auto cbegin(const _Cp& __c) diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/advance.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/advance.h index f0f45dbe37f..225fc5a13cb 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/advance.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/advance.h @@ -87,7 +87,7 @@ _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX11 void advance(_In _LIBCUDACXX_END_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 14 && !defined(_LICBUDACXX_COMPILER_MSVC_2017) +#if _CCCL_STD_VER > 2014 && !defined(_LICBUDACXX_COMPILER_MSVC_2017) // [range.iter.op.advance] @@ -245,6 +245,6 @@ _LIBCUDACXX_CPO_ACCESSIBILITY auto advance = __advance::__fn{}; _LIBCUDACXX_END_NAMESPACE_RANGES -#endif // _LIBCUDACXX_STD_VER > 14 && !_LICBUDACXX_COMPILER_MSVC_2017 +#endif // _CCCL_STD_VER > 2014 && !_LICBUDACXX_COMPILER_MSVC_2017 #endif // _LIBCUDACXX___ITERATOR_ADVANCE_H diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/back_insert_iterator.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/back_insert_iterator.h index 184ac24c10a..63dcdcfe9dd 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/back_insert_iterator.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/back_insert_iterator.h @@ -34,7 +34,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD _LIBCUDACXX_SUPPRESS_DEPRECATED_PUSH template class _LIBCUDACXX_TEMPLATE_VIS back_insert_iterator -#if _LIBCUDACXX_STD_VER <= 14 || !defined(_LIBCUDACXX_ABI_NO_ITERATOR_BASES) +#if _CCCL_STD_VER <= 2014 || !defined(_LIBCUDACXX_ABI_NO_ITERATOR_BASES) : public iterator #endif { @@ -44,7 +44,7 @@ _LIBCUDACXX_SUPPRESS_DEPRECATED_POP public: typedef output_iterator_tag iterator_category; typedef void value_type; -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 typedef ptrdiff_t difference_type; #else typedef void difference_type; diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/bounded_iter.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/bounded_iter.h index 2a8619cae90..2c5f45d1f13 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/bounded_iter.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/bounded_iter.h @@ -49,7 +49,7 @@ struct __bounded_iter { using pointer = typename iterator_traits<_Iterator>::pointer; using reference = typename iterator_traits<_Iterator>::reference; using iterator_category = typename iterator_traits<_Iterator>::iterator_category; -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 using iterator_concept = contiguous_iterator_tag; #endif @@ -241,7 +241,7 @@ constexpr __bounded_iter<_It> __make_bounded_iter(_It __it, _It __begin, _It __e return __bounded_iter<_It>(_CUDA_VSTD::move(__it), _CUDA_VSTD::move(__begin), _CUDA_VSTD::move(__end)); } -#if _LIBCUDACXX_STD_VER <= 17 +#if _CCCL_STD_VER <= 2017 template struct __is_cpp17_contiguous_iterator<__bounded_iter<_Iterator> > : true_type {}; #endif diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/concepts.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/concepts.h index 13b68af62c7..6a87f6c6699 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/concepts.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/concepts.h @@ -55,7 +55,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 // [iterator.concept.readable] template @@ -305,7 +305,7 @@ concept indirectly_copyable_storable = // Note: indirectly_swappable is located in iter_swap.h to prevent a dependency cycle // (both iter_swap and indirectly_swappable require indirectly_readable). -#elif _LIBCUDACXX_STD_VER > 14 +#elif _CCCL_STD_VER > 2014 // [iterator.concept.readable] template @@ -653,7 +653,7 @@ _LIBCUDACXX_CONCEPT_FRAGMENT( template _LIBCUDACXX_CONCEPT indirect_strict_weak_order = _LIBCUDACXX_FRAGMENT(__indirect_strict_weak_order_, _Fp, _It1, _It2); -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 template using indirect_result_t = enable_if_t<(indirectly_readable<_Its> && ...) && invocable<_Fp, iter_reference_t<_Its>...>, invoke_result_t<_Fp, iter_reference_t<_Its>...>>; #else @@ -661,7 +661,7 @@ template using indirect_result_t = enable_if_t>...> && invocable<_Fp, iter_reference_t<_Its>...>, invoke_result_t<_Fp, iter_reference_t<_Its>...>>; -#endif // _LIBCUDACXX_STD_VER > 14 +#endif // _CCCL_STD_VER > 2014 template _LIBCUDACXX_CONCEPT_FRAGMENT( @@ -728,7 +728,7 @@ _LIBCUDACXX_INLINE_VAR constexpr bool __has_iter_concept = false; template _LIBCUDACXX_INLINE_VAR constexpr bool __has_iter_concept<_Ip, void_t> = true; -#endif // _LIBCUDACXX_STD_VER > 14 +#endif // _CCCL_STD_VER > 2014 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/data.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/data.h index 255922a3fdd..5a81d0c9c01 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/data.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/data.h @@ -28,7 +28,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template constexpr _LIBCUDACXX_INLINE_VISIBILITY diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/default_sentinel.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/default_sentinel.h index e378ce0fb9c..5bf53c4f42e 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/default_sentinel.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/default_sentinel.h @@ -25,12 +25,12 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 struct default_sentinel_t { }; inline constexpr default_sentinel_t default_sentinel{}; -#endif // _LIBCUDACXX_STD_VER > 14 +#endif // _CCCL_STD_VER > 2014 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/distance.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/distance.h index e6e165a2e45..cecbeb40c86 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/distance.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/distance.h @@ -67,7 +67,7 @@ inline _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX11 _LIBCUDACXX_END_NAMESPACE_STD #ifdef _LIBCUDACXX_HAS_RANGES -# if _LIBCUDACXX_STD_VER > 14 && !defined(_LIBCUDACXX_COMPILER_MSVC_2017) +# if _CCCL_STD_VER > 2014 && !defined(_LIBCUDACXX_COMPILER_MSVC_2017) // [range.iter.op.distance] @@ -128,7 +128,7 @@ _LIBCUDACXX_CPO_ACCESSIBILITY auto distance = __distance::__fn{}; } // namespace __cpo _LIBCUDACXX_END_NAMESPACE_RANGES -# endif // _LIBCUDACXX_STD_VER > 14 && !defined(_LIBCUDACXX_COMPILER_MSVC_2017) +# endif // _CCCL_STD_VER > 2014 && !defined(_LIBCUDACXX_COMPILER_MSVC_2017) #endif // _LIBCUDACXX_HAS_RANGES #endif // _LIBCUDACXX___ITERATOR_DISTANCE_H diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/empty.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/empty.h index cb9602bf51b..28a688b46d4 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/empty.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/empty.h @@ -28,7 +28,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template _LIBCUDACXX_NODISCARD_AFTER_CXX17 _LIBCUDACXX_INLINE_VISIBILITY @@ -45,7 +45,7 @@ template _LIBCUDACXX_NODISCARD_AFTER_CXX17 _LIBCUDACXX_INLINE_VISIBILITY constexpr bool empty(initializer_list<_Ep> __il) noexcept { return __il.size() == 0; } -#endif // _LIBCUDACXX_STD_VER > 17 +#endif // _CCCL_STD_VER > 2017 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/front_insert_iterator.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/front_insert_iterator.h index 192d9b44396..3703dfb9078 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/front_insert_iterator.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/front_insert_iterator.h @@ -34,7 +34,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD _LIBCUDACXX_SUPPRESS_DEPRECATED_PUSH template class _LIBCUDACXX_TEMPLATE_VIS front_insert_iterator -#if _LIBCUDACXX_STD_VER <= 14 || !defined(_LIBCUDACXX_ABI_NO_ITERATOR_BASES) +#if _CCCL_STD_VER <= 2014 || !defined(_LIBCUDACXX_ABI_NO_ITERATOR_BASES) : public iterator #endif { @@ -44,7 +44,7 @@ _LIBCUDACXX_SUPPRESS_DEPRECATED_POP public: typedef output_iterator_tag iterator_category; typedef void value_type; -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 typedef ptrdiff_t difference_type; #else typedef void difference_type; diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/incrementable_traits.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/incrementable_traits.h index 655ac8fd229..e33fbb0d098 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/incrementable_traits.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/incrementable_traits.h @@ -37,7 +37,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 // [incrementable.traits] template struct incrementable_traits {}; @@ -82,7 +82,7 @@ using iter_difference_t = typename conditional_t<__is_primary_template >, iterator_traits > >::difference_type; -#elif _LIBCUDACXX_STD_VER > 14 +#elif _CCCL_STD_VER > 2014 // [incrementable.traits] template struct incrementable_traits {}; @@ -133,7 +133,7 @@ using iter_difference_t = typename conditional_t<__is_primary_template >, iterator_traits > >::difference_type; -#endif // _LIBCUDACXX_STD_VER > 14 +#endif // _CCCL_STD_VER > 2014 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/indirectly_comparable.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/indirectly_comparable.h index 9dc038aa7aa..9b072d47297 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/indirectly_comparable.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/indirectly_comparable.h @@ -29,7 +29,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 template @@ -37,7 +37,7 @@ concept indirectly_comparable = indirect_binary_predicate<_BinaryPred, projected<_Iter1, _Proj1>, projected<_Iter2, _Proj2>>; -#elif _LIBCUDACXX_STD_VER > 14 +#elif _CCCL_STD_VER > 2014 // clang-format off @@ -54,7 +54,7 @@ _LIBCUDACXX_CONCEPT indirectly_comparable = // clang-format on -#endif // _LIBCUDACXX_STD_VER > 14 +#endif // _CCCL_STD_VER > 2014 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/insert_iterator.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/insert_iterator.h index bf5f7485f86..af067971a63 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/insert_iterator.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/insert_iterator.h @@ -37,7 +37,7 @@ using __insert_iterator_iter_t = typename _Container::iterator; _LIBCUDACXX_SUPPRESS_DEPRECATED_PUSH template class _LIBCUDACXX_TEMPLATE_VIS insert_iterator -#if _LIBCUDACXX_STD_VER <= 14 || !defined(_LIBCUDACXX_ABI_NO_ITERATOR_BASES) +#if _CCCL_STD_VER <= 2014 || !defined(_LIBCUDACXX_ABI_NO_ITERATOR_BASES) : public iterator #endif { @@ -48,7 +48,7 @@ _LIBCUDACXX_SUPPRESS_DEPRECATED_POP public: typedef output_iterator_tag iterator_category; typedef void value_type; -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 typedef ptrdiff_t difference_type; #else typedef void difference_type; diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/istream_iterator.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/istream_iterator.h index 7deb411f63f..7d3473201a6 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/istream_iterator.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/istream_iterator.h @@ -36,7 +36,7 @@ _LIBCUDACXX_SUPPRESS_DEPRECATED_PUSH template , class _Distance = ptrdiff_t> class _LIBCUDACXX_TEMPLATE_VIS istream_iterator -#if _LIBCUDACXX_STD_VER <= 14 || !defined(_LIBCUDACXX_ABI_NO_ITERATOR_BASES) +#if _CCCL_STD_VER <= 2014 || !defined(_LIBCUDACXX_ABI_NO_ITERATOR_BASES) : public iterator #endif { @@ -55,9 +55,9 @@ _LIBCUDACXX_SUPPRESS_DEPRECATED_POP _Tp __value_; public: _LIBCUDACXX_INLINE_VISIBILITY constexpr istream_iterator() : __in_stream_(nullptr), __value_() {} -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 _LIBCUDACXX_INLINE_VISIBILITY constexpr istream_iterator(default_sentinel_t) : istream_iterator() {} -#endif // _LIBCUDACXX_STD_VER > 14 +#endif // _CCCL_STD_VER > 2014 _LIBCUDACXX_INLINE_VISIBILITY istream_iterator(istream_type& __s) : __in_stream_(_CUDA_VSTD::addressof(__s)) { if (!(*__in_stream_ >> __value_)) @@ -81,11 +81,11 @@ _LIBCUDACXX_SUPPRESS_DEPRECATED_POP operator==(const istream_iterator<_Up, _CharU, _TraitsU, _DistanceU>& __x, const istream_iterator<_Up, _CharU, _TraitsU, _DistanceU>& __y); -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 friend _LIBCUDACXX_INLINE_VISIBILITY bool operator==(const istream_iterator& __i, default_sentinel_t) { return __i.__in_stream_ == nullptr; } -#if _LIBCUDACXX_STD_VER < 20 +#if _CCCL_STD_VER < 2020 friend _LIBCUDACXX_INLINE_VISIBILITY bool operator==(default_sentinel_t, const istream_iterator& __i) { return __i.__in_stream_ == nullptr; } @@ -95,8 +95,8 @@ _LIBCUDACXX_SUPPRESS_DEPRECATED_POP friend _LIBCUDACXX_INLINE_VISIBILITY bool operator!=(default_sentinel_t, const istream_iterator& __i) { return __i.__in_stream_ != nullptr; } -#endif // _LIBCUDACXX_STD_VER < 20 -#endif // _LIBCUDACXX_STD_VER > 14 +#endif // _CCCL_STD_VER < 2020 +#endif // _CCCL_STD_VER > 2014 }; template diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/istreambuf_iterator.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/istreambuf_iterator.h index 21ef2ccb576..202469974ee 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/istreambuf_iterator.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/istreambuf_iterator.h @@ -33,7 +33,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD _LIBCUDACXX_SUPPRESS_DEPRECATED_PUSH template class _LIBCUDACXX_TEMPLATE_VIS istreambuf_iterator -#if _LIBCUDACXX_STD_VER <= 14 || !defined(_LIBCUDACXX_ABI_NO_ITERATOR_BASES) +#if _CCCL_STD_VER <= 2014 || !defined(_LIBCUDACXX_ABI_NO_ITERATOR_BASES) : public iterator @@ -75,10 +75,10 @@ _LIBCUDACXX_SUPPRESS_DEPRECATED_POP } public: _LIBCUDACXX_INLINE_VISIBILITY constexpr istreambuf_iterator() noexcept : __sbuf_(nullptr) {} -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 _LIBCUDACXX_INLINE_VISIBILITY constexpr istreambuf_iterator(default_sentinel_t) noexcept : istreambuf_iterator() {} -#endif // _LIBCUDACXX_STD_VER > 17 +#endif // _CCCL_STD_VER > 2017 _LIBCUDACXX_INLINE_VISIBILITY istreambuf_iterator(istream_type& __s) noexcept : __sbuf_(__s.rdbuf()) {} _LIBCUDACXX_INLINE_VISIBILITY istreambuf_iterator(streambuf_type* __s) noexcept @@ -101,11 +101,11 @@ _LIBCUDACXX_SUPPRESS_DEPRECATED_POP _LIBCUDACXX_INLINE_VISIBILITY bool equal(const istreambuf_iterator& __b) const {return __test_for_eof() == __b.__test_for_eof();} -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 friend _LIBCUDACXX_HIDE_FROM_ABI bool operator==(const istreambuf_iterator& __i, default_sentinel_t) { return __i.__test_for_eof(); } -#if _LIBCUDACXX_STD_VER < 20 +#if _CCCL_STD_VER < 2020 friend _LIBCUDACXX_HIDE_FROM_ABI bool operator==(default_sentinel_t, const istreambuf_iterator& __i) { return __i.__test_for_eof(); } @@ -115,8 +115,8 @@ _LIBCUDACXX_SUPPRESS_DEPRECATED_POP friend _LIBCUDACXX_HIDE_FROM_ABI bool operator!=(default_sentinel_t, const istreambuf_iterator& __i) { return !__i.__test_for_eof(); } -#endif // _LIBCUDACXX_STD_VER < 20 -#endif // _LIBCUDACXX_STD_VER > 14 +#endif // _CCCL_STD_VER < 2020 +#endif // _CCCL_STD_VER > 2014 }; template @@ -125,13 +125,13 @@ bool operator==(const istreambuf_iterator<_CharT,_Traits>& __a, const istreambuf_iterator<_CharT,_Traits>& __b) {return __a.equal(__b);} -#if _LIBCUDACXX_STD_VER <= 17 +#if _CCCL_STD_VER <= 2017 template inline _LIBCUDACXX_INLINE_VISIBILITY bool operator!=(const istreambuf_iterator<_CharT,_Traits>& __a, const istreambuf_iterator<_CharT,_Traits>& __b) {return !__a.equal(__b);} -#endif // _LIBCUDACXX_STD_VER <= 17 +#endif // _CCCL_STD_VER <= 2017 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/iter_move.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/iter_move.h index 6f23c8304ef..31836eabb9b 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/iter_move.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/iter_move.h @@ -32,13 +32,10 @@ # pragma system_header #endif // no system header -#if defined(__clang__) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wvoid-ptr-dereference" -#endif +_CCCL_DIAG_PUSH +_CCCL_DIAG_SUPPRESS_CLANG("-Wvoid-ptr-dereference") - -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 // [iterator.cust.move] @@ -48,7 +45,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_CPO(__iter_move) _LIBCUDACXX_INLINE_VISIBILITY void iter_move(); -#if LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER >= 2020 template concept __unqualified_iter_move = __class_or_enum> && @@ -73,7 +70,7 @@ concept __just_deref = requires (!is_lvalue_reference_v); }; -#else // ^^^ CXX20 ^^^ / vvv CXX17 vvv +#else // ^^^ _CCCL_STD_VER >= 2020 ^^^ / vvv _CCCL_STD_VER <= 2017 vvv template _LIBCUDACXX_CONCEPT_FRAGMENT( @@ -108,7 +105,7 @@ _LIBCUDACXX_CONCEPT_FRAGMENT( template _LIBCUDACXX_CONCEPT __just_deref = _LIBCUDACXX_FRAGMENT(__just_deref_, _Tp); -#endif // LIBCUDACXX_STD_VER < 20 +#endif // _CCCL_STD_VER <= 2017 // [iterator.cust.move] @@ -144,12 +141,12 @@ _LIBCUDACXX_END_NAMESPACE_RANGES _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER >= 2020 template<__dereferenceable _Tp> requires requires(_Tp& __t) { { _CUDA_VRANGES::iter_move(__t) } -> __can_reference; } using iter_rvalue_reference_t = decltype(_CUDA_VRANGES::iter_move(_CUDA_VSTD::declval<_Tp&>())); -#else +#else // ^^^ _CCCL_STD_VER >= 2020 ^^^ / vvv _CCCL_STD_VER <= 2017 vvv template _LIBCUDACXX_CONCEPT_FRAGMENT( @@ -168,14 +165,12 @@ using __iter_rvalue_reference_t = decltype(_CUDA_VRANGES::iter_move(_CUDA_VSTD:: template using iter_rvalue_reference_t = enable_if_t<__can_iter_rvalue_reference_t<_Tp>, __iter_rvalue_reference_t<_Tp>>; -#endif // LIBCUDACXX_STD_VER < 20 +#endif // _CCCL_STD_VER <= 2017 _LIBCUDACXX_END_NAMESPACE_STD -#endif // _LIBCUDACXX_STD_VER > 14 +#endif // _CCCL_STD_VER > 2014 -#if defined(__clang__) -#pragma clang diagnostic pop -#endif +_CCCL_DIAG_POP #endif // _LIBCUDACXX___ITERATOR_ITER_MOVE_H diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/iter_swap.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/iter_swap.h index 624a034f6c3..b669f4d0486 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/iter_swap.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/iter_swap.h @@ -32,7 +32,7 @@ # pragma system_header #endif // no system header -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 // [iter.cust.swap] @@ -41,7 +41,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_CPO(__iter_swap) template void iter_swap(_I1, _I2) = delete; -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 template concept __unqualified_iter_swap = (__class_or_enum> || __class_or_enum>) && @@ -97,7 +97,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_CPO(__iter_swap) template _LIBCUDACXX_CONCEPT __moveable_storable = _LIBCUDACXX_FRAGMENT(__moveable_storable_, _T1, _T2); -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 struct __fn { _LIBCUDACXX_TEMPLATE(class _T1, class _T2) @@ -139,7 +139,7 @@ inline namespace __cpo { _LIBCUDACXX_END_NAMESPACE_RANGES _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 template concept indirectly_swappable = indirectly_readable<_I1> && indirectly_readable<_I2> && @@ -164,7 +164,7 @@ _LIBCUDACXX_CONCEPT_FRAGMENT( template _LIBCUDACXX_CONCEPT indirectly_swappable = _LIBCUDACXX_FRAGMENT(__indirectly_swappable_, _I1, _I2); -#endif // _LIBCUDACXX_STD_VER > 17 +#endif // _CCCL_STD_VER > 2017 template _LIBCUDACXX_INLINE_VAR constexpr bool __noexcept_swappable = false; @@ -175,6 +175,6 @@ _LIBCUDACXX_INLINE_VAR constexpr bool __noexcept_swappable<_I1, _I2, __enable_if _LIBCUDACXX_END_NAMESPACE_STD -#endif // _LIBCUDACXX_STD_VER > 14 +#endif // _CCCL_STD_VER > 2014 #endif // _LIBCUDACXX___ITERATOR_ITER_SWAP_H diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/iterator_traits.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/iterator_traits.h index 8471b8a4720..5b041e7e387 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/iterator_traits.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/iterator_traits.h @@ -42,7 +42,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 template using __with_reference = _Tp&; @@ -64,7 +64,7 @@ using iter_reference_t = decltype(*declval<_Tp&>()); template struct _LIBCUDACXX_TEMPLATE_VIS iterator_traits; -#elif _LIBCUDACXX_STD_VER > 14 +#elif _CCCL_STD_VER > 2014 template using __with_reference = _Tp&; @@ -104,14 +104,14 @@ struct _LIBCUDACXX_TEMPLATE_VIS iterator_traits; #else template struct _LIBCUDACXX_TEMPLATE_VIS iterator_traits; -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 struct _LIBCUDACXX_TEMPLATE_VIS input_iterator_tag {}; struct _LIBCUDACXX_TEMPLATE_VIS output_iterator_tag {}; struct _LIBCUDACXX_TEMPLATE_VIS forward_iterator_tag : public input_iterator_tag {}; struct _LIBCUDACXX_TEMPLATE_VIS bidirectional_iterator_tag : public forward_iterator_tag {}; struct _LIBCUDACXX_TEMPLATE_VIS random_access_iterator_tag : public bidirectional_iterator_tag {}; -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 struct _LIBCUDACXX_TEMPLATE_VIS contiguous_iterator_tag : public random_access_iterator_tag {}; #endif @@ -197,7 +197,7 @@ struct __has_iterator_concept static const bool value = decltype(__test<_Tp>(nullptr))::value; }; -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 // The `cpp17-*-iterator` exposition-only concepts have very similar names to the `Cpp17*Iterator` named requirements // from `[iterator.cpp17]`. To avoid confusion between the two, the exposition-only concepts have been banished to @@ -424,7 +424,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS iterator_traits : __iterator_traits<_Ip> { using __primary_template = iterator_traits; }; -#elif _LIBCUDACXX_STD_VER > 14 +#elif _CCCL_STD_VER > 2014 // The `cpp17-*-iterator` exposition-only concepts have very similar names to the `Cpp17*Iterator` named requirements // from `[iterator.cpp17]`. To avoid confusion between the two, the exposition-only concepts have been banished to @@ -694,7 +694,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS iterator_traits : __iterator_traits<_Ip> { using __primary_template = iterator_traits; }; -#else // _LIBCUDACXX_STD_VER > 11 +#else // _CCCL_STD_VER > 2011 template struct __iterator_traits {}; @@ -731,10 +731,10 @@ struct _LIBCUDACXX_TEMPLATE_VIS iterator_traits using __primary_template = iterator_traits; }; -#endif // _LIBCUDACXX_STD_VER < 17 +#endif // _CCCL_STD_VER < 2017 template -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 requires is_object_v<_Tp> #endif struct _LIBCUDACXX_TEMPLATE_VIS iterator_traits<_Tp*> @@ -744,7 +744,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS iterator_traits<_Tp*> typedef _Tp* pointer; typedef typename add_lvalue_reference<_Tp>::type reference; typedef random_access_iterator_tag iterator_category; -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 typedef contiguous_iterator_tag iterator_concept; #endif }; @@ -784,7 +784,7 @@ struct __is_cpp17_random_access_iterator : public __has_iterator_category_conver // Such iterators receive special "contiguous" optimizations in // std::copy and std::sort. // -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 template struct __is_cpp17_contiguous_iterator : _Or< __has_iterator_category_convertible_to<_Tp, contiguous_iterator_tag>, diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/mergeable.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/mergeable.h index c7a97485e29..0d3677b9e92 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/mergeable.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/mergeable.h @@ -30,7 +30,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 template @@ -42,7 +42,7 @@ concept mergeable = indirectly_copyable<_Input2, _Output> && indirect_strict_weak_order<_Comp, projected<_Input1, _Proj1>, projected<_Input2, _Proj2>>; -#elif _LIBCUDACXX_STD_VER > 14 +#elif _CCCL_STD_VER > 2014 template @@ -62,7 +62,7 @@ template 14 +#endif // _CCCL_STD_VER > 2014 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/move_iterator.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/move_iterator.h index 6f23cf4a90e..42c7baf696b 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/move_iterator.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/move_iterator.h @@ -47,7 +47,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 template struct __move_iter_category_base {}; @@ -71,7 +71,7 @@ concept __move_iter_comparable = requires { template _LIBCUDACXX_INLINE_VAR constexpr bool __noexcept_move_iter_iter_move = noexcept(_CUDA_VRANGES::iter_move(_CUDA_VSTD::declval<_Iter>())); -#elif _LIBCUDACXX_STD_VER >= 17 +#elif _CCCL_STD_VER >= 2017 template struct __move_iter_category_base {}; @@ -95,11 +95,11 @@ _LIBCUDACXX_CONCEPT __move_iter_comparable = _LIBCUDACXX_FRAGMENT(__move_iter_co template _LIBCUDACXX_INLINE_VAR constexpr bool __noexcept_move_iter_iter_move = noexcept(_CUDA_VRANGES::iter_move(_CUDA_VSTD::declval<_Iter>())); -#endif // _LIBCUDACXX_STD_VER >= 17 +#endif // _CCCL_STD_VER >= 2017 template class _LIBCUDACXX_TEMPLATE_VIS move_iterator -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 : public __move_iter_category_base<_Iter> #endif { @@ -109,7 +109,7 @@ class _LIBCUDACXX_TEMPLATE_VIS move_iterator _Iter __current_; -#if _LIBCUDACXX_STD_VER >= 17 +#if _CCCL_STD_VER >= 2017 # if !defined(_LIBCUDACXX_COMPILER_MSVC_2017) _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY static constexpr auto __mi_get_iter_concept() @@ -133,10 +133,10 @@ class _LIBCUDACXX_TEMPLATE_VIS move_iterator _LIBCUDACXX_UNREACHABLE(); } # endif // !_LIBCUDACXX_COMPILER_MSVC_2017 -#endif // _LIBCUDACXX_STD_VER >= 17 +#endif // _CCCL_STD_VER >= 2017 public: -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 using iterator_type = _Iter; # if defined(_LIBCUDACXX_COMPILER_MSVC_2017) // clang-format off @@ -154,7 +154,7 @@ class _LIBCUDACXX_TEMPLATE_VIS move_iterator using difference_type = iter_difference_t<_Iter>; using pointer = _Iter; using reference = iter_rvalue_reference_t<_Iter>; -#else // ^^^ _LIBCUDACXX_STD_VER > 14 ^^^ / vvv _LIBCUDACXX_STD_VER < 17 vvv +#else // ^^^ _CCCL_STD_VER > 2014 ^^^ / vvv _CCCL_STD_VER < 2017 vvv typedef _Iter iterator_type; typedef _If< __is_cpp17_random_access_iterator<_Iter>::value, random_access_iterator_tag, @@ -166,7 +166,7 @@ class _LIBCUDACXX_TEMPLATE_VIS move_iterator typedef typename iterator_traits::reference __reference; typedef __conditional_t< is_reference<__reference>::value, __libcpp_remove_reference_t<__reference>&&, __reference > reference; -#endif // _LIBCUDACXX_STD_VER < 17 +#endif // _CCCL_STD_VER < 2017 _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX11 explicit move_iterator( _Iter __i) @@ -186,19 +186,19 @@ class _LIBCUDACXX_TEMPLATE_VIS move_iterator return __current_; } -#if _LIBCUDACXX_STD_VER > 14 -# if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2014 +# if _CCCL_STD_VER > 2017 _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY constexpr move_iterator() requires is_constructible_v<_Iter> : __current_() {} -# else // ^^^ _LIBCUDACXX_STD_VER > 17 ^^^ / vvv _LIBCUDACXX_STD_VER < 20 vvv +# else // ^^^ _CCCL_STD_VER > 2017 ^^^ / vvv _CCCL_STD_VER < 2020 vvv _LIBCUDACXX_TEMPLATE(class _It2 = _Iter) _LIBCUDACXX_REQUIRES(is_constructible_v<_It2>) _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY constexpr move_iterator() : __current_() {} -# endif // _LIBCUDACXX_STD_VER < 20 +# endif // _CCCL_STD_VER < 2020 _LIBCUDACXX_TEMPLATE(class _Up) _LIBCUDACXX_REQUIRES((!_IsSame<_Up, _Iter>::value) && convertible_to) @@ -249,7 +249,7 @@ class _LIBCUDACXX_TEMPLATE_VIS move_iterator { ++__current_; } -#else // ^^^ _LIBCUDACXX_STD_VER > 14 ^^^ / vvv _LIBCUDACXX_STD_VER < 17 vvv +#else // ^^^ _CCCL_STD_VER > 2014 ^^^ / vvv _CCCL_STD_VER < 2017 vvv _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX11 move_iterator() : __current_() {} @@ -301,7 +301,7 @@ class _LIBCUDACXX_TEMPLATE_VIS move_iterator ++__current_; return __tmp; } -#endif // _LIBCUDACXX_STD_VER < 17 +#endif // _CCCL_STD_VER < 2017 _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX11 move_iterator& operator--() { @@ -337,7 +337,7 @@ class _LIBCUDACXX_TEMPLATE_VIS move_iterator return *this; } -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 _LIBCUDACXX_TEMPLATE(class _Sent) _LIBCUDACXX_REQUIRES(sentinel_for<_Sent, _Iter> _LIBCUDACXX_AND __move_iter_comparable<_Iter, _Sent>) friend _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY constexpr bool @@ -346,7 +346,7 @@ class _LIBCUDACXX_TEMPLATE_VIS move_iterator return __x.base() == __y.base(); } -# if _LIBCUDACXX_STD_VER < 20 +# if _CCCL_STD_VER < 2020 _LIBCUDACXX_TEMPLATE(class _Sent) _LIBCUDACXX_REQUIRES(sentinel_for<_Sent, _Iter> _LIBCUDACXX_AND __move_iter_comparable<_Iter, _Sent>) friend _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY constexpr bool @@ -370,7 +370,7 @@ class _LIBCUDACXX_TEMPLATE_VIS move_iterator { return __y.base() != __x.base(); } -# endif // _LIBCUDACXX_STD_VER < 20 +# endif // _CCCL_STD_VER < 2020 _LIBCUDACXX_TEMPLATE(class _Sent) _LIBCUDACXX_REQUIRES(sized_sentinel_for<_Sent, _Iter>) @@ -411,7 +411,7 @@ class _LIBCUDACXX_TEMPLATE_VIS move_iterator return _CUDA_VRANGES::iter_swap(__x.__current_, __y.__current_); } #endif // !_LIBCUDACXX_COMPILER_MSVC_2017 -#endif // _LIBCUDACXX_STD_VER > 14 +#endif // _CCCL_STD_VER > 2014 }; _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(move_iterator); @@ -429,14 +429,14 @@ operator==(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y) return __x.base() == __y.base(); } -#if _LIBCUDACXX_STD_VER <= 17 +#if _CCCL_STD_VER <= 2017 template inline _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX11 bool operator!=(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y) { return __x.base() != __y.base(); } -#endif // _LIBCUDACXX_STD_VER <= 17 +#endif // _CCCL_STD_VER <= 2017 #ifndef _LIBCUDACXX_HAS_NO_SPACESHIP_OPERATOR @@ -485,7 +485,7 @@ operator-(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y) -> return __x.base() - __y.base(); } -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 template inline _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY constexpr move_iterator<_Iter> operator+(iter_difference_t<_Iter> __n, const move_iterator<_Iter>& __x) @@ -497,14 +497,14 @@ operator+(iter_difference_t<_Iter> __n, const move_iterator<_Iter>& __x) { return __x + __n; } -#else // ^^^ _LIBCUDACXX_STD_VER > 17 ^^^ / vvv _LIBCUDACXX_STD_VER < 20 vvv +#else // ^^^ _CCCL_STD_VER > 2017 ^^^ / vvv _CCCL_STD_VER < 2020 vvv template inline _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX11 move_iterator<_Iter> operator+(typename move_iterator<_Iter>::difference_type __n, const move_iterator<_Iter>& __x) { return move_iterator<_Iter>(__x.base() + __n); } -#endif // _LIBCUDACXX_STD_VER < 20 +#endif // _CCCL_STD_VER < 2020 template inline _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX11 move_iterator<_Iter> diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/move_sentinel.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/move_sentinel.h index 5ad1922b731..eb630c7e7d6 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/move_sentinel.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/move_sentinel.h @@ -27,11 +27,11 @@ # pragma system_header #endif // no system header -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 template #else template, int> = 0> @@ -64,6 +64,6 @@ class _LIBCUDACXX_TEMPLATE_VIS move_sentinel _LIBCUDACXX_END_NAMESPACE_STD -#endif // _LIBCUDACXX_STD_VER > 14 +#endif // _CCCL_STD_VER > 2014 #endif // _LIBCUDACXX___ITERATOR_MOVE_SENTINEL_H diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/next.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/next.h index 27452be9f7b..4ca7e6bcb8b 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/next.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/next.h @@ -46,7 +46,7 @@ inline _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX11 _LIBCUDACXX_END_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 14 && !defined(_LIBCUDACXX_COMPILER_MSVC_2017) +#if _CCCL_STD_VER > 2014 && !defined(_LIBCUDACXX_COMPILER_MSVC_2017) // [range.iter.op.next] @@ -96,6 +96,6 @@ _LIBCUDACXX_CPO_ACCESSIBILITY auto next = __next::__fn{}; } // namespace __cpo _LIBCUDACXX_END_NAMESPACE_RANGES -#endif // _LIBCUDACXX_STD_VER > 14 && !defined(_LIBCUDACXX_COMPILER_MSVC_2017) +#endif // _CCCL_STD_VER > 2014 && !defined(_LIBCUDACXX_COMPILER_MSVC_2017) #endif // _LIBCUDACXX___ITERATOR_NEXT_H diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/ostream_iterator.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/ostream_iterator.h index 5d1632c2580..4001e50c4d8 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/ostream_iterator.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/ostream_iterator.h @@ -34,7 +34,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD _LIBCUDACXX_SUPPRESS_DEPRECATED_PUSH template > class _LIBCUDACXX_TEMPLATE_VIS ostream_iterator -#if _LIBCUDACXX_STD_VER <= 14 || !defined(_LIBCUDACXX_ABI_NO_ITERATOR_BASES) +#if _CCCL_STD_VER <= 2014 || !defined(_LIBCUDACXX_ABI_NO_ITERATOR_BASES) : public iterator #endif { @@ -42,7 +42,7 @@ _LIBCUDACXX_SUPPRESS_DEPRECATED_POP public: typedef output_iterator_tag iterator_category; typedef void value_type; -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 typedef ptrdiff_t difference_type; #else typedef void difference_type; diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/ostreambuf_iterator.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/ostreambuf_iterator.h index da9b322508e..09d5a448eab 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/ostreambuf_iterator.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/ostreambuf_iterator.h @@ -33,7 +33,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD _LIBCUDACXX_SUPPRESS_DEPRECATED_PUSH template class _LIBCUDACXX_TEMPLATE_VIS ostreambuf_iterator -#if _LIBCUDACXX_STD_VER <= 14 || !defined(_LIBCUDACXX_ABI_NO_ITERATOR_BASES) +#if _CCCL_STD_VER <= 2014 || !defined(_LIBCUDACXX_ABI_NO_ITERATOR_BASES) : public iterator #endif { @@ -41,7 +41,7 @@ _LIBCUDACXX_SUPPRESS_DEPRECATED_POP public: typedef output_iterator_tag iterator_category; typedef void value_type; -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 typedef ptrdiff_t difference_type; #else typedef void difference_type; diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/permutable.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/permutable.h index d3afdafab2f..97fb33c1134 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/permutable.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/permutable.h @@ -28,7 +28,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 template concept permutable = @@ -36,7 +36,7 @@ concept permutable = indirectly_movable_storable<_Iterator, _Iterator> && indirectly_swappable<_Iterator, _Iterator>; -#elif _LIBCUDACXX_STD_VER > 14 +#elif _CCCL_STD_VER > 2014 template _LIBCUDACXX_CONCEPT_FRAGMENT( @@ -50,7 +50,7 @@ _LIBCUDACXX_CONCEPT_FRAGMENT( template _LIBCUDACXX_CONCEPT permutable = _LIBCUDACXX_FRAGMENT(__permutable_, _Iterator); -#endif // _LIBCUDACXX_STD_VER > 14 +#endif // _CCCL_STD_VER > 2014 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/prev.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/prev.h index c91c7f8f45d..d75a5ddd238 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/prev.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/prev.h @@ -45,7 +45,7 @@ inline _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX11 _LIBCUDACXX_END_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 14 && !defined(_LIBCUDACXX_COMPILER_MSVC_2017) +#if _CCCL_STD_VER > 2014 && !defined(_LIBCUDACXX_COMPILER_MSVC_2017) // [range.iter.op.prev] @@ -87,6 +87,6 @@ _LIBCUDACXX_CPO_ACCESSIBILITY auto prev = __prev::__fn{}; } // namespace __cpo _LIBCUDACXX_END_NAMESPACE_RANGES -#endif // _LIBCUDACXX_STD_VER > 14 && !defined(_LIBCUDACXX_COMPILER_MSVC_2017) +#endif // _CCCL_STD_VER > 2014 && !defined(_LIBCUDACXX_COMPILER_MSVC_2017) #endif // _LIBCUDACXX___ITERATOR_PREV_H diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/projected.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/projected.h index 86760454818..dbd045c5d93 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/projected.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/projected.h @@ -29,7 +29,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 _LIBCUDACXX_TEMPLATE(class _It, class _Proj) _LIBCUDACXX_REQUIRES( indirectly_readable<_It> _LIBCUDACXX_AND indirectly_regular_unary_invocable<_Proj, _It>) @@ -38,7 +38,7 @@ struct projected { _LIBCUDACXX_INLINE_VISIBILITY indirect_result_t<_Proj&, _It> operator*() const; // not defined }; -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 template struct incrementable_traits> { using difference_type = iter_difference_t<_It>; @@ -48,9 +48,9 @@ template struct incrementable_traits, enable_if_t>> { using difference_type = iter_difference_t<_It>; }; -#endif // _LIBCUDACXX_STD_VER > 17 +#endif // _CCCL_STD_VER > 2017 -#endif // _LIBCUDACXX_STD_VER > 14 +#endif // _CCCL_STD_VER > 2014 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/readable_traits.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/readable_traits.h index 17c029c3a12..4802c92521b 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/readable_traits.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/readable_traits.h @@ -37,7 +37,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 // [readable.traits] template struct __cond_value_type {}; @@ -96,7 +96,7 @@ using iter_value_t = typename conditional_t<__is_primary_template >, iterator_traits > >::value_type; -#elif _LIBCUDACXX_STD_VER > 14 +#elif _CCCL_STD_VER > 2014 // [readable.traits] template struct __cond_value_type {}; @@ -156,7 +156,7 @@ using iter_value_t = typename conditional_t<__is_primary_template >, iterator_traits > >::value_type; -#endif // _LIBCUDACXX_STD_VER > 14 +#endif // _CCCL_STD_VER > 2014 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/reverse_access.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/reverse_access.h index b326ec7a14e..de72c3d63ab 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/reverse_access.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/reverse_access.h @@ -29,7 +29,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX14 @@ -101,7 +101,7 @@ auto crend(const _Cp& __c) -> decltype(_CUDA_VSTD::rend(__c)) return _CUDA_VSTD::rend(__c); } -#endif // _LIBCUDACXX_STD_VER > 11 +#endif // _CCCL_STD_VER > 2011 _LIBCUDACXX_END_NAMESPACE_STD diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/reverse_iterator.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/reverse_iterator.h index 18728c3e076..32ce0399171 100644 --- a/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/reverse_iterator.h +++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__iterator/reverse_iterator.h @@ -56,7 +56,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD -#if _LIBCUDACXX_STD_VER >= 17 +#if _CCCL_STD_VER >= 2017 template _LIBCUDACXX_INLINE_VAR constexpr bool __noexcept_rev_iter_iter_move = false; @@ -72,12 +72,12 @@ _LIBCUDACXX_INLINE_VAR constexpr bool __noexcept_rev_iter_iter_swap<_Iter, _Iter enable_if_t>> = is_nothrow_copy_constructible_v<_Iter> && is_nothrow_copy_constructible_v<_Iter2> && noexcept(_CUDA_VRANGES::iter_swap(--declval<_Iter&>(), --declval<_Iter2&>())); -#endif // _LIBCUDACXX_STD_VER >= 17 +#endif // _CCCL_STD_VER >= 2017 _LIBCUDACXX_SUPPRESS_DEPRECATED_PUSH template class _LIBCUDACXX_TEMPLATE_VIS reverse_iterator -#if _LIBCUDACXX_STD_VER <= 14 || !defined(_LIBCUDACXX_ABI_NO_ITERATOR_BASES) +#if _CCCL_STD_VER <= 2014 || !defined(_LIBCUDACXX_ABI_NO_ITERATOR_BASES) : public iterator::iterator_category, typename iterator_traits<_Iter>::value_type, typename iterator_traits<_Iter>::difference_type, @@ -92,10 +92,10 @@ class _LIBCUDACXX_TEMPLATE_VIS reverse_iterator _Iter __t_; // no longer used as of LWG #2360, not removed due to ABI break #endif -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 static_assert(__is_cpp17_bidirectional_iterator<_Iter>::value || bidirectional_iterator<_Iter>, "reverse_iterator requires It to be a bidirectional iterator."); -#endif // _LIBCUDACXX_STD_VER > 17 +#endif // _CCCL_STD_VER > 2017 protected: _Iter current; @@ -108,7 +108,7 @@ class _LIBCUDACXX_TEMPLATE_VIS reverse_iterator random_access_iterator_tag, typename iterator_traits<_Iter>::iterator_category>; using pointer = typename iterator_traits<_Iter>::pointer; -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 using iterator_concept = _If, random_access_iterator_tag, bidirectional_iterator_tag>; using value_type = iter_value_t<_Iter>; using difference_type = iter_difference_t<_Iter>; @@ -183,7 +183,7 @@ class _LIBCUDACXX_TEMPLATE_VIS reverse_iterator return *--__tmp; } -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY constexpr pointer operator->() const requires is_pointer_v<_Iter> || requires(const _Iter __i) { __i.operator->(); } { @@ -201,7 +201,7 @@ class _LIBCUDACXX_TEMPLATE_VIS reverse_iterator { return _CUDA_VSTD::addressof(operator*()); } -#endif // _LIBCUDACXX_STD_VER > 17 +#endif // _CCCL_STD_VER > 2017 _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX11 reverse_iterator& operator++() @@ -257,7 +257,7 @@ class _LIBCUDACXX_TEMPLATE_VIS reverse_iterator return *(*this + __n); } -#if _LIBCUDACXX_STD_VER > 14 +#if _CCCL_STD_VER > 2014 _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY friend constexpr iter_rvalue_reference_t<_Iter> iter_move(const reverse_iterator& __i) noexcept(__noexcept_rev_iter_iter_move<_Iter>) { @@ -291,7 +291,7 @@ class _LIBCUDACXX_TEMPLATE_VIS reverse_iterator #endif // _LIBCUDACXX_COMPILER_ICC } #endif // !_LIBCUDACXX_COMPILER_MSVC_2017 -#endif // _LIBCUDACXX_STD_VER > 14 +#endif // _CCCL_STD_VER > 2014 }; template @@ -305,13 +305,13 @@ struct __is_reverse_iterator > : true_type template inline _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX11 bool operator==(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& __y) -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 requires requires { { __x.base() == __y.base() } -> convertible_to; } -#endif // _LIBCUDACXX_STD_VER > 17 +#endif // _CCCL_STD_VER > 2017 { return __x.base() == __y.base(); } @@ -319,13 +319,13 @@ operator==(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& template inline _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX11 bool operator<(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& __y) -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 requires requires { { __x.base() > __y.base() } -> convertible_to; } -#endif // _LIBCUDACXX_STD_VER > 17 +#endif // _CCCL_STD_VER > 2017 { return __x.base() > __y.base(); } @@ -333,13 +333,13 @@ operator<(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& _ template inline _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX11 bool operator!=(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& __y) -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 requires requires { { __x.base() != __y.base() } -> convertible_to; } -#endif // _LIBCUDACXX_STD_VER > 17 +#endif // _CCCL_STD_VER > 2017 { return __x.base() != __y.base(); } @@ -347,13 +347,13 @@ operator!=(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& template inline _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX11 bool operator>(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& __y) -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 requires requires { { __x.base() < __y.base() } -> convertible_to; } -#endif // _LIBCUDACXX_STD_VER > 17 +#endif // _CCCL_STD_VER > 2017 { return __x.base() < __y.base(); } @@ -361,13 +361,13 @@ operator>(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& _ template inline _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX11 bool operator>=(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& __y) -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 requires requires { { __x.base() <= __y.base() } -> convertible_to; } -#endif // _LIBCUDACXX_STD_VER > 17 +#endif // _CCCL_STD_VER > 2017 { return __x.base() <= __y.base(); } @@ -375,13 +375,13 @@ operator>=(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& template inline _LIBCUDACXX_HIDE_FROM_ABI _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX11 bool operator<=(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& __y) -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 requires requires { { __x.base() >= __y.base() } -> convertible_to; } -#endif // _LIBCUDACXX_STD_VER > 17 +#endif // _CCCL_STD_VER > 2017 { return __x.base() >= __y.base(); } @@ -409,13 +409,13 @@ operator+(typename reverse_iterator<_Iter>::difference_type __n, const reverse_i return reverse_iterator<_Iter>(__x.base() - __n); } -#if _LIBCUDACXX_STD_VER > 17 +#if _CCCL_STD_VER > 2017 template requires(!sized_sentinel_for<_Iter1, _Iter2>) inline constexpr bool disable_sized_sentinel_for, reverse_iterator<_Iter2>> = true; -#endif // _LIBCUDACXX_STD_VER > 17 +#endif // _CCCL_STD_VER > 2017 -#if _LIBCUDACXX_STD_VER > 11 +#if _CCCL_STD_VER > 2011 template inline _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR_AFTER_CXX11 reverse_iterator<_Iter> make_reverse_iterator(_Iter __i) @@ -424,7 +424,7 @@ make_reverse_iterator(_Iter __i) } #endif -#if _LIBCUDACXX_STD_VER <= 17 +#if _CCCL_STD_VER <= 2017 template using __unconstrained_reverse_iterator = reverse_iterator<_Iter>; #else @@ -611,7 +611,7 @@ template struct __is_reverse_iterator<__unconstrained_reverse_iterator<_Iter>> : true_type {}; -#endif // _LIBCUDACXX_STD_VER <= 17 +#endif // _CCCL_STD_VER <= 2017 template