Skip to content

Commit f54f306

Browse files
authored
[func.bind] Remove bogus 'shall's. (#2955)
1 parent da7eac5 commit f54f306

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

source/utilities.tex

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15345,11 +15345,11 @@
1534515345
uses \tcode{is_bind_expression} to detect subexpressions.
1534615346

1534715347
\pnum
15348-
Instantiations of the \tcode{is_bind_expression} template shall meet
15348+
Specializations of the \tcode{is_bind_expression} template shall meet
1534915349
the \oldconcept{UnaryTypeTrait} requirements\iref{meta.rqmts}. The implementation
15350-
shall provide a definition that has a base characteristic of
15350+
provides a definition that has a base characteristic of
1535115351
\tcode{true_type} if \tcode{T} is a type returned from \tcode{bind},
15352-
otherwise it shall have a base characteristic of \tcode{false_type}.
15352+
otherwise it has a base characteristic of \tcode{false_type}.
1535315353
A program may specialize this template for a program-defined type \tcode{T}
1535415354
to have a base characteristic of \tcode{true_type} to indicate that
1535515355
\tcode{T} should be treated as a subexpression in a \tcode{bind} call.
@@ -15369,11 +15369,11 @@
1536915369
\tcode{is_placeholder} to detect placeholders.
1537015370

1537115371
\pnum
15372-
Instantiations of the \tcode{is_placeholder} template shall meet
15372+
Specializations of the \tcode{is_placeholder} template shall meet
1537315373
the \oldconcept{UnaryTypeTrait} requirements\iref{meta.rqmts}. The implementation
15374-
shall provide a definition that has the base characteristic of
15374+
provides a definition that has the base characteristic of
1537515375
\tcode{integral_constant<int, \placeholder{J}>} if \tcode{T} is the type of
15376-
\tcode{std::placeholders::_\placeholder{J}}, otherwise it shall have a
15376+
\tcode{std::placeholders::_\placeholder{J}}, otherwise it has a
1537715377
base characteristic of \tcode{integral_constant<int, 0>}. A program
1537815378
may specialize this template for a program-defined type \tcode{T} to
1537915379
have a base characteristic of \tcode{integral_constant<int, N>}
@@ -15418,14 +15418,14 @@
1541815418

1541915419
\pnum\returns
1542015420
An argument forwarding call wrapper \tcode{g}\iref{func.require}.
15421-
The effect of \tcode{g($\tcode{u}_1$, $\tcode{u}_2$, $\dotsc$, $\tcode{u}_M$)} shall
15422-
be
15421+
The effect of \tcode{g($\tcode{u}_1$, $\tcode{u}_2$, $\dotsc$, $\tcode{u}_M$)}
15422+
is
1542315423
\begin{codeblock}
1542415424
@\placeholdernc{INVOKE}@(fd, std::forward<@$\tcode{V}_1$@>(@$\tcode{v}_1$@), std::forward<@$\tcode{V}_2$@>(@$\tcode{v}_2$@), @$\dotsc$@, std::forward<@$\tcode{V}_N$@>(@$\tcode{v}_N$@))
1542515425
\end{codeblock}
1542615426
where the values and types of the bound
1542715427
arguments $\tcode{v}_1$, $\tcode{v}_2$, $\dotsc$, $\tcode{v}_N$ are determined as specified below.
15428-
The copy constructor and move constructor of the argument forwarding call wrapper shall throw an
15428+
The copy constructor and move constructor of the argument forwarding call wrapper throw an
1542915429
exception if and only if the corresponding constructor of \tcode{FD} or of any of the types
1543015430
$\tcode{TD}_i$ throws an exception.
1543115431

@@ -15434,9 +15434,9 @@
1543415434
\tcode{fd} or of one of the values $\tcode{td}_i$ throws an exception.
1543515435

1543615436
\pnum
15437-
\remarks The return type shall meet the \oldconcept{MoveConstructible} requirements. If all
15437+
\remarks The return type meets the \oldconcept{MoveConstructible} requirements. If all
1543815438
of \tcode{FD} and $\tcode{TD}_i$ meet the \oldconcept{CopyConstructible} requirements, then the
15439-
return type shall meet the \oldconcept{CopyConstructible} requirements. \begin{note} This implies
15439+
return type meets the \oldconcept{CopyConstructible} requirements. \begin{note} This implies
1544015440
that all of \tcode{FD} and $\tcode{TD}_i$ are \oldconcept{MoveConst\-ruct\-ible}. \end{note}
1544115441
\end{itemdescr}
1544215442

@@ -15462,13 +15462,13 @@
1546215462
\returns
1546315463
An argument forwarding call wrapper \tcode{g}\iref{func.require}.
1546415464
The effect of
15465-
\tcode{g($\tcode{u}_1$, $\tcode{u}_2$, $\dotsc$, $\tcode{u}_M$)} shall be
15465+
\tcode{g($\tcode{u}_1$, $\tcode{u}_2$, $\dotsc$, $\tcode{u}_M$)} is
1546615466
\begin{codeblock}
1546715467
@\placeholdernc{INVOKE}@<R>(fd, std::forward<@$\tcode{V}_1$@>(@$\tcode{v}_1$@), std::forward<@$\tcode{V}_2$@>(@$\tcode{v}_2$@), @$\dotsc$@, std::forward<@$\tcode{V}_N$@>(@$\tcode{v}_N$@))
1546815468
\end{codeblock}
1546915469
where the values and types of the bound
1547015470
arguments $\tcode{v}_1$, $\tcode{v}_2$, $\dotsc$, $\tcode{v}_N$ are determined as specified below.
15471-
The copy constructor and move constructor of the argument forwarding call wrapper shall throw an
15471+
The copy constructor and move constructor of the argument forwarding call wrapper throw an
1547215472
exception if and only if the corresponding constructor of \tcode{FD} or of any of the types
1547315473
$\tcode{TD}_i$ throws an exception.
1547415474

@@ -15477,9 +15477,9 @@
1547715477
\tcode{fd} or of one of the values $\tcode{td}_i$ throws an exception.
1547815478

1547915479
\pnum
15480-
\remarks The return type shall meet the \oldconcept{MoveConstructible} requirements. If all
15480+
\remarks The return type meets the \oldconcept{MoveConstructible} requirements. If all
1548115481
of \tcode{FD} and $\tcode{TD}_i$ meet the \oldconcept{CopyConstructible} requirements, then the
15482-
return type shall meet the \oldconcept{CopyConstructible} requirements. \begin{note} This implies
15482+
return type meets the \oldconcept{CopyConstructible} requirements. \begin{note} This implies
1548315483
that all of \tcode{FD} and $\tcode{TD}_i$ are \oldconcept{MoveConst\-ruct\-ible}. \end{note}
1548415484
\end{itemdescr}
1548515485

0 commit comments

Comments
 (0)