Skip to content

Commit 43fc5a1

Browse files
committed
[std] Reword "necessary", "permitted", "allowed", "may" in notes.
This is so that notes do not (inappropriately) state requirements or permissions.
1 parent 29c0e48 commit 43fc5a1

File tree

10 files changed

+24
-25
lines changed

10 files changed

+24
-25
lines changed

source/basic.tex

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6202,15 +6202,15 @@
62026202
The ``inter-thread happens before'' relation describes arbitrary
62036203
concatenations of ``sequenced before'', ``synchronizes with'' and
62046204
``dependency-ordered before'' relationships, with two exceptions. The first
6205-
exception is that a concatenation is not permitted to end with
6205+
exception is that a concatenation never ends with
62066206
``dependency-ordered before'' followed by ``sequenced before''. The reason for
62076207
this limitation is that a consume operation participating in a
62086208
``dependency-ordered before'' relationship provides ordering only with respect
62096209
to operations to which this consume operation actually carries a dependency. The
62106210
reason that this limitation applies only to the end of such a concatenation is
62116211
that any subsequent release operation will provide the required ordering for a
6212-
prior consume operation. The second exception is that a concatenation is not
6213-
permitted to consist entirely of ``sequenced before''. The reasons for this
6212+
prior consume operation. The second exception is that a concatenation never
6213+
consist entirely of ``sequenced before''. The reasons for this
62146214
limitation are (1) to permit ``inter-thread happens before'' to be transitively
62156215
closed and (2) the ``happens before'' relation, defined below, provides for
62166216
relationships consisting entirely of ``sequenced before''.
@@ -6290,7 +6290,7 @@
62906290
\begin{note}
62916291
This states that operations on
62926292
ordinary objects are not visibly reordered. This is not actually detectable
6293-
without data races, but it is necessary to ensure that data races, as defined
6293+
without data races, but is needed to ensure that data races, as defined
62946294
below, and with suitable restrictions on the use of atomics, correspond to data
62956295
races in a simple interleaved (sequentially consistent) execution.
62966296
\end{note}
@@ -6401,7 +6401,7 @@
64016401
However, this applies only to data-race-free programs, and data-race-free
64026402
programs cannot observe most program transformations that do not change
64036403
single-threaded program semantics. In fact, most single-threaded program
6404-
transformations continue to be allowed, since any program that behaves
6404+
transformations remain possible, since any program that behaves
64056405
differently as a result has undefined behavior.
64066406
\end{note}
64076407

@@ -6538,7 +6538,7 @@
65386538
the implementation ensures that the thread will eventually make progress for as
65396539
long as it has not terminated.
65406540
\begin{note}
6541-
This is regardless of whether or not other threads of execution (if any)
6541+
This applies regardless of whether or not other threads of execution (if any)
65426542
have been or are making progress. To eventually fulfill this requirement means that
65436543
this will happen in an unspecified but finite amount of time.
65446544
\end{note}

source/classes.tex

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3074,8 +3074,7 @@
30743074
structs that share a common initial sequence\iref{class.mem}, and
30753075
if a non-static data member of an object of this standard-layout union type
30763076
is active and is one of the standard-layout structs,
3077-
it is permitted to inspect the common initial sequence
3078-
of any of the standard-layout struct members;
3077+
the common initial sequence of any of the standard-layout struct members can be inspected;
30793078
see~\ref{class.mem}.
30803079
\end{note}
30813080

source/declarations.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1558,7 +1558,7 @@
15581558
\begin{codeblock}
15591559
friend class T;
15601560
\end{codeblock}
1561-
is ill-formed. However, the similar declaration \tcode{friend T;} is allowed\iref{class.friend}.
1561+
is ill-formed. However, the similar declaration \tcode{friend T;} is well-formed.\iref{class.friend}.
15621562
\end{note}
15631563

