Skip to content

Commit 6f3ef53

Browse files
jensmaurertkoeppe
authored andcommitted
[dcl.fct.def.replace] Add 'replaceable function' to index
Also add a label 'term.replaceable.function' for subclause-agnostic cross-referencing. Fixes NB US 269-406 (C++26 CD).
1 parent a7e6101 commit 6f3ef53

File tree

7 files changed

+23
-17
lines changed

7 files changed

+23
-17
lines changed

source/basic.tex

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4384,7 +4384,7 @@
43844384
\pnum
43854385
The library provides default definitions for the global allocation and
43864386
deallocation functions. Some global allocation and deallocation
4387-
functions are replaceable\iref{dcl.fct.def.replace}.
4387+
functions are replaceable\iref{term.replaceable.function}.
43884388
The following allocation and deallocation functions\iref{support.dynamic}
43894389
are implicitly declared in global scope in each translation unit of a
43904390
program.
@@ -5224,9 +5224,10 @@
52245224
arrays of such types, and cv-qualified versions of these
52255225
types are collectively called \defnadjx{trivially relocatable}{types}{type}.
52265226
\label{term.replaceable.type}%
5227+
\indextext{replaceable!type|see{type, replaceable}}%
52275228
Cv-unqualified scalar types, replaceable class types\iref{class.prop}, and
52285229
arrays of such types are collectively called
5229-
\defnadjx{replaceable}{types}{type}.
5230+
\defnx{replaceable types}{type!replaceable}.
52305231
\label{term.standard.layout.type}%
52315232
Scalar types, standard-layout class
52325233
types\iref{class.prop}, arrays of such types, and
@@ -7993,7 +7994,7 @@
79937994
It is
79947995
\impldef{replaceability of the contract-violation handler}
79957996
whether the contract-violation handler
7996-
is replaceable\iref{dcl.fct.def.replace}.
7997+
is replaceable\iref{term.replaceable.function}.
79977998
If the contract-violation handler
79987999
is not replaceable,
79998000
a declaration of a replacement function for the contract-violation handler

source/classes.tex

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,9 @@
248248
\item it has a deleted destructor.
249249
\end{itemize}
250250

251+
\indextext{replaceable!class|see{class, replaceable}}%
251252
\pnum
252-
A class \tcode{C} is a \defnadj{replaceable}{class} if it is
253+
A class \tcode{C} is a \defnx{replaceable class}{class!replaceable} if it is
253254
eligible for replacement and
254255
\begin{itemize}
255256
\item has the \tcode{replaceable_if_eligible} \grammarterm{class-property-specifier},

source/declarations.tex

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7540,10 +7540,14 @@
75407540

75417541
\rSec2[dcl.fct.def.replace]{Replaceable function definitions}
75427542

7543+
\indextext{function!replaceable|(}%
7544+
\indextext{replaceable!function|see{function, replaceable}}%
7545+
75437546
\pnum
7547+
\label{term.replaceable.function}%
75447548
Certain functions
75457549
for which a definition is supplied by the implementation
7546-
are \defn{replaceable}.
7550+
are \defnx{replaceable}{function!replaceable}.
75477551
A \Cpp{} program may
75487552
provide a definition with the signature of a replaceable function,
75497553
called a \defnadj{replacement}{function}.
@@ -7575,7 +7579,7 @@
75757579
The implementation-supplied function definition
75767580
is an otherwise-unnamed function with no linkage.
75777581
\end{note}
7578-
7582+
\indextext{function!replaceable|)}%
75797583

75807584
\rSec1[dcl.struct.bind]{Structured binding declarations}%
75817585
\indextext{structured binding declaration}%

source/diagnostics.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2500,6 +2500,6 @@
25002500

25012501
\pnum
25022502
\remarks
2503-
This function is replaceable\iref{dcl.fct.def.replace}.
2503+
This function is replaceable\iref{term.replaceable.function}.
25042504

25052505
\end{itemdescr}

source/exec.tex

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

84518451
\pnum
84528452
\remarks
8453-
This function is replaceable\iref{dcl.fct.def.replace}.
8453+
This function is replaceable\iref{term.replaceable.function}.
84548454
\end{itemdescr}
84558455

84568456
\begin{codeblock}

source/lib-intro.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3416,7 +3416,7 @@
34163416
\pnum
34173417
If a function defined in
34183418
\ref{\firstlibchapter} through \ref{\lastlibchapter} and \ref{depr}
3419-
is specified as replaceable\iref{dcl.fct.def.replace},
3419+
is specified as replaceable\iref{term.replaceable.function},
34203420
the description of function semantics apply
34213421
to both the default version defined by the \Cpp{} standard library and
34223422
the replacement function defined by the program.

source/support.tex

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2498,7 +2498,7 @@
24982498

24992499
\pnum
25002500
\remarks
2501-
This function is replaceable\iref{dcl.fct.def.replace}.
2501+
This function is replaceable\iref{term.replaceable.function}.
25022502
\end{itemdescr}
25032503

25042504
\indexlibrarymember{new}{operator}%
@@ -2547,7 +2547,7 @@
25472547

25482548
\pnum
25492549
\remarks
2550-
This function is replaceable\iref{dcl.fct.def.replace}.
2550+
This function is replaceable\iref{term.replaceable.function}.
25512551
\end{itemdescr}
25522552

25532553
\indexlibrarymember{delete}{operator}%
@@ -2632,7 +2632,7 @@
26322632
or
26332633
\tcode{realloc},
26342634
declared in \libheaderref{cstdlib}.
2635-
This function is replaceable\iref{dcl.fct.def.replace}.
2635+
This function is replaceable\iref{term.replaceable.function}.
26362636
If a replacement function
26372637
without a \tcode{size} parameter
26382638
is defined by the program,
@@ -2694,7 +2694,7 @@
26942694

26952695
\pnum
26962696
\remarks
2697-
This function is replaceable\iref{dcl.fct.def.replace}.
2697+
This function is replaceable\iref{term.replaceable.function}.
26982698
\end{itemdescr}
26992699

27002700
\rSec3[new.delete.array]{Array forms}
@@ -2750,7 +2750,7 @@
27502750

27512751
\pnum
27522752
\remarks
2753-
This function is replaceable\iref{dcl.fct.def.replace}.
2753+
This function is replaceable\iref{term.replaceable.function}.
27542754
\end{itemdescr}
27552755

27562756
\indexlibrarymember{new}{operator}%
@@ -2791,7 +2791,7 @@
27912791

27922792
\pnum
27932793
\remarks
2794-
This function is replaceable\iref{dcl.fct.def.replace}.
2794+
This function is replaceable\iref{term.replaceable.function}.
27952795
\end{itemdescr}
27962796

27972797
\indexlibrarymember{delete}{operator}%
@@ -2859,7 +2859,7 @@
28592859

28602860
\pnum
28612861
\remarks
2862-
This function is replaceable\iref{dcl.fct.def.replace}.
2862+
This function is replaceable\iref{term.replaceable.function}.
28632863
If a replacement function
28642864
without a \tcode{size} parameter
28652865
is defined by the program,
@@ -2921,7 +2921,7 @@
29212921

29222922
\pnum
29232923
\remarks
2924-
This function is replaceable\iref{dcl.fct.def.replace}.
2924+
This function is replaceable\iref{term.replaceable.function}.
29252925
\end{itemdescr}
29262926

29272927
\rSec3[new.delete.placement]{Non-allocating forms}

0 commit comments

Comments
 (0)