fix1

NVIDIA · Nov 29, 2024 · e9cb9ac · e9cb9ac
1 parent 510df61
commit e9cb9ac
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/thrust/thrust/detail/contiguous_storage.inl b/thrust/thrust/detail/contiguous_storage.inl
@@ -194,8 +194,11 @@ _CCCL_HOST_DEVICE void contiguous_storage<T, Alloc>::deallocate() noexcept
 template <typename T, typename Alloc>
 _CCCL_HOST_DEVICE void contiguous_storage<T, Alloc>::swap(contiguous_storage& x)
 {
-  using ::cuda::std::swap;
-  swap(m_begin, x.m_begin);
+  // FIXME(bgruber): this should use ADL-two-step swap, but this creates an ambiguity with std::swap until
+  // https://github.com/NVIDIA/cccl/issues/2984 is resolved.
+  // using ::cuda::std::swap;
+  // swap(m_begin, x.m_begin);
+  ::cuda::std::swap(m_begin, x.m_begin);
   swap(m_size, x.m_size);
 
   // FIXME(bgruber): swap_allocators already swaps m_allocator, so we are swapping twice here !!