15641564
\pnum
@@ -4684,7 +4684,7 @@
46844684
\tcode{X}.
46854685
The form
46864686
\tcode{()}
4687-
is permitted in certain other initialization contexts\iref{expr.new,
4687+
can appear in certain other initialization contexts\iref{expr.new,
46884688
expr.type.conv,class.base.init}.
46894689
\end{note}
46904690

@@ -4752,7 +4752,7 @@
47524752
is sequenced before those associated with the initialization of $e_j$.
47534753
\begin{note}
47544754
By contrast with direct-list-initialization,
4755-
narrowing conversions\iref{dcl.init.list} are permitted,
4755+
narrowing conversions\iref{dcl.init.list} can appear,
47564756
designators are not permitted,
47574757
a temporary object bound to a reference
47584758
does not have its lifetime extended\iref{class.temporary}, and
@@ -9332,7 +9332,7 @@
93329332
If a function \tcode{f} is called where \tcode{f} was previously declared with the \tcode{noreturn}
93339333
attribute and \tcode{f} eventually returns, the behavior is undefined.
93349334
\begin{note}
9335-
The function may
9335+
The function can
93369336
terminate by throwing an exception.
93379337
\end{note}
93389338

source/expressions.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6080,7 +6080,7 @@
60806080
inheritance relationship between the two classes.
60816081
\begin{note}
60826082
For example, if the classes were defined later in the translation unit,
6083-
a multi-pass compiler would be permitted to interpret a cast between
6083+
a multi-pass compiler could validly interpret a cast between
60846084
pointers to the classes as if the class types were complete at the point
60856085
of the cast.
60866086
\end{note}

source/iostreams.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13839,8 +13839,8 @@
1383913839
\begin{note}
1384013840
Some operating systems have no unambiguous way to distinguish between native format and generic format arguments.
1384113841
This is by design as it simplifies use for operating systems that do not require
13842-
disambiguation. An implementation for an operating system where disambiguation
13843-
is required is permitted to distinguish between the formats.
13842+
disambiguation. It is possible that an implementation for an operating system
13843+
where disambiguation is needed distinguishes between the formats.
1384413844
\end{note}
1384513845

1384613846
\pnum

source/lib-intro.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3605,8 +3605,8 @@
36053605
provided by an implementation.
36063606
\begin{note}
36073607
In particular,
3608-
an implementation is not allowed to provide
3609-
an additional declaration of that function or function template
3608+
a conforming implementation does not provide
3609+
any additional declarations of that function or function template
36103610
at namespace scope.
36113611
\end{note}
36123612
\begin{note}

source/numerics.tex

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9472,7 +9472,8 @@
94729472
if \tcode{X} cannot be converted to \tcode{int}
94739473
by integral promotion\iref{conv.prom}, the program is ill-formed.
94749474
\begin{note}
9475-
Arguments that can be promoted to \tcode{int} are permitted for compatibility with C.
9475+
Allowing arguments that can be promoted to \tcode{int}
9476+
provides compatibility with C.
94769477
\end{note}
94779478
\end{itemdescr}
94789479

source/overloading.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2141,8 +2141,8 @@
21412141
or when converting to the left operand of an assignment operation
21422142
only standard conversion sequences are allowed.
21432143
\begin{note}
2144-
When converting to the explicit object parameter, if any,
2145-
user-defined conversion sequences are allowed.
2144+
When a conversion to the explicit object parameter occurs,
2145+
it can include user-defined conversion sequences.
21462146
\end{note}
21472147

21482148
\pnum

source/support.tex

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3915,10 +3915,9 @@
39153915
returns an \tcode{exception_ptr} object that refers to the thrown exception or,
39163916
if this is not possible, to an instance of \tcode{bad_exception}.
39173917
\begin{note}
3918-
The
3919-
copy constructor of the thrown exception can also fail, so the implementation is allowed
3920-
to substitute a \tcode{bad_exception} object to avoid infinite
3921-
recursion.
3918+
The copy constructor of the thrown exception can also fail,
3919+
so the implementation can substitute a \tcode{bad_exception} object
3920+
to avoid infinite recursion.
39223921
\end{note}
39233922
\end{itemdescr}
39243923

source/templates.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@
769769
\keyword{typename}
770770
prefix, the
771771
\keyword{template}
772-
prefix is allowed
772+
prefix is well-formed
773773
even when lookup for the name would already find a template.
774774
\end{note}
775775
\begin{example}

0 commit comments

Comments
 (0)