Skip to content

Avoid using __local as it collides with clc++ keyword #154020

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Avoid using __local as it collides with clc++ keyword #154020

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
2 changes: 1 addition & 1 deletion libcxx/include/__algorithm/copy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ struct __copy_impl {
if (__first == __last)
return std::make_pair(std::move(__first), std::move(__result));

auto __local_first = _Traits::__local(__result);
auto __local_first = _Traits::__local_it(__result);
auto __segment_iterator = _Traits::__segment(__result);
while (true) {
auto __local_last = _Traits::__end(__segment_iterator);
Expand Down
8 changes: 4 additions & 4 deletions libcxx/include/__algorithm/copy_backward.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,12 +178,12 @@ struct __copy_backward_impl {
auto __slast = _Traits::__segment(__last);
if (__sfirst == __slast) {
auto __iters =
std::__copy_backward<_AlgPolicy>(_Traits::__local(__first), _Traits::__local(__last), std::move(__result));
std::__copy_backward<_AlgPolicy>(_Traits::__local_it(__first), _Traits::__local_it(__last), std::move(__result));
return std::make_pair(__last, __iters.second);
}

__result =
std::__copy_backward<_AlgPolicy>(_Traits::__begin(__slast), _Traits::__local(__last), std::move(__result))
std::__copy_backward<_AlgPolicy>(_Traits::__begin(__slast), _Traits::__local_it(__last), std::move(__result))
.second;
--__slast;
while (__sfirst != __slast) {
Expand All @@ -192,7 +192,7 @@ struct __copy_backward_impl {
.second;
--__slast;
}
__result = std::__copy_backward<_AlgPolicy>(_Traits::__local(__first), _Traits::__end(__slast), std::move(__result))
__result = std::__copy_backward<_AlgPolicy>(_Traits::__local_it(__first), _Traits::__end(__slast), std::move(__result))
.second;
return std::make_pair(__last, std::move(__result));
}
Expand All @@ -212,7 +212,7 @@ struct __copy_backward_impl {
if (__first == __last)
return std::make_pair(__first, __result);

auto __local_last = _Traits::__local(__result);
auto __local_last = _Traits::__local_it(__result);
while (true) {
using _DiffT = typename common_type<__iter_diff_t<_InIter>, __iter_diff_t<_OutIter> >::type;

Expand Down
6 changes: 3 additions & 3 deletions libcxx/include/__algorithm/find_segment_if.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ __find_segment_if(_SegmentedIterator __first, _SegmentedIterator __last, _Pred _

// We are in a single segment, so we might not be at the beginning or end
if (__sfirst == __slast)
return _Traits::__compose(__sfirst, __pred(_Traits::__local(__first), _Traits::__local(__last), __proj));
return _Traits::__compose(__sfirst, __pred(_Traits::__local_it(__first), _Traits::__local_it(__last), __proj));

{ // We have more than one segment. Iterate over the first segment, since we might not start at the beginning
auto __llast = _Traits::__end(__sfirst);
auto __liter = __pred(_Traits::__local(__first), __llast, __proj);
auto __liter = __pred(_Traits::__local_it(__first), __llast, __proj);
if (__liter != __llast)
return _Traits::__compose(__sfirst, __liter);
}
Expand All @@ -54,7 +54,7 @@ __find_segment_if(_SegmentedIterator __first, _SegmentedIterator __last, _Pred _
}

// Iterate over the last segment
return _Traits::__compose(__sfirst, __pred(_Traits::__begin(__sfirst), _Traits::__local(__last), __proj));
return _Traits::__compose(__sfirst, __pred(_Traits::__begin(__sfirst), _Traits::__local_it(__last), __proj));
}

_LIBCPP_END_NAMESPACE_STD
Expand Down
2 changes: 1 addition & 1 deletion libcxx/include/__algorithm/for_each_n_segment.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ __for_each_n_segment(_SegmentedIterator __first, _Size __orig_n, _Functor __func
using __difference_t = typename std::iterator_traits<__local_iter_t>::difference_type;
__difference_t __n = __orig_n;
auto __seg = _Traits::__segment(__first);
auto __local_first = _Traits::__local(__first);
auto __local_first = _Traits::__local_it(__first);
__local_iter_t __local_last;

while (__n > 0) {
Expand Down
6 changes: 3 additions & 3 deletions libcxx/include/__algorithm/for_each_segment.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,20 @@ __for_each_segment(_SegmentedIterator __first, _SegmentedIterator __last, _Funct

// We are in a single segment, so we might not be at the beginning or end
if (__sfirst == __slast) {
__func(_Traits::__local(__first), _Traits::__local(__last));
__func(_Traits::__local_it(__first), _Traits::__local_it(__last));
return;
}

// We have more than one segment. Iterate over the first segment, since we might not start at the beginning
__func(_Traits::__local(__first), _Traits::__end(__sfirst));
__func(_Traits::__local_it(__first), _Traits::__end(__sfirst));
++__sfirst;
// iterate over the segments which are guaranteed to be completely in the range
while (__sfirst != __slast) {
__func(_Traits::__begin(__sfirst), _Traits::__end(__sfirst));
++__sfirst;
}
// iterate over the last segment
__func(_Traits::__begin(__sfirst), _Traits::__local(__last));
__func(_Traits::__begin(__sfirst), _Traits::__local_it(__last));
}

_LIBCPP_END_NAMESPACE_STD
Expand Down
2 changes: 1 addition & 1 deletion libcxx/include/__algorithm/move.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ struct __move_impl {
if (__first == __last)
return std::make_pair(std::move(__first), std::move(__result));

auto __local_first = _Traits::__local(__result);
auto __local_first = _Traits::__local_it(__result);
auto __segment_iterator = _Traits::__segment(__result);
while (true) {
auto __local_last = _Traits::__end(__segment_iterator);
Expand Down
8 changes: 4 additions & 4 deletions libcxx/include/__algorithm/move_backward.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ struct __move_backward_impl {
auto __slast = _Traits::__segment(__last);
if (__sfirst == __slast) {
auto __iters =
std::__move_backward<_AlgPolicy>(_Traits::__local(__first), _Traits::__local(__last), std::move(__result));
std::__move_backward<_AlgPolicy>(_Traits::__local_it(__first), _Traits::__local_it(__last), std::move(__result));
return std::make_pair(__last, __iters.second);
}

__result =
std::__move_backward<_AlgPolicy>(_Traits::__begin(__slast), _Traits::__local(__last), std::move(__result))
std::__move_backward<_AlgPolicy>(_Traits::__begin(__slast), _Traits::__local_it(__last), std::move(__result))
.second;
--__slast;
while (__sfirst != __slast) {
Expand All @@ -73,7 +73,7 @@ struct __move_backward_impl {
.second;
--__slast;
}
__result = std::__move_backward<_AlgPolicy>(_Traits::__local(__first), _Traits::__end(__slast), std::move(__result))
__result = std::__move_backward<_AlgPolicy>(_Traits::__local_it(__first), _Traits::__end(__slast), std::move(__result))
.second;
return std::make_pair(__last, std::move(__result));
}
Expand All @@ -94,7 +94,7 @@ struct __move_backward_impl {

auto __orig_last = __last;

auto __local_last = _Traits::__local(__result);
auto __local_last = _Traits::__local_it(__result);
auto __segment_iterator = _Traits::__segment(__result);
while (true) {
auto __local_first = _Traits::__begin(__segment_iterator);
Expand Down
2 changes: 1 addition & 1 deletion libcxx/include/__cxx03/__algorithm/copy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ struct __copy_impl {
if (__first == __last)
return std::make_pair(std::move(__first), std::move(__result));

auto __local_first = _Traits::__local(__result);
auto __local_first = _Traits::__local_it(__result);
auto __segment_iterator = _Traits::__segment(__result);
while (true) {
auto __local_last = _Traits::__end(__segment_iterator);
Expand Down
8 changes: 4 additions & 4 deletions libcxx/include/__cxx03/__algorithm/copy_backward.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@ struct __copy_backward_impl {
auto __slast = _Traits::__segment(__last);
if (__sfirst == __slast) {
auto __iters =
std::__copy_backward<_AlgPolicy>(_Traits::__local(__first), _Traits::__local(__last), std::move(__result));
std::__copy_backward<_AlgPolicy>(_Traits::__local_it(__first), _Traits::__local_it(__last), std::move(__result));
return std::make_pair(__last, __iters.second);
}

__result =
std::__copy_backward<_AlgPolicy>(_Traits::__begin(__slast), _Traits::__local(__last), std::move(__result))
std::__copy_backward<_AlgPolicy>(_Traits::__begin(__slast), _Traits::__local_it(__last), std::move(__result))
.second;
--__slast;
while (__sfirst != __slast) {
Expand All @@ -66,7 +66,7 @@ struct __copy_backward_impl {
.second;
--__slast;
}
__result = std::__copy_backward<_AlgPolicy>(_Traits::__local(__first), _Traits::__end(__slast), std::move(__result))
__result = std::__copy_backward<_AlgPolicy>(_Traits::__local_it(__first), _Traits::__end(__slast), std::move(__result))
.second;
return std::make_pair(__last, std::move(__result));
}
Expand All @@ -85,7 +85,7 @@ struct __copy_backward_impl {
if (__first == __last)
return std::make_pair(__first, __result);

auto __local_last = _Traits::__local(__result);
auto __local_last = _Traits::__local_it(__result);
while (true) {
using _DiffT = typename common_type<__iter_diff_t<_InIter>, __iter_diff_t<_OutIter> >::type;

Expand Down
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__algorithm/find_segment_if.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ __find_segment_if(_SegmentedIterator __first, _SegmentedIterator __last, _Pred _

// We are in a single segment, so we might not be at the beginning or end
if (__sfirst == __slast)
return _Traits::__compose(__sfirst, __pred(_Traits::__local(__first), _Traits::__local(__last), __proj));
return _Traits::__compose(__sfirst, __pred(_Traits::__local_it(__first), _Traits::__local_it(__last), __proj));

{ // We have more than one segment. Iterate over the first segment, since we might not start at the beginning
auto __llast = _Traits::__end(__sfirst);
auto __liter = __pred(_Traits::__local(__first), __llast, __proj);
auto __liter = __pred(_Traits::__local_it(__first), __llast, __proj);
if (__liter != __llast)
return _Traits::__compose(__sfirst, __liter);
}
Expand All @@ -54,7 +54,7 @@ __find_segment_if(_SegmentedIterator __first, _SegmentedIterator __last, _Pred _
}

// Iterate over the last segment
return _Traits::__compose(__sfirst, __pred(_Traits::__begin(__sfirst), _Traits::__local(__last), __proj));
return _Traits::__compose(__sfirst, __pred(_Traits::__begin(__sfirst), _Traits::__local_it(__last), __proj));
}

_LIBCPP_END_NAMESPACE_STD
Expand Down
6 changes: 3 additions & 3 deletions libcxx/include/__cxx03/__algorithm/for_each_segment.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,20 @@ _LIBCPP_HIDE_FROM_ABI void __for_each_segment(_SegmentedIterator __first, _Segme

// We are in a single segment, so we might not be at the beginning or end
if (__sfirst == __slast) {
__func(_Traits::__local(__first), _Traits::__local(__last));
__func(_Traits::__local_it(__first), _Traits::__local_it(__last));
return;
}

// We have more than one segment. Iterate over the first segment, since we might not start at the beginning
__func(_Traits::__local(__first), _Traits::__end(__sfirst));
__func(_Traits::__local_it(__first), _Traits::__end(__sfirst));
++__sfirst;
// iterate over the segments which are guaranteed to be completely in the range
while (__sfirst != __slast) {
__func(_Traits::__begin(__sfirst), _Traits::__end(__sfirst));
++__sfirst;
}
// iterate over the last segment
__func(_Traits::__begin(__sfirst), _Traits::__local(__last));
__func(_Traits::__begin(__sfirst), _Traits::__local_it(__last));
}

_LIBCPP_END_NAMESPACE_STD
Expand Down
2 changes: 1 addition & 1 deletion libcxx/include/__cxx03/__algorithm/move.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ struct __move_impl {
if (__first == __last)
return std::make_pair(std::move(__first), std::move(__result));

auto __local_first = _Traits::__local(__result);
auto __local_first = _Traits::__local_it(__result);
auto __segment_iterator = _Traits::__segment(__result);
while (true) {
auto __local_last = _Traits::__end(__segment_iterator);
Expand Down
8 changes: 4 additions & 4 deletions libcxx/include/__cxx03/__algorithm/move_backward.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ struct __move_backward_impl {
auto __slast = _Traits::__segment(__last);
if (__sfirst == __slast) {
auto __iters =
std::__move_backward<_AlgPolicy>(_Traits::__local(__first), _Traits::__local(__last), std::move(__result));
std::__move_backward<_AlgPolicy>(_Traits::__local_it(__first), _Traits::__local_it(__last), std::move(__result));
return std::make_pair(__last, __iters.second);
}

__result =
std::__move_backward<_AlgPolicy>(_Traits::__begin(__slast), _Traits::__local(__last), std::move(__result))
std::__move_backward<_AlgPolicy>(_Traits::__begin(__slast), _Traits::__local_it(__last), std::move(__result))
.second;
--__slast;
while (__sfirst != __slast) {
Expand All @@ -67,7 +67,7 @@ struct __move_backward_impl {
.second;
--__slast;
}
__result = std::__move_backward<_AlgPolicy>(_Traits::__local(__first), _Traits::__end(__slast), std::move(__result))
__result = std::__move_backward<_AlgPolicy>(_Traits::__local_it(__first), _Traits::__end(__slast), std::move(__result))
.second;
return std::make_pair(__last, std::move(__result));
}
Expand All @@ -87,7 +87,7 @@ struct __move_backward_impl {

auto __orig_last = __last;

auto __local_last = _Traits::__local(__result);
auto __local_last = _Traits::__local_it(__result);
auto __segment_iterator = _Traits::__segment(__result);
while (true) {
auto __local_first = _Traits::__begin(__segment_iterator);
Expand Down
4 changes: 2 additions & 2 deletions libcxx/include/__cxx03/__iterator/segmented_iterator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
// - static __segment_iterator Traits::__segment(It __it)
// Returns an iterator to the segment that the provided iterator is in.
//
// - static __local_iterator Traits::__local(It __it)
// - static __local_iterator Traits::__local_it(It __it)
// Returns the local iterator pointing to the element that the provided iterator points to.
//
// - static __local_iterator Traits::__begin(__segment_iterator __it)
Expand Down Expand Up @@ -58,7 +58,7 @@ struct __segmented_iterator_traits;
using __local_iterator = ...;

static __segment_iterator __segment(_Iterator);
static __local_iterator __local(_Iterator);
static __local_iterator __local_it(_Iterator);
static __local_iterator __begin(__segment_iterator);
static __local_iterator __end(__segment_iterator);
static _Iterator __compose(__segment_iterator, __local_iterator);
Expand Down
8 changes: 4 additions & 4 deletions libcxx/include/__cxx03/deque
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,19 +401,19 @@ public:
using __local_iterator = _Pointer;

static _LIBCPP_HIDE_FROM_ABI __segment_iterator __segment(_Iterator __iter) { return __iter.__m_iter_; }
static _LIBCPP_HIDE_FROM_ABI __local_iterator __local(_Iterator __iter) { return __iter.__ptr_; }
static _LIBCPP_HIDE_FROM_ABI __local_iterator __local_it(_Iterator __iter) { return __iter.__ptr_; }
static _LIBCPP_HIDE_FROM_ABI __local_iterator __begin(__segment_iterator __iter) { return *__iter; }

static _LIBCPP_HIDE_FROM_ABI __local_iterator __end(__segment_iterator __iter) {
return *__iter + _Iterator::__block_size;
}

static _LIBCPP_HIDE_FROM_ABI _Iterator __compose(__segment_iterator __segment, __local_iterator __local) {
if (__segment && __local == __end(__segment)) {
static _LIBCPP_HIDE_FROM_ABI _Iterator __compose(__segment_iterator __segment, __local_iterator __local_it) {
if (__segment && __local_it == __end(__segment)) {
++__segment;
return _Iterator(__segment, *__segment);
}
return _Iterator(__segment, __local);
return _Iterator(__segment, __local_it);
}
};

Expand Down
4 changes: 2 additions & 2 deletions libcxx/include/__iterator/segmented_iterator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
// - static __segment_iterator Traits::__segment(It __it)
// Returns an iterator to the segment that the provided iterator is in.
//
// - static __local_iterator Traits::__local(It __it)
// - static __local_iterator Traits::__local_it(It __it)
// Returns the local iterator pointing to the element that the provided iterator points to.
//
// - static __local_iterator Traits::__begin(__segment_iterator __it)
Expand Down Expand Up @@ -59,7 +59,7 @@ struct __segmented_iterator_traits;
using __local_iterator = ...;

static __segment_iterator __segment(_Iterator);
static __local_iterator __local(_Iterator);
static __local_iterator __local_it(_Iterator);
static __local_iterator __begin(__segment_iterator);
static __local_iterator __end(__segment_iterator);
static _Iterator __compose(__segment_iterator, __local_iterator);
Expand Down
2 changes: 1 addition & 1 deletion libcxx/include/__ranges/join_view.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ struct __segmented_iterator_traits<_JoinViewIterator> {
return __segment_iterator(__iter.__outer_, __iter.__parent_);
}

static constexpr _LIBCPP_HIDE_FROM_ABI __local_iterator __local(_JoinViewIterator __iter) {
static constexpr _LIBCPP_HIDE_FROM_ABI __local_iterator __local_it(_JoinViewIterator __iter) {
if (ranges::empty(__iter.__parent_->__base_))
return {};
if (!__iter.__inner_.has_value())
Expand Down
8 changes: 4 additions & 4 deletions libcxx/include/deque
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,19 +465,19 @@ public:
using __local_iterator _LIBCPP_NODEBUG = _Pointer;

static _LIBCPP_HIDE_FROM_ABI __segment_iterator __segment(_Iterator __iter) { return __iter.__m_iter_; }
static _LIBCPP_HIDE_FROM_ABI __local_iterator __local(_Iterator __iter) { return __iter.__ptr_; }
static _LIBCPP_HIDE_FROM_ABI __local_iterator __local_it(_Iterator __iter) { return __iter.__ptr_; }
static _LIBCPP_HIDE_FROM_ABI __local_iterator __begin(__segment_iterator __iter) { return *__iter; }

static _LIBCPP_HIDE_FROM_ABI __local_iterator __end(__segment_iterator __iter) {
return *__iter + _Iterator::__block_size;
}

static _LIBCPP_HIDE_FROM_ABI _Iterator __compose(__segment_iterator __segment, __local_iterator __local) {
if (__segment && __local == __end(__segment)) {
static _LIBCPP_HIDE_FROM_ABI _Iterator __compose(__segment_iterator __segment, __local_iterator __local_it) {
if (__segment && __local_it == __end(__segment)) {
++__segment;
return _Iterator(__segment, *__segment);
}
return _Iterator(__segment, __local);
return _Iterator(__segment, __local_it);
}
};

Expand Down
6 changes: 3 additions & 3 deletions libcxx/src/experimental/include/tzdb/types_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ struct __constrained_weekday {
// Sun<=25 last Sunday on or before the 25th
using __on = variant<day, weekday_last, __constrained_weekday>;

enum class __clock { __local, __standard, __universal };
enum class __clock { __local_tm, __standard_tm, __universal_tm };

struct __at {
seconds __time{0};
__tz::__clock __clock{__tz::__clock::__local};
__tz::__clock __clock{__tz::__clock::__local_tm};
};

struct __save {
Expand Down Expand Up @@ -107,7 +107,7 @@ struct __continuation {
year __year = chrono::year::min();
month __in{January};
__tz::__on __on{chrono::day{1}};
__tz::__at __at{chrono::seconds{0}, __tz::__clock::__local};
__tz::__at __at{chrono::seconds{0}, __tz::__clock::__local_tm};
};

} // namespace chrono::__tz
Expand Down
Loading
Loading