Skip to content

Commit 9dc7b3f

Browse files
AlisdairMtkoeppe
authored andcommitted
[basic.stc.inherit] Dissolve paragraph into [...general]
The whole subclause [basic.stc.inherit] is a single sentence that belongs adjacent to the material in [basic.std.general] that specifies how entities acquire a storage duration, wheras all the remaining subclauses below [basic.stc] describe specific storage durations. Folding that sentence directly into the general clause is even clearer.
1 parent 6ba0dc9 commit 9dc7b3f

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

source/basic.tex

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3911,6 +3911,12 @@
39113911
\pnum
39123912
The storage duration categories apply to references as well.
39133913

3914+
\pnum
3915+
\indextext{storage duration!class member}%
3916+
The storage duration of subobjects and reference members
3917+
is that of their complete object\iref{intro.object}.
3918+
\indextext{storage duration|)}%
3919+
39143920
\rSec3[basic.stc.static]{Static storage duration}
39153921

39163922
\pnum
@@ -4243,14 +4249,6 @@
42434249
deallocation function shall deallocate the storage referenced by the
42444250
pointer, ending the duration of the region of storage.
42454251

4246-
\rSec3[basic.stc.inherit]{Duration of subobjects}
4247-
4248-
\pnum
4249-
\indextext{storage duration!class member}%
4250-
The storage duration of subobjects and reference members
4251-
is that of their complete object\iref{intro.object}.
4252-
\indextext{storage duration|)}%
4253-
42544252
\rSec2[basic.align]{Alignment}
42554253

42564254
\pnum

source/xrefdelta.tex

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@
9595
\movedxref{stoptoken.cons}{stopsource}
9696
\movedxref{stoptoken.nonmembers}{stopsource}
9797

98+
% https://github.com/cplusplus/draft/pull/7345
99+
\movedxref{basic.stc.inherit}{basic.stc.general}
100+
98101
%%% Deprecated features.
99102
%%% Example:
100103
%

0 commit comments

Comments
 (0)