Skip to content

[SYCL] Resolve name clash with a user defined symbol #4570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 15, 2021
Merged

[SYCL] Resolve name clash with a user defined symbol #4570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sycl/include/CL/sycl/sycl_span.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ template <typename _Tp, size_t _Extent> class _SYCL_SPAN_TEMPLATE_VIS span {
_SYCL_SPAN_INLINE_VISIBILITY constexpr explicit span(pointer __f, pointer __l)
: __data{__f} {
(void)__l;
_SYCL_SPAN_ASSERT(_Extent == distance(__f, __l),
_SYCL_SPAN_ASSERT(_Extent == std::distance(__f, __l),
"size mismatch in span's constructor (ptr, ptr)");
}

Expand Down Expand Up @@ -428,7 +428,7 @@ class _SYCL_SPAN_TEMPLATE_VIS span<_Tp, dynamic_extent> {
_SYCL_SPAN_INLINE_VISIBILITY constexpr span(pointer __ptr, size_type __count)
: __data{__ptr}, __size{__count} {}
_SYCL_SPAN_INLINE_VISIBILITY constexpr span(pointer __f, pointer __l)
: __data{__f}, __size{static_cast<size_t>(distance(__f, __l))} {}
: __data{__f}, __size{static_cast<size_t>(std::distance(__f, __l))} {}

template <size_t _Sz>
_SYCL_SPAN_INLINE_VISIBILITY constexpr span(
Expand Down
1 change: 1 addition & 0 deletions sycl/test/regression/macro_conflict.cpp → sycl/test/regression/headers_conflict.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@
//===----------------------------------------------------------------------===//

#define SUCCESS 0
class distance;

#include <CL/sycl.hpp>