diff --git a/cudax/include/cuda/experimental/__container/uninitialized_async_buffer.cuh b/cudax/include/cuda/experimental/__container/uninitialized_async_buffer.cuh index 731ed555bb3..77616627b42 100644 --- a/cudax/include/cuda/experimental/__container/uninitialized_async_buffer.cuh +++ b/cudax/include/cuda/experimental/__container/uninitialized_async_buffer.cuh @@ -22,7 +22,6 @@ #endif // no system header #include -#include #include #include #include @@ -287,7 +286,7 @@ public: _CCCL_HIDE_FROM_ABI uninitialized_async_buffer __replace_allocation(const size_t __count) { // Create a new buffer with a reference to the stored memory resource and swap allocation information - uninitialized_async_buffer __ret{_CUDA_VMR::async_resource_ref<_Properties...>{__mr_}, __stream_, __count}; + uninitialized_async_buffer __ret{mr::async_resource_ref<_Properties...>{__mr_}, __stream_, __count}; _CUDA_VSTD::swap(__count_, __ret.__count_); _CUDA_VSTD::swap(__buf_, __ret.__buf_); return __ret; diff --git a/cudax/include/cuda/experimental/__container/uninitialized_buffer.cuh b/cudax/include/cuda/experimental/__container/uninitialized_buffer.cuh index 1f661c0c7d5..451dddfa89c 100644 --- a/cudax/include/cuda/experimental/__container/uninitialized_buffer.cuh +++ b/cudax/include/cuda/experimental/__container/uninitialized_buffer.cuh @@ -22,7 +22,6 @@ #endif // no system header #include -#include #include #include #include @@ -252,7 +251,7 @@ public: _CCCL_HIDE_FROM_ABI uninitialized_buffer __replace_allocation(const size_t __count) { // Create a new buffer with a reference to the stored memory resource and swap allocation information - uninitialized_buffer __ret{_CUDA_VMR::resource_ref<_Properties...>{__mr_}, __count}; + uninitialized_buffer __ret{mr::resource_ref<_Properties...>{__mr_}, __count}; _CUDA_VSTD::swap(__count_, __ret.__count_); _CUDA_VSTD::swap(__buf_, __ret.__buf_); return __ret; diff --git a/cudax/include/cuda/experimental/__detail/config.cuh b/cudax/include/cuda/experimental/__detail/config.cuh index 3b9e147306b..7437abfccb8 100644 --- a/cudax/include/cuda/experimental/__detail/config.cuh +++ b/cudax/include/cuda/experimental/__detail/config.cuh @@ -61,6 +61,7 @@ namespace cuda::experimental { +namespace __cudax = ::cuda::experimental; // NOLINT: misc-unused-alias-decls } #endif // __CUDAX__DETAIL_CONFIG_CUH diff --git a/cudax/include/cuda/experimental/__detail/utility.cuh b/cudax/include/cuda/experimental/__detail/utility.cuh index 1263ea880fd..6345c6fbb67 100644 --- a/cudax/include/cuda/experimental/__detail/utility.cuh +++ b/cudax/include/cuda/experimental/__detail/utility.cuh @@ -11,7 +11,7 @@ #ifndef __CUDAX_DETAIL_UTILITY_H #define __CUDAX_DETAIL_UTILITY_H -#include +#include #if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC) # pragma GCC system_header @@ -21,6 +21,8 @@ # pragma system_header #endif // no system header +#include + namespace cuda::experimental { namespace detail @@ -30,8 +32,8 @@ struct [[maybe_unused]] __ignore { __ignore() = default; - template - _CCCL_HOST_DEVICE constexpr __ignore(_Arg&&) noexcept + template + _CCCL_HOST_DEVICE constexpr __ignore(_Args&&...) noexcept {} }; @@ -42,8 +44,24 @@ struct __immovable __immovable(__immovable&&) = delete; __immovable& operator=(__immovable&&) = delete; }; + +template +struct _LIBCUDACXX_DECLSPEC_EMPTY_BASES __inherit : _Types... +{}; + +template class _Template> +inline constexpr bool __is_specialization_of = false; + +template