Skip to content

Commit 8ab29fb

Browse files
JMazurkiewiczJMazurkiewicz
committed
[[__nodiscard__]] => [[nodiscard]]
Comment: #65536 (comment)
1 parent 95ea7bc commit 8ab29fb

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

‎libcxx/include/__ranges/join_with_view.h

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,15 @@ class join_with_view : public view_interface<join_with_view<_View, _Pattern>> {
9797
_LIBCPP_HIDE_FROM_ABI constexpr explicit join_with_view(_Range&& __r, range_value_t<_InnerRng> __e)
9898
: __base_(views::all(std::forward<_Range>(__r))), __pattern_(views::single(std::move(__e))) {}
9999

100-
[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI constexpr _View base() const&
100+
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _View base() const&
101101
requires copy_constructible<_View>
102102
{
103103
return __base_;
104104
}
105105

106-
[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI constexpr _View base() && { return std::move(__base_); }
106+
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _View base() && { return std::move(__base_); }
107107

108-
[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI constexpr auto begin() {
108+
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto begin() {
109109
if constexpr (forward_range<_View>) {
110110
constexpr bool __use_const = __simple_view<_View> && is_reference_v<_InnerRng> && __simple_view<_Pattern>;
111111
return __iterator<__use_const>{*this, ranges::begin(__base_)};
@@ -115,15 +115,15 @@ class join_with_view : public view_interface<join_with_view<_View, _Pattern>> {
115115
}
116116
}
117117

118-
[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI constexpr auto begin() const
118+
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto begin() const
119119
requires forward_range<const _View> && forward_range<const _Pattern> &&
120120
is_reference_v<range_reference_t<const _View>> && input_range<range_reference_t<const _View>> &&
121121
__concatable<range_reference_t<const _View>, const _Pattern>
122122
{
123123
return __iterator<true>{*this, ranges::begin(__base_)};
124124
}
125125

126-
[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI constexpr auto end() {
126+
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto end() {
127127
constexpr bool __use_const = __simple_view<_View> && __simple_view<_Pattern>;
128128
if constexpr (forward_range<_View> && is_reference_v<_InnerRng> && forward_range<_InnerRng> &&
129129
common_range<_View> && common_range<_InnerRng>)
@@ -132,7 +132,7 @@ class join_with_view : public view_interface<join_with_view<_View, _Pattern>> {
132132
return __sentinel<__use_const>{*this};
133133
}
134134

135-
[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI constexpr auto end() const
135+
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto end() const
136136
requires forward_range<const _View> && forward_range<const _Pattern> &&
137137
is_reference_v<range_reference_t<const _View>> && input_range<range_reference_t<const _View>> &&
138138
__concatable<range_reference_t<const _View>, const _Pattern>
@@ -231,28 +231,28 @@ struct join_with_view<_View, _Pattern>::__iterator
231231
}
232232
}
233233

234-
[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI constexpr _OuterIter& __get_outer() {
234+
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _OuterIter& __get_outer() {
235235
if constexpr (forward_range<_Base>)
236236
return __outer_it_;
237237
else
238238
return *__parent_->__outer_it_;
239239
}
240240

241-
[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI constexpr const _OuterIter& __get_outer() const {
241+
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr const _OuterIter& __get_outer() const {
242242
if constexpr (forward_range<_Base>)
243243
return __outer_it_;
244244
else
245245
return *__parent_->__outer_it_;
246246
}
247247

248-
[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI constexpr auto& __update_inner() {
248+
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto& __update_inner() {
249249
if constexpr (__ref_is_glvalue)
250250
return std::__as_lvalue(*__get_outer());
251251
else
252252
return __parent_->__inner_.__emplace_from([this]() -> decltype(auto) { return *__get_outer(); });
253253
}
254254

255-
[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI constexpr auto& __get_inner() {
255+
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto& __get_inner() {
256256
if constexpr (__ref_is_glvalue)
257257
return std::__as_lvalue(*__get_outer());
258258
else
@@ -282,7 +282,7 @@ struct join_with_view<_View, _Pattern>::__iterator
282282
}
283283
}
284284

285-
[[__nodiscard__]] static consteval auto __get_iterator_concept() noexcept {
285+
[[nodiscard]] static consteval auto __get_iterator_concept() noexcept {
286286
if constexpr (__ref_is_glvalue && bidirectional_range<_Base> && __bidirectional_common<_InnerBase> &&
287287
__bidirectional_common<_PatternBase>)
288288
return bidirectional_iterator_tag{};
@@ -311,7 +311,7 @@ struct join_with_view<_View, _Pattern>::__iterator
311311
}
312312
}
313313

314-
[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator*() const {
314+
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator*() const {
315315
using __reference = common_reference_t<iter_reference_t<_InnerIter>, iter_reference_t<_PatternIter>>;
316316
return std::visit([](auto& __it) -> __reference { return *__it; }, __inner_it_);
317317
}
@@ -372,13 +372,13 @@ struct join_with_view<_View, _Pattern>::__iterator
372372
return __tmp;
373373
}
374374

375-
[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI friend constexpr bool operator==(const __iterator& __x, const __iterator& __y)
375+
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr bool operator==(const __iterator& __x, const __iterator& __y)
376376
requires __ref_is_glvalue && forward_range<_Base> && equality_comparable<_InnerIter>
377377
{
378378
return __x.__outer_it_ == __y.__outer_it_ && __x.__inner_it_ == __y.__inner_it_;
379379
}
380380

381-
[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI friend constexpr decltype(auto) iter_move(const __iterator& __x) {
381+
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr decltype(auto) iter_move(const __iterator& __x) {
382382
using __rvalue_reference =
383383
common_reference_t<iter_rvalue_reference_t<_InnerIter>, iter_rvalue_reference_t<_PatternIter>>;
384384
return std::visit<__rvalue_reference>(ranges::iter_move, __x.__inner_it_);
@@ -408,7 +408,7 @@ struct join_with_view<_View, _Pattern>::__sentinel {
408408

409409
template <bool _OtherConst>
410410
requires sentinel_for<sentinel_t<_Base>, iterator_t<__maybe_const<_OtherConst, _View>>>
411-
[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI constexpr bool __equal_to(const __iterator<_OtherConst>& __x) const {
411+
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr bool __equal_to(const __iterator<_OtherConst>& __x) const {
412412
return __x.__get_outer() == __end_;
413413
}
414414

@@ -421,7 +421,7 @@ struct join_with_view<_View, _Pattern>::__sentinel {
421421

422422
template <bool _OtherConst>
423423
requires sentinel_for<sentinel_t<_Base>, iterator_t<__maybe_const<_OtherConst, _View>>>
424-
[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI friend constexpr bool
424+
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr bool
425425
operator==(const __iterator<_OtherConst>& __x, const __sentinel& __y) {
426426
return __y.__equal_to(__x);
427427
}
@@ -431,15 +431,15 @@ namespace views {
431431
namespace __join_with_view {
432432
struct __fn {
433433
template <class _Range, class _Pattern>
434-
[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Range&& __range, _Pattern&& __pattern) const
434+
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Range&& __range, _Pattern&& __pattern) const
435435
noexcept(noexcept(/**/ join_with_view(std::forward<_Range>(__range), std::forward<_Pattern>(__pattern))))
436436
-> decltype(/*--*/ join_with_view(std::forward<_Range>(__range), std::forward<_Pattern>(__pattern))) {
437437
return /*-------------*/ join_with_view(std::forward<_Range>(__range), std::forward<_Pattern>(__pattern));
438438
}
439439

440440
template <class _Pattern>
441441
requires constructible_from<decay_t<_Pattern>, _Pattern>
442-
[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Pattern&& __pattern) const
442+
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Pattern&& __pattern) const
443443
noexcept(is_nothrow_constructible_v<decay_t<_Pattern>, _Pattern>) {
444444
return __pipeable(std::__bind_back(*this, std::forward<_Pattern>(__pattern)));
445445
}

0 commit comments

Comments
 (0)