Skip to content

Commit 0e35683

Browse files
hewillkjensmaurer
authored andcommitted
[specialized.algorithms,iterator.concept.readable] Replace \placeholdernc with \exposconcept
for exposition-only concepts
1 parent 3cc3926 commit 0e35683

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

source/algorithms.tex

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10383,7 +10383,7 @@
1038310383

1038410384
\begin{itemdescr}
1038510385
\pnum
10386-
A type \tcode{I} models \tcode{\placeholder{nothrow-input-iterator}} only if
10386+
A type \tcode{I} models \exposconcept{nothrow-input-iterator} only if
1038710387
no exceptions are thrown from increment,
1038810388
copy construction, move construction,
1038910389
copy assignment, move assignment,
@@ -10403,7 +10403,7 @@
1040310403

1040410404
\begin{itemdescr}
1040510405
\pnum
10406-
Types \tcode{S} and \tcode{I} model \tcode{\placeholder{nothrow-sentinel-for}}
10406+
Types \tcode{S} and \tcode{I} model \exposconcept{nothrow-sentinel-for}
1040710407
only if no exceptions are thrown from copy construction, move construction,
1040810408
copy assignment, move assignment, or comparisons between
1040910409
valid values of type \tcode{I} and \tcode{S}.
@@ -10419,23 +10419,23 @@
1041910419
template<class R>
1042010420
concept @\defexposconcept{nothrow-input-range}@ = // \expos
1042110421
range<R> &&
10422-
@\placeholder{nothrow-input-iterator}@<iterator_t<R>> &&
10423-
@\placeholder{nothrow-sentinel-for}@<sentinel_t<R>, iterator_t<R>>;
10422+
@\exposconcept{nothrow-input-iterator}@<iterator_t<R>> &&
10423+
@\exposconcept{nothrow-sentinel-for}@<sentinel_t<R>, iterator_t<R>>;
1042410424
\end{itemdecl}
1042510425

1042610426
\begin{itemdescr}
1042710427
\pnum
10428-
A type \tcode{R} models \tcode{\placeholder{nothrow-input-range}} only if
10428+
A type \tcode{R} models \exposconcept{nothrow-input-range} only if
1042910429
no exceptions are thrown from calls to \tcode{ranges::begin} and
1043010430
\tcode{ranges::end} on an object of type \tcode{R}.
1043110431
\end{itemdescr}
1043210432

1043310433
\begin{itemdecl}
1043410434
template<class I>
1043510435
concept @\defexposconcept{nothrow-forward-iterator}@ = // \expos
10436-
@\placeholder{nothrow-input-iterator}@<I> &&
10436+
@\exposconcept{nothrow-input-iterator}@<I> &&
1043710437
@\libconcept{forward_iterator}@<I> &&
10438-
@\placeholder{nothrow-sentinel-for}@<I, I>;
10438+
@\exposconcept{nothrow-sentinel-for}@<I, I>;
1043910439
\end{itemdecl}
1044010440

1044110441
\begin{itemdescr}
@@ -10449,8 +10449,8 @@
1044910449
\begin{itemdecl}
1045010450
template<class R>
1045110451
concept @\defexposconcept{nothrow-forward-range}@ = // \expos
10452-
@\placeholder{nothrow-input-range}@<R> &&
10453-
@\placeholder{nothrow-forward-iterator}@<iterator_t<R>>;
10452+
@\exposconcept{nothrow-input-range}@<R> &&
10453+
@\exposconcept{nothrow-forward-iterator}@<iterator_t<R>>;
1045410454
\end{itemdecl}
1045510455

