Skip to content

Commit 57beb7e

Browse files
author
Stefanus Du Toit
committed
Editorial changes from review to Core changes by Mike Miller.
1 parent 26ad058 commit 57beb7e

4 files changed

Lines changed: 14 additions & 11 deletions

File tree

source/basic.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1388,8 +1388,8 @@
13881388
When the \grammarterm{postfix-expression} in
13891389
a function call~(\ref{expr.call}) is an \grammarterm{unqualified-id}, other namespaces not considered
13901390
during the usual unqualified lookup~(\ref{basic.lookup.unqual}) may be
1391-
searched, and in those namespaces, namespace-scope friend or function
1392-
template function declarations~(\ref{class.friend}) not otherwise
1391+
searched, and in those namespaces, namespace-scope friend function or function
1392+
function template declarations~(\ref{class.friend}) not otherwise
13931393
visible may be found.
13941394
These modifications to the search depend on the types of the arguments
13951395
(and for template template arguments, the namespace of the template

source/exceptions.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
associated with a point previously passed by the execution.
1414
A handler will be invoked only by throwing an exception
1515
in code executed in the handler's try block
16-
or in functions called from the handler's try block .
16+
or in functions called from the handler's try block.
1717

1818
\indextext{\idxcode{try}}%
1919
%
@@ -1032,13 +1032,13 @@
10321032
\tcode{f}
10331033
has the \grammarterm{exception-specification} \tcode{noexcept(true)} if every function it directly invokes allows no
10341034
exceptions.
1035-
\enternote An instantiation of an inheriting constructor template has
1036-
an implied \grammarterm{exception-specification} as if it were a non-template
1037-
inheriting constructor.\exitnote
10381035
\enternote It follows that \tcode{f} has the
10391036
\grammarterm{exception-specification} \tcode{noexcept(true)} if it
10401037
invokes no other functions.
10411038
\exitnote
1039+
\enternote An instantiation of an inheriting constructor template has
1040+
an implied \grammarterm{exception-specification} as if it were a non-template
1041+
inheriting constructor.\exitnote
10421042
\enterexample
10431043
\begin{codeblock}
10441044
struct A {

source/expressions.tex

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1615,7 +1615,8 @@
16151615
\tcode{(*p)}, \tcode{*(p)}, \tcode{((*p))}, \tcode{*((p))}, and so on
16161616
all meet this requirement.}
16171617
and the pointer is a null pointer value~(\ref{conv.ptr}), the
1618-
\tcode{typeid} expression throws the
1618+
\tcode{typeid} expression throws an exception~(\ref{except.throw}) of
1619+
a type that would match a handler of type
16191620
\indextext{\idxcode{bad_typeid}}%
16201621
\indexlibrary{\idxcode{bad_typeid}}%
16211622
\tcode{std::bad_typeid}
@@ -1725,7 +1726,7 @@
17251726
the result refers to the object or the specified base class subobject
17261727
thereof; otherwise, the lvalue-to-rvalue conversion~(\ref{conv.lval})
17271728
is applied to the bit-field and the resulting prvalue is used as the
1728-
expression of the \tcode{static_cast} for the remainder of this section.
1729+
\grammarterm{expression} of the \tcode{static_cast} for the remainder of this section.
17291730
If \tcode{T2} is an inaccessible (Clause~\ref{class.access}) or
17301731
ambiguous~(\ref{class.member.lookup}) base class of \tcode{T1},
17311732
a program that necessitates such a cast is ill-formed.
@@ -3484,7 +3485,7 @@
34843485
is $\mathrm{E1}\times2^\mathrm{E2}$, reduced modulo
34853486
one more than the maximum value representable in the result type. Otherwise, if
34863487
\tcode{E1} has a signed type and non-negative value, and $\mathrm{E1}\times2^\mathrm{E2}$ is
3487-
representable in corresponding unsigned type of the result type, then
3488+
representable in the corresponding unsigned type of the result type, then
34883489
that value, converted to the result type, is the resulting value; otherwise, the
34893490
behavior is undefined.
34903491

@@ -4327,6 +4328,8 @@
43274328
as integral or enumeration non-type template
43284329
arguments~(\ref{temp.arg}).
43294330
\exitnote
4331+
4332+
\pnum
43304333
A \term{literal constant expression} is a prvalue core constant
43314334
expression of literal type, but not pointer type (after conversions as
43324335
required by the context). For a literal constant expression of array

source/special.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -467,8 +467,8 @@
467467
a default argument is sequenced before the construction of the next array element, if any.
468468

469469
\pnum
470-
The second context is when a reference is bound to a temporary.
471-
\footnote{The same rules apply to initialization of an
470+
The second context is when a reference is bound to a
471+
temporary.\footnote{The same rules apply to initialization of an
472472
\tcode{initializer_list} object~(\ref{dcl.init.list}) with its
473473
underlying temporary array}
474474
The temporary to which the reference is bound or the temporary

0 commit comments

Comments
 (0)