From 66e3b8f45e8ff49fbd47745d291e75f075ed688f Mon Sep 17 00:00:00 2001 From: Alisdair Meredith Date: Tue, 22 Oct 2024 17:12:25 -0400 Subject: [PATCH] [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. --- source/basic.tex | 14 ++++++-------- source/xrefdelta.tex | 3 +++ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/source/basic.tex b/source/basic.tex index 9524265f81..fa7c65657c 100644 --- a/source/basic.tex +++ b/source/basic.tex @@ -3912,6 +3912,12 @@ \pnum The storage duration categories apply to references as well. +\pnum +\indextext{storage duration!class member}% +The storage duration of subobjects and reference members +is that of their complete object\iref{intro.object}. +\indextext{storage duration|)}% + \rSec3[basic.stc.static]{Static storage duration} \pnum @@ -4244,14 +4250,6 @@ deallocation function shall deallocate the storage referenced by the pointer, ending the duration of the region of storage. -\rSec3[basic.stc.inherit]{Duration of subobjects} - -\pnum -\indextext{storage duration!class member}% -The storage duration of subobjects and reference members -is that of their complete object\iref{intro.object}. -\indextext{storage duration|)}% - \rSec2[basic.align]{Alignment} \pnum diff --git a/source/xrefdelta.tex b/source/xrefdelta.tex index 04302a06d0..a2d81a3c39 100644 --- a/source/xrefdelta.tex +++ b/source/xrefdelta.tex @@ -95,6 +95,9 @@ \movedxref{stoptoken.cons}{stopsource} \movedxref{stoptoken.nonmembers}{stopsource} +% https://github.com/cplusplus/draft/pull/7345 +\movedxref{basic.stc.inherit}{basic.stc.general} + %%% Deprecated features. %%% Example: %