1045610456
\rSec2[uninitialized.construct.default]{\tcode{uninitialized_default_construct}}
@@ -10475,10 +10475,10 @@
1047510475
\indexlibraryglobal{uninitialized_default_construct}%
1047610476
\begin{itemdecl}
1047710477
namespace ranges {
10478-
template<@\placeholdernc{nothrow-forward-iterator}@ I, @\placeholder{nothrow-sentinel-for}@<I> S>
10478+
template<@\exposconcept{nothrow-forward-iterator}@ I, @\exposconcept{nothrow-sentinel-for}@<I> S>
1047910479
requires @\libconcept{default_initializable}@<iter_value_t<I>>
1048010480
I uninitialized_default_construct(I first, S last);
10481-
template<@\placeholdernc{nothrow-forward-range}@ R>
10481+
template<@\exposconcept{nothrow-forward-range}@ R>
1048210482
requires @\libconcept{default_initializable}@<range_value_t<R>>
1048310483
borrowed_iterator_t<R> uninitialized_default_construct(R&& r);
1048410484
}
@@ -10516,7 +10516,7 @@
1051610516
\indexlibraryglobal{uninitialized_default_construct_n}%
1051710517
\begin{itemdecl}
1051810518
namespace ranges {
10519-
template<@\placeholdernc{nothrow-forward-iterator}@ I>
10519+
template<@\exposconcept{nothrow-forward-iterator}@ I>
1052010520
requires @\libconcept{default_initializable}@<iter_value_t<I>>
1052110521
I uninitialized_default_construct_n(I first, iter_difference_t<I> n);
1052210522
}
@@ -10554,10 +10554,10 @@
1055410554
\indexlibraryglobal{uninitialized_value_construct}%
1055510555
\begin{itemdecl}
1055610556
namespace ranges {
10557-
template<@\placeholdernc{nothrow-forward-iterator}@ I, @\placeholder{nothrow-sentinel-for}@<I> S>
10557+
template<@\exposconcept{nothrow-forward-iterator}@ I, @\exposconcept{nothrow-sentinel-for}@<I> S>
1055810558
requires @\libconcept{default_initializable}@<iter_value_t<I>>
1055910559
I uninitialized_value_construct(I first, S last);
10560-
template<@\placeholdernc{nothrow-forward-range}@ R>
10560+
template<@\exposconcept{nothrow-forward-range}@ R>
1056110561
requires @\libconcept{default_initializable}@<range_value_t<R>>
1056210562
borrowed_iterator_t<R> uninitialized_value_construct(R&& r);
1056310563
}
@@ -10595,7 +10595,7 @@
1059510595
\indexlibraryglobal{uninitialized_value_construct_n}%
1059610596
\begin{itemdecl}
1059710597
namespace ranges {
10598-
template<@\placeholdernc{nothrow-forward-iterator}@ I>
10598+
template<@\exposconcept{nothrow-forward-iterator}@ I>
1059910599
requires @\libconcept{default_initializable}@<iter_value_t<I>>
1060010600
I uninitialized_value_construct_n(I first, iter_difference_t<I> n);
1060110601
}
@@ -10643,11 +10643,11 @@
1064310643
\begin{itemdecl}
1064410644
namespace ranges {
1064510645
template<@\libconcept{input_iterator}@ I, @\libconcept{sentinel_for}@<I> S1,
10646-
@\placeholdernc{nothrow-forward-iterator}@ O, @\placeholder{nothrow-sentinel-for}@<O> S2>
10646+
@\exposconcept{nothrow-forward-iterator}@ O, @\exposconcept{nothrow-sentinel-for}@<O> S2>
1064710647
requires @\libconcept{constructible_from}@<iter_value_t<O>, iter_reference_t<I>>
1064810648
uninitialized_copy_result<I, O>
1064910649
uninitialized_copy(I ifirst, S1 ilast, O ofirst, S2 olast);
10650-
template<@\libconcept{input_range}@ IR, @\placeholdernc{nothrow-forward-range}@ OR>
10650+
template<@\libconcept{input_range}@ IR, @\exposconcept{nothrow-forward-range}@ OR>
1065110651
requires @\libconcept{constructible_from}@<range_value_t<OR>, range_reference_t<IR>>
1065210652
uninitialized_copy_result<borrowed_iterator_t<IR>, borrowed_iterator_t<OR>>
1065310653
uninitialized_copy(IR&& in_range, OR&& out_range);
@@ -10698,7 +10698,7 @@
1069810698
\indexlibraryglobal{uninitialized_copy_n}%
1069910699
\begin{itemdecl}
1070010700
namespace ranges {
10701-
template<@\libconcept{input_iterator}@ I, @\placeholdernc{nothrow-forward-iterator}@ O, @\placeholder{nothrow-sentinel-for}@<O> S>
10701+
template<@\libconcept{input_iterator}@ I, @\exposconcept{nothrow-forward-iterator}@ O, @\exposconcept{nothrow-sentinel-for}@<O> S>
1070210702
requires @\libconcept{constructible_from}@<iter_value_t<O>, iter_reference_t<I>>
1070310703
uninitialized_copy_n_result<I, O>
1070410704
uninitialized_copy_n(I ifirst, iter_difference_t<I> n, O ofirst, S olast);
@@ -10750,11 +10750,11 @@
1075010750
\begin{itemdecl}
1075110751
namespace ranges {
1075210752
template<@\libconcept{input_iterator}@ I, @\libconcept{sentinel_for}@<I> S1,
10753-
@\placeholdernc{nothrow-forward-iterator}@ O, @\placeholder{nothrow-sentinel-for}@<O> S2>
10753+
@\exposconcept{nothrow-forward-iterator}@ O, @\exposconcept{nothrow-sentinel-for}@<O> S2>
1075410754
requires @\libconcept{constructible_from}@<iter_value_t<O>, iter_rvalue_reference_t<I>>
1075510755
uninitialized_move_result<I, O>
1075610756
uninitialized_move(I ifirst, S1 ilast, O ofirst, S2 olast);
10757-
template<@\libconcept{input_range}@ IR, @\placeholdernc{nothrow-forward-range}@ OR>
10757+
template<@\libconcept{input_range}@ IR, @\exposconcept{nothrow-forward-range}@ OR>
1075810758
requires @\libconcept{constructible_from}@<range_value_t<OR>, range_rvalue_reference_t<IR>>
1075910759
uninitialized_move_result<borrowed_iterator_t<IR>, borrowed_iterator_t<OR>>
1076010760
uninitialized_move(IR&& in_range, OR&& out_range);
@@ -10809,7 +10809,7 @@
1080910809
\indexlibraryglobal{uninitialized_move_n}%
1081010810
\begin{itemdecl}
1081110811
namespace ranges {
10812-
template<@\libconcept{input_iterator}@ I, @\placeholdernc{nothrow-forward-iterator}@ O, @\placeholder{nothrow-sentinel-for}@<O> S>
10812+
template<@\libconcept{input_iterator}@ I, @\exposconcept{nothrow-forward-iterator}@ O, @\exposconcept{nothrow-sentinel-for}@<O> S>
1081310813
requires @\libconcept{constructible_from}@<iter_value_t<O>, iter_rvalue_reference_t<I>>
1081410814
uninitialized_move_n_result<I, O>
1081510815
uninitialized_move_n(I ifirst, iter_difference_t<I> n, O ofirst, S olast);
@@ -10860,10 +10860,10 @@
1086010860
\indexlibraryglobal{uninitialized_fill}%
1086110861
\begin{itemdecl}
1086210862
namespace ranges {
10863-
template<@\placeholdernc{nothrow-forward-iterator}@ I, @\placeholder{nothrow-sentinel-for}@<I> S, class T>
10863+
template<@\exposconcept{nothrow-forward-iterator}@ I, @\exposconcept{nothrow-sentinel-for}@<I> S, class T>
1086410864
requires @\libconcept{constructible_from}@<iter_value_t<I>, const T&>
1086510865
I uninitialized_fill(I first, S last, const T& x);
10866-
template<@\placeholdernc{nothrow-forward-range}@ R, class T>
10866+
template<@\exposconcept{nothrow-forward-range}@ R, class T>
1086710867
requires @\libconcept{constructible_from}@<range_value_t<R>, const T&>
1086810868
borrowed_iterator_t<R> uninitialized_fill(R&& r, const T& x);
1086910869
}
@@ -10901,7 +10901,7 @@
1090110901
\indexlibraryglobal{uninitialized_fill_n}%
1090210902
\begin{itemdecl}
1090310903
namespace ranges {
10904-
template<@\placeholdernc{nothrow-forward-iterator}@ I, class T>
10904+
template<@\exposconcept{nothrow-forward-iterator}@ I, class T>
1090510905
requires @\libconcept{constructible_from}@<iter_value_t<I>, const T&>
1090610906
I uninitialized_fill_n(I first, iter_difference_t<I> n, const T& x);
1090710907
}
@@ -10985,10 +10985,10 @@
1098510985
\indexlibraryglobal{destroy}%
1098610986
\begin{itemdecl}
1098710987
namespace ranges {
10988-
template<@\placeholdernc{nothrow-input-iterator}@ I, @\placeholder{nothrow-sentinel-for}@<I> S>
10988+
template<@\exposconcept{nothrow-input-iterator}@ I, @\exposconcept{nothrow-sentinel-for}@<I> S>
1098910989
requires @\libconcept{destructible}@<iter_value_t<I>>
1099010990
constexpr I destroy(I first, S last) noexcept;
10991-
template<@\placeholdernc{nothrow-input-range}@ R>
10991+
template<@\exposconcept{nothrow-input-range}@ R>
1099210992
requires @\libconcept{destructible}@<range_value_t<R>>
1099310993
constexpr borrowed_iterator_t<R> destroy(R&& r) noexcept;
1099410994
}
@@ -11025,7 +11025,7 @@
1102511025
\indexlibraryglobal{destroy_n}%
1102611026
\begin{itemdecl}
1102711027
namespace ranges {
11028-
template<@\placeholdernc{nothrow-input-iterator}@ I>
11028+
template<@\exposconcept{nothrow-input-iterator}@ I>
1102911029
requires @\libconcept{destructible}@<iter_value_t<I>>
1103011030
constexpr I destroy_n(I first, iter_difference_t<I> n) noexcept;
1103111031
}

source/iterators.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1242,7 +1242,7 @@
12421242
\begin{codeblock}
12431243
template<class In>
12441244
concept @\deflibconcept{indirectly_readable}@ =
1245-
@\placeholdernc{indirectly-readable-impl}@<remove_cvref_t<In>>;
1245+
@\exposconcept{indirectly-readable-impl}@<remove_cvref_t<In>>;
12461246
\end{codeblock}
12471247

12481248
\pnum

0 commit comments

Comments
 (0)