Skip to content

Commit

Permalink
Wording improvements from review
Browse files Browse the repository at this point in the history
Co-authored-by: Jens Maurer <[email protected]>
  • Loading branch information
tkoeppe and jensmaurer authored Jan 15, 2024
1 parent 41bba23 commit 376f272
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
5 changes: 2 additions & 3 deletions source/classes.tex
Original file line number Diff line number Diff line change
Expand Up @@ -1434,7 +1434,7 @@
X(X&); // copy constructor with a non-const parameter
};
const X cx;
X x = cx; // error: \tcode{X::X(X\&)} unable copy \tcode{cx} into \tcode{x}
X x = cx; // error: \tcode{X::X(X\&)} unable to copy \tcode{cx} into \tcode{x}
\end{codeblock}
\end{example}
\end{note}
Expand Down Expand Up @@ -6261,8 +6261,7 @@
of constructors and destructors for the object declared by the
\grammarterm{exception-declaration}.
\begin{note}
Since the exception object is always an lvalue,
it is never moved from, which would potentially be incorrect.
The exception object is always an lvalue, thus it is not implicitly moved from."
\end{note}
\end{itemize}
Copy elision is not permitted
Expand Down
4 changes: 2 additions & 2 deletions source/expressions.tex
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,14 @@
that result is then added to 5 which results in the value assigned to
\tcode{a}. On a machine in which overflows produce an exception and in
which the range of values representable by an \tcode{int} is
\crange{-32768}{+32767}, a valid implementation avoids rewriting this
\crange{-32768}{+32767}, an implementation is precluded from rewriting this
expression as
\begin{codeblock}
a = ((a + b) + 32765);
\end{codeblock}
since if the values for \tcode{a} and \tcode{b} were, respectively,
$-32754$ and $-15$, the sum \tcode{a + b} would produce an exception while
the original expression would not; similarly, it avoids rewriting the expression
the original expression would not; similarly, it is precluded from rewriting the expression
as either
\begin{codeblock}
a = ((a + 32765) + b);
Expand Down
2 changes: 1 addition & 1 deletion source/locales.tex
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@
\begin{note}
Because facets are used by iostreams,
potentially while static constructors are running,
their initialization would be unreliable if it depended on programmed static initialization.
it is not possible for their initialization to depend on programmed static initialization.
One initialization strategy is for \tcode{locale}
to initialize each facet's \tcode{id} member
the first time an instance of the facet is installed into a locale.
Expand Down
2 changes: 1 addition & 1 deletion source/statements.tex
Original file line number Diff line number Diff line change
Expand Up @@ -1044,7 +1044,7 @@
being initialized, the concurrent execution shall wait for completion
of the initialization.
\begin{note}
A conforming implementation avoids introducing
A conforming implementation never introduces
any deadlock around execution of the initializer.
Deadlocks might still be caused by the program logic;
the implementation need only avoid deadlocks
Expand Down

0 comments on commit 376f272

Please sign in to comment.