Skip to content

Commit 5d129b2

Browse files
jensmaurertkoeppe
authored andcommitted
[dcl.array], [temp.deduct.type] Split notes spanning numbered paragraphs. (#1261)
Partially addresses #781.
1 parent 3750b23 commit 5d129b2

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

source/declarators.tex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,7 +1138,7 @@
11381138
in such a way that
11391139
\tcode{E1[E2]}
11401140
is identical to
1141-
\tcode{*((E1)+(E2))}.
1141+
\tcode{*((E1)+(E2))}~(\ref{expr.sub}).
11421142
Because of the conversion rules
11431143
that apply to
11441144
\tcode{+},
@@ -1156,8 +1156,10 @@
11561156
Therefore,
11571157
despite its asymmetric
11581158
appearance, subscripting is a commutative operation.
1159+
\end{note}
11591160

11601161
\pnum
1162+
\begin{note}
11611163
A consistent rule is followed for
11621164
\indextext{array!multidimensional}%
11631165
multidimensional arrays.
@@ -1183,8 +1185,6 @@
11831185
is applied to this pointer,
11841186
the result is the pointed-to $(n-1)$-dimensional array,
11851187
which itself is immediately converted into a pointer.
1186-
1187-
\pnum
11881188
\begin{example}
11891189
consider
11901190

source/templates.tex

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7284,8 +7284,10 @@
72847284
f3(v); // OK: \tcode{i} deduced to be \tcode{10}
72857285
}
72867286
\end{codeblock}
7287+
\end{note}
72877288

72887289
\pnum
7290+
\begin{note}
72897291
If, in the declaration of a function template with a non-type
72907292
template parameter, the non-type template parameter
72917293
is used in a subexpression in the function parameter list,
@@ -7305,6 +7307,8 @@
73057307
\end{codeblock}
73067308
\end{example}
73077309
\end{note}
7310+
7311+
\pnum
73087312
\begin{note}
73097313
Template parameters do not participate in template argument deduction if
73107314
they are used only in non-deduced contexts.

0 commit comments

Comments
 (0)