Skip to content

Commit 8c04b65

Browse files
wmaxeymiscco
andauthored
[Backport 3.0.x] Use proper qualification in allocate.h (#4796) (#6126)
* Use proper qualification in allocate.h (#4796) Fixes [BUG]: Ambiguous call to __do_deallocate_handle_size when compiling with clang and libc++ #4793 * Keep sink for `__align` --------- Co-authored-by: Michael Schellenberger Costa <[email protected]>
1 parent 667a95f commit 8c04b65

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

libcudacxx/include/cuda/std/__new/allocate.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@ using ::std::align_val_t;
7676
_LIBCUDACXX_HIDE_FROM_ABI void* __cccl_allocate(size_t __size, size_t __align)
7777
{
7878
#if _LIBCUDACXX_HAS_ALIGNED_ALLOCATION()
79-
if (__is_overaligned_for_new(__align))
79+
if (_CUDA_VSTD::__is_overaligned_for_new(__align))
8080
{
8181
const align_val_t __align_val = static_cast<align_val_t>(__align);
82-
return __cccl_operator_new(__size, __align_val);
82+
return _CUDA_VSTD::__cccl_operator_new(__size, __align_val);
8383
}
8484
#endif // _LIBCUDACXX_HAS_ALIGNED_ALLOCATION()
8585
(void) __align;
86-
return __cccl_operator_new(__size);
86+
return _CUDA_VSTD::__cccl_operator_new(__size);
8787
}
8888

8989
template <class... _Args>
@@ -100,27 +100,27 @@ _LIBCUDACXX_HIDE_FROM_ABI void __do_deallocate_handle_size(void* __ptr, size_t _
100100
_LIBCUDACXX_HIDE_FROM_ABI void __cccl_deallocate(void* __ptr, size_t __size, size_t __align)
101101
{
102102
#if _LIBCUDACXX_HAS_ALIGNED_ALLOCATION()
103-
if (__is_overaligned_for_new(__align))
103+
if (_CUDA_VSTD::__is_overaligned_for_new(__align))
104104
{
105105
const align_val_t __align_val = static_cast<align_val_t>(__align);
106-
return __do_deallocate_handle_size(__ptr, __size, __align_val);
106+
return _CUDA_VSTD::__do_deallocate_handle_size(__ptr, __size, __align_val);
107107
}
108108
#endif // _LIBCUDACXX_HAS_ALIGNED_ALLOCATION()
109109
(void) __align;
110-
return __do_deallocate_handle_size(__ptr, __size);
110+
return _CUDA_VSTD::__do_deallocate_handle_size(__ptr, __size);
111111
}
112112

113113
_LIBCUDACXX_HIDE_FROM_ABI void __cccl_deallocate_unsized(void* __ptr, size_t __align)
114114
{
115115
#if _LIBCUDACXX_HAS_ALIGNED_ALLOCATION()
116-
if (__is_overaligned_for_new(__align))
116+
if (_CUDA_VSTD::__is_overaligned_for_new(__align))
117117
{
118118
const align_val_t __align_val = static_cast<align_val_t>(__align);
119-
return __cccl_operator_delete(__ptr, __align_val);
119+
return _CUDA_VSTD::__cccl_operator_delete(__ptr, __align_val);
120120
}
121121
#endif // _LIBCUDACXX_HAS_ALIGNED_ALLOCATION()
122122
(void) __align;
123-
return __cccl_operator_delete(__ptr);
123+
return _CUDA_VSTD::__cccl_operator_delete(__ptr);
124124
}
125125

126126
_LIBCUDACXX_END_NAMESPACE_STD

0 commit comments

Comments
 (0)