Skip to content

Commit f77a2b2

Browse files
jensmaurerzygoloid
authored andcommitted
Define 'object type' only once. (#1268)
There were only a few references to the definition in 1.8 [intro.object], so drop that definition and refer to 'type of an object' instead. Fixes #511.
1 parent 9e92aa3 commit f77a2b2

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

source/basic.tex

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@
391391
\item an object of type \tcode{T} is defined~(\ref{basic.def}), or
392392
\item a non-static class data member of type \tcode{T} is
393393
declared~(\ref{class.mem}), or
394-
\item \tcode{T} is used as the object type or array element type in a
394+
\item \tcode{T} is used as the allocated type or array element type in a
395395
\grammarterm{new-expression}~(\ref{expr.new}), or
396396
\item an lvalue-to-rvalue conversion is applied to
397397
a glvalue referring
@@ -3596,7 +3596,6 @@
35963596
contexts incomplete types are prohibited. \end{note}
35973597

35983598
\pnum
3599-
\indextext{object type}%
36003599
An \defn{object type} is a (possibly cv-qualified) type that is not
36013600
a function type, not a reference type, and not \cv{}~\tcode{void}.
36023601

@@ -4060,8 +4059,8 @@
40604059
\tcode{void}~(\ref{basic.types}) has three corresponding cv-qualified
40614060
versions of its type: a \defn{const-qualified} version, a
40624061
\defn{volatile-qualified} version, and a
4063-
\defn{const-volatile-qualified} version. The term
4064-
\term{object type}~(\ref{intro.object}) includes the cv-qualifiers
4062+
\defn{const-volatile-qualified} version. The
4063+
type of an object~(\ref{intro.object}) includes the \grammarterm{cv-qualifier}{s}
40654064
specified in the \grammarterm{decl-specifier-seq}~(\ref{dcl.spec}),
40664065
\grammarterm{declarator} (Clause~\ref{dcl.decl}),
40674066
\grammarterm{type-id}~(\ref{dcl.name}), or

source/intro.tex

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -554,8 +554,7 @@
554554
name~(Clause~\ref{basic}). An object has a storage
555555
duration~(\ref{basic.stc}) which influences its
556556
lifetime~(\ref{basic.life}). An object has a
557-
type~(\ref{basic.types}). The term \defn{object type} refers to
558-
the type with which the object is created.
557+
type~(\ref{basic.types}).
559558
Some objects are
560559
polymorphic~(\ref{class.virtual}); the implementation
561560
generates information associated with each such object that makes it

0 commit comments

Comments
 (0)