Skip to content

Commit a6effbb

Browse files
committed
Revert back from using reserved identifiers
1 parent 769ab13 commit a6effbb

File tree

2 files changed

+160
-164
lines changed

2 files changed

+160
-164
lines changed

sycl/include/sycl/accessor.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1195,9 +1195,9 @@ class __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
11951195
using reference = DataT &;
11961196
using const_reference = const DataT &;
11971197

1198-
using iterator = typename detail::__accessor_iterator<DataT, Dimensions>;
1198+
using iterator = typename detail::accessor_iterator<DataT, Dimensions>;
11991199
using const_iterator =
1200-
typename detail::__accessor_iterator<const DataT, Dimensions>;
1200+
typename detail::accessor_iterator<const DataT, Dimensions>;
12011201
using difference_type =
12021202
typename std::iterator_traits<iterator>::difference_type;
12031203

@@ -2099,28 +2099,28 @@ class __SYCL_SPECIAL_CLASS __SYCL_TYPE(accessor) accessor :
20992099
bool operator!=(const accessor &Rhs) const { return !(*this == Rhs); }
21002100

21012101
iterator begin() const noexcept {
2102-
return iterator::__get_begin(
2102+
return iterator::getBegin(
21032103
get_pointer(),
21042104
detail::convertToArrayOfN<Dimensions, 1>(getMemoryRange()), get_range(),
21052105
get_offset());
21062106
}
21072107

21082108
iterator end() const noexcept {
2109-
return iterator::__get_end(
2109+
return iterator::getEnd(
21102110
get_pointer(),
21112111
detail::convertToArrayOfN<Dimensions, 1>(getMemoryRange()), get_range(),
21122112
get_offset());
21132113
}
21142114

21152115
const_iterator cbegin() const noexcept {
2116-
return const_iterator::__get_begin(
2116+
return const_iterator::getBegin(
21172117
get_pointer(),
21182118
detail::convertToArrayOfN<Dimensions, 1>(getMemoryRange()), get_range(),
21192119
get_offset());
21202120
}
21212121

21222122
const_iterator cend() const noexcept {
2123-
return const_iterator::__get_end(
2123+
return const_iterator::getEnd(
21242124
get_pointer(),
21252125
detail::convertToArrayOfN<Dimensions, 1>(getMemoryRange()), get_range(),
21262126
get_offset());

0 commit comments

Comments
 (0)