Skip to content

Commit 3fe46c7

Browse files
jwakelyzygoloid
authored andcommitted
[class] Reformat paragraph defining standard-layout class
Move the note before the definition of M(X). Use a nested list for the definition of M(X). Move the example to a new paragraph.
1 parent 0cac487 commit 3fe46c7

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

source/classes.tex

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -166,14 +166,15 @@
166166
\item has all non-static data members and bit-fields in the class and
167167
its base classes first declared in the same class, and
168168

169-
\item has no element of the set $M(\mathtt{S})$ of types (defined below)
170-
as a base class.\footnote{This ensures that two subobjects that have the
171-
same class type and that
169+
\item has no element of the set $M(\mathtt{S})$ of types
170+
as a base class,
171+
where for any type \tcode{X}, $M(\mathtt{X})$ is defined as follows.\footnote{
172+
This ensures that two subobjects that have the same class type and that
172173
belong to the same most derived object are not allocated at the same
173174
address\iref{expr.eq}.}
174-
\end{itemize}
175+
\begin{note} $M(\mathtt{X})$ is the set of the types of all non-base-class subobjects
176+
that may be at a zero offset in \tcode{X}. \end{note}
175177

176-
$M(\mathtt{X})$ is defined as follows:
177178
\begin{itemize}
178179
\item If \tcode{X} is a non-union class type with no (possibly
179180
inherited\iref{class.derived}) non-static data members, the set
@@ -198,10 +199,9 @@
198199

199200
\item If \tcode{X} is a non-class, non-array type, the set $M(\mathtt{X})$ is empty.
200201
\end{itemize}
202+
\end{itemize}
201203

202-
\begin{note} $M(\mathtt{X})$ is the set of the types of all non-base-class subobjects
203-
that may be at a zero offset in \tcode{X}. \end{note}
204-
204+
\pnum
205205
\begin{example}
206206
\begin{codeblock}
207207
struct B { int i; }; // standard-layout class

0 commit comments

Comments
 (0)