Skip to content

Commit ec36aac

Browse files
committed
P1871R1 Concept traits should be named after concepts
Also fixes NB US 257 (C++20 CD).
1 parent 3c596ed commit ec36aac

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

source/iterators.tex

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111

112112
// \ref{iterator.concept.sizedsentinel}, concept \libconcept{sized_sentinel_for}
113113
template<class S, class I>
114-
inline constexpr bool disable_sized_sentinel = false;
114+
inline constexpr bool disable_sized_sentinel_for = false;
115115

116116
template<class S, class I>
117117
concept sized_sentinel_for = @\seebelow@;
@@ -315,8 +315,8 @@
315315

316316
template<class Iterator1, class Iterator2>
317317
requires (!sized_sentinel_for<Iterator1, Iterator2>)
318-
inline constexpr bool disable_sized_sentinel<reverse_iterator<Iterator1>,
319-
reverse_iterator<Iterator2>> = true;
318+
inline constexpr bool disable_sized_sentinel_for<reverse_iterator<Iterator1>,
319+
reverse_iterator<Iterator2>> = true;
320320

321321
// \ref{insert.iterators}, insert iterators
322322
template<class Container> class back_insert_iterator;
@@ -1554,7 +1554,7 @@
15541554
template<class S, class I>
15551555
concept @\deflibconcept{sized_sentinel_for}@ =
15561556
sentinel_for<S, I> &&
1557-
!disable_sized_sentinel<remove_cv_t<S>, remove_cv_t<I>> &&
1557+
!disable_sized_sentinel_for<remove_cv_t<S>, remove_cv_t<I>> &&
15581558
requires(const I& i, const S& s) {
15591559
{ s - i } -> same_as<iter_difference_t<I>>;
15601560
{ i - s } -> same_as<iter_difference_t<I>>;
@@ -1577,17 +1577,17 @@
15771577
\end{itemize}
15781578
\end{itemdescr}
15791579

1580-
\indexlibraryglobal{disable_sized_sentinel}%
1580+
\indexlibraryglobal{disable_sized_sentinel_for}%
15811581
\begin{itemdecl}
15821582
template<class S, class I>
1583-
inline constexpr bool disable_sized_sentinel = false;
1583+
inline constexpr bool disable_sized_sentinel_for = false;
15841584
\end{itemdecl}
15851585

15861586
\begin{itemdescr}
15871587
\pnum
15881588
\remarks
15891589
Pursuant to \ref{namespace.std},
1590-
users may specialize \tcode{disable_sized_sentinel}
1590+
users may specialize \tcode{disable_sized_sentinel_for}
15911591
for cv-unqualified non-array object types \tcode{S} and \tcode{I}
15921592
if \tcode{S} and/or \tcode{I} is a program-defined type.
15931593
Such specializations shall
@@ -1596,7 +1596,7 @@
15961596

15971597
\pnum
15981598
\begin{note}
1599-
\tcode{disable_sized_sentinel} allows use of sentinels and iterators with
1599+
\tcode{disable_sized_sentinel_for} allows use of sentinels and iterators with
16001600
the library that satisfy but do not in fact model \libconcept{sized_sentinel_for}.
16011601
\end{note}
16021602

0 commit comments

Comments
 (0)