Skip to content

Commit cda7c18

Browse files
[lib] Replace bad uses of "instantiation" with "specialization" (#8379)
Affected sections: - [allocator.requirements.general] - [namespace.std] - [pointer.traits.types] - [allocator.traits.types] - [tuple.general] - [format.context] - [numeric.requirements] - [rand.util.canonical] - [thread.req.lockable.timed] - [thread.sharedtimedmutex.requirements.general] - In [tuple.general], change "is similar to" to "behaves similarly to" to avoid confusing with "similar types" in the core specification.
1 parent 8eced2a commit cda7c18

6 files changed

Lines changed: 20 additions & 20 deletions

File tree

source/lib-intro.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2346,12 +2346,12 @@
23462346

23472347
\pnum
23482348
\remarks
2349-
If \tcode{Allocator} is a class template instantiation of the form
2349+
If \tcode{Allocator} is a class template specialization of the form
23502350
\tcode{SomeAllocator<T, Args>}, where \tcode{Args} is zero or more type
23512351
arguments, and \tcode{Allocator} does not supply a \tcode{rebind} member
23522352
template, the standard \tcode{allocator_traits} template uses
23532353
\tcode{SomeAllocator<U, Args>} in place of \tcode{Allocator::re\-bind<U>::other}
2354-
by default. For allocator types that are not template instantiations of the
2354+
by default. For allocator types that are not template specializations of the
23552355
above form, no default is provided.
23562356

23572357
\pnum
@@ -3073,7 +3073,7 @@
30733073
Let \tcode{\placeholder{F}} denote
30743074
a standard library function\iref{global.functions},
30753075
a standard library static member function,
3076-
or an instantiation
3076+
or a specialization
30773077
of a standard library function template.
30783078
Unless \tcode{\placeholder{F}} is designated
30793079
an \defnadj{addressable}{function},
@@ -3095,7 +3095,7 @@
30953095
or
30963096
if it attempts to form a pointer-to-member designating
30973097
either a standard library non-static member function\iref{member.functions}
3098-
or an instantiation of a standard library member function template.
3098+
or a specialization of a standard library member function template.
30993099

31003100
\pnum
31013101
Let \tcode{\placeholder{F}} denote

source/memory.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -837,7 +837,7 @@
837837
the \grammarterm{qualified-id} \tcode{Ptr::rebind<U>} is valid and denotes a
838838
type\iref{temp.deduct}; otherwise,
839839
\tcode{SomePointer<U, Args>} if
840-
\tcode{Ptr} is a class template instantiation of the form \tcode{SomePointer<T, Args>},
840+
\tcode{Ptr} is a class template specialization of the form \tcode{SomePointer<T, Args>},
841841
where \tcode{Args} is zero or more type arguments; otherwise, the instantiation of
842842
\tcode{rebind} is ill-formed.
843843
\end{itemdescr}
@@ -1710,7 +1710,7 @@
17101710
\templalias \tcode{Alloc::rebind<T>::other} if
17111711
the \grammarterm{qualified-id} \tcode{Alloc::rebind<T>::other} is valid and denotes a
17121712
type\iref{temp.deduct}; otherwise,
1713-
\tcode{Alloc<T, Args>} if \tcode{Alloc} is a class template instantiation
1713+
\tcode{Alloc<T, Args>} if \tcode{Alloc} is a class template specialization
17141714
of the form \tcode{Alloc<U, Args>}, where \tcode{Args} is zero or more type arguments;
17151715
otherwise, the instantiation of \tcode{rebind_alloc} is ill-formed.
17161716
\end{itemdescr}

source/numerics.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
These include arithmetic types,
5252
pointers, the library class
5353
\tcode{complex},
54-
and instantiations of
54+
and specializations of
5555
\tcode{valarray}
5656
for value types.
5757
\end{footnote}
@@ -4452,7 +4452,7 @@
44524452
\pnum
44534453
\begin{note}
44544454
If the values $g_i$ produced by \tcode{g} are uniformly distributed,
4455-
the instantiation's results are distributed as uniformly as possible.
4455+
\tcode{generate_canonical}'s results are distributed as uniformly as possible.
44564456
Obtaining a value in this way
44574457
can be a useful step
44584458
in the process of transforming

source/text.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7761,7 +7761,7 @@
77617761
\recommended
77627762
For a given type \tcode{charT},
77637763
implementations should provide
7764-
a single instantiation of \tcode{basic_format_context}
7764+
a single specialization of \tcode{basic_format_context}
77657765
for appending to
77667766
\tcode{basic_string<charT>},
77677767
\tcode{vector<charT>},

source/threads.tex

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -293,9 +293,9 @@
293293
\pnum
294294
A type \tcode{L} meets the \defnoldconcept{TimedLockable} requirements if it meets the \oldconcept{Lockable}
295295
requirements and the following expressions are well-formed and have the specified semantics
296-
(\tcode{m} denotes a value of type \tcode{L}, \tcode{rel_time} denotes a value of an
297-
instantiation of \tcode{duration}\iref{time.duration}, and \tcode{abs_time} denotes a value
298-
of an instantiation of \tcode{time_point}\iref{time.point}).
296+
(\tcode{m} denotes a value of type \tcode{L}, \tcode{rel_time} denotes a value of a
297+
specialization of \tcode{duration}\iref{time.duration}, and \tcode{abs_time} denotes a value
298+
of a specialization of \tcode{time_point}\iref{time.point}).
299299

300300
\begin{itemdecl}
301301
m.try_lock_for(rel_time)
@@ -7575,10 +7575,10 @@
75757575
\tcode{recursive_timed_mutex}, and \tcode{shared_timed_mutex}. They
75767576
meet the requirements set out below.
75777577
In this description, \tcode{m} denotes an object of a mutex type,
7578-
\tcode{rel_time} denotes an object of an
7579-
instantiation of \tcode{duration}\iref{time.duration}, and \tcode{abs_time} denotes an
7580-
object of an
7581-
instantiation of \tcode{time_point}\iref{time.point}.
7578+
\tcode{rel_time} denotes an object of a
7579+
specialization of \tcode{duration}\iref{time.duration}, and \tcode{abs_time} denotes an
7580+
object of a
7581+
specialization of \tcode{time_point}\iref{time.point}.
75827582
\begin{note}
75837583
The timed mutex types meet the \oldconcept{TimedLockable}
75847584
requirements\iref{thread.req.lockable.timed}.
@@ -7969,9 +7969,9 @@
79697969
shared mutex types\iref{thread.sharedmutex.requirements}, and additionally
79707970
meet the requirements set out below. In this description,
79717971
\tcode{m} denotes an object of a shared timed mutex type,
7972-
\tcode{rel_time} denotes an object of an instantiation of
7972+
\tcode{rel_time} denotes an object of a specialization of
79737973
\tcode{duration}\iref{time.duration}, and
7974-
\tcode{abs_time} denotes an object of an instantiation of
7974+
\tcode{abs_time} denotes an object of a specialization of
79757975
\tcode{time_point}\iref{time.point}.
79767976
\begin{note}
79777977
The shared timed mutex types meet the \oldconcept{SharedTimedLockable}

source/utilities.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1524,8 +1524,8 @@
15241524
the class template \tcode{tuple} that can be instantiated with any number
15251525
of arguments. Each template argument specifies
15261526
the type of an element in the \tcode{tuple}. Consequently, tuples are
1527-
heterogeneous, fixed-size collections of values. An instantiation of \tcode{tuple} with
1528-
two arguments is similar to an instantiation of \tcode{pair} with the same two arguments.
1527+
heterogeneous, fixed-size collections of values. A specialization of \tcode{tuple} with
1528+
two arguments behaves similarly to a specialization of \tcode{pair} with the same two arguments.
15291529
See~\ref{pairs}.
15301530

15311531
\pnum

0 commit comments

Comments
 (0)