Skip to content

Commit 04fa63d

Browse files
jensmaurerzygoloid
authored andcommitted
Use 'base class subobject', not 'base subobject' (#1382)
Fixes #1379.
1 parent 73e107a commit 04fa63d

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

source/derived.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@
281281
{figvirt.pdf}
282282
\end{importgraphic}
283283
For an object \tcode{c} of class type \tcode{C}, a single subobject of
284-
type \tcode{V} is shared by every base subobject of \tcode{c} that has a
284+
type \tcode{V} is shared by every base class subobject of \tcode{c} that has a
285285
\tcode{virtual} base class of type \tcode{V}. Given the class \tcode{C}
286286
defined above, an object of class \tcode{C} will have one subobject of
287287
class \tcode{V}, as shown in Figure~\ref{fig:virt}.
@@ -418,7 +418,7 @@
418418
\end{codeblock}
419419

420420
$S(x,F)$ is unambiguous because the \tcode{A} and \tcode{B} base
421-
subobjects of \tcode{D} are also base subobjects of \tcode{E}, so
421+
class subobjects of \tcode{D} are also base class subobjects of \tcode{E}, so
422422
$S(x,D)$ is discarded in the first merge step.
423423
\end{example}
424424

source/iostreams.tex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1465,7 +1465,7 @@
14651465
If the function fails\footnote{for example, because it cannot allocate space.}
14661466
and
14671467
\tcode{*this}
1468-
is a base subobject of a
1468+
is a base class subobject of a
14691469
\tcode{basic_ios<>}
14701470
object or subobject, the effect is equivalent to calling
14711471
\tcode{basic_ios<>::setstate(badbit)}
@@ -1509,7 +1509,7 @@
15091509
If the function fails\footnote{for example, because it cannot allocate space.}
15101510
and
15111511
\tcode{*this}
1512-
is a base subobject of a
1512+
is a base class subobject of a
15131513
\tcode{basic_ios<>}
15141514
object or subobject, the effect is equivalent to calling
15151515
\tcode{basic_ios<>::setstate(badbit)}
@@ -6278,7 +6278,7 @@
62786278
interface to iostreams, since for flexibility it has been abstracted
62796279
away from direct dependence on
62806280
\tcode{ostream}.
6281-
The second parameter is a reference to the base subobject of type
6281+
The second parameter is a reference to the base class subobject of type
62826282
\tcode{ios_base}.
62836283
It provides formatting specifications such as field width, and
62846284
a locale from which to obtain other facets.

source/special.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1581,7 +1581,7 @@
15811581

15821582
\pnum
15831583
In the definition of a constructor for a class,
1584-
initializers for direct and virtual base subobjects and
1584+
initializers for direct and virtual base class subobjects and
15851585
non-static data members can be specified by a
15861586
\grammarterm{ctor-initializer},
15871587
which has the form

0 commit comments

Comments
 (0)