Skip to content

Commit cab82ae

Browse files
committed
Address review comment
1 parent 13e5859 commit cab82ae

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

thrust/thrust/detail/pointer.h

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -394,14 +394,12 @@ class pointer : public detail::pointer_base<Element, Tag, Reference, Derived>::t
394394

395395
THRUST_NAMESPACE_END
396396

397-
_CCCL_BEGIN_NAMESPACE_CUDA_STD
398-
399397
// Specialize pointer traits for everything that has the raw_pointer alias
400398
template <typename Pointer>
401-
struct pointer_traits<Pointer, void_t<typename Pointer::raw_pointer>>
399+
struct ::cuda::std::pointer_traits<Pointer, ::cuda::std::void_t<typename Pointer::raw_pointer>>
402400
{
403401
using pointer = Pointer;
404-
using element_type = remove_pointer_t<typename Pointer::raw_pointer>;
402+
using element_type = ::cuda::std::remove_pointer_t<typename Pointer::raw_pointer>;
405403
using difference_type = ptrdiff_t;
406404

407405
template <typename U>
@@ -414,7 +412,9 @@ struct pointer_traits<Pointer, void_t<typename Pointer::raw_pointer>>
414412
using raw_pointer = typename pointer::raw_pointer;
415413

416414
// Thrust historically provided a non-standard pointer_to for pointer<void>
417-
template <class T, enable_if_t<(is_void_v<element_type> || is_same_v<T, element_type>), int> = 0>
415+
template <
416+
class T,
417+
::cuda::std::enable_if_t<(::cuda::std::is_void_v<element_type> || ::cuda::std::is_same_v<T, element_type>), int> = 0>
418418
[[nodiscard]] _CCCL_API inline static pointer pointer_to(T& r) noexcept(noexcept(::cuda::std::addressof(r)))
419419
{
420420
return static_cast<element_type*>(::cuda::std::addressof(r));
@@ -428,4 +428,3 @@ struct pointer_traits<Pointer, void_t<typename Pointer::raw_pointer>>
428428
return iter.get();
429429
}
430430
};
431-
_CCCL_END_NAMESPACE_CUDA_STD

0 commit comments

Comments
 (0)