Skip to content

Commit 1703553

Browse files
[lib] Replace bad uses of "instantiation" with "specialization"
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 [rand.util.canonical], it would be clearer to just say `generate_canonical` instead of "the instantiation" or "the specialization".
1 parent 3b14ec1 commit 1703553

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

source/lib-intro.tex

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

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

23522352
\pnum
@@ -3068,7 +3068,7 @@
30683068
Let \tcode{\placeholder{F}} denote
30693069
a standard library function\iref{global.functions},
30703070
a standard library static member function,
3071-
or an instantiation
3071+
or a specialization
30723072
of a standard library function template.
30733073
Unless \tcode{\placeholder{F}} is designated
30743074
an \defnadj{addressable}{function},
@@ -3090,7 +3090,7 @@
30903090
or
30913091
if it attempts to form a pointer-to-member designating
30923092
either a standard library non-static member function\iref{member.functions}
3093-
or an instantiation of a standard library member function template.
3093+
or a specialization of a standard library member function template.
30943094

30953095
\pnum
30963096
Let \tcode{\placeholder{F}} denote

source/memory.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -841,7 +841,7 @@
841841
the \grammarterm{qualified-id} \tcode{Ptr::rebind<U>} is valid and denotes a
842842
type\iref{temp.deduct}; otherwise,
843843
\tcode{SomePointer<U, Args>} if
844-
\tcode{Ptr} is a class template instantiation of the form \tcode{SomePointer<T, Args>},
844+
\tcode{Ptr} is a class template specialization of the form \tcode{SomePointer<T, Args>},
845845
where \tcode{Args} is zero or more type arguments; otherwise, the instantiation of
846846
\tcode{rebind} is ill-formed.
847847
\end{itemdescr}
@@ -1836,7 +1836,7 @@
18361836
\templalias \tcode{Alloc::rebind<T>::other} if
18371837
the \grammarterm{qualified-id} \tcode{Alloc::rebind<T>::other} is valid and denotes a
18381838
type\iref{temp.deduct}; otherwise,
1839-
\tcode{Alloc<T, Args>} if \tcode{Alloc} is a class template instantiation
1839+
\tcode{Alloc<T, Args>} if \tcode{Alloc} is a class template specialization
18401840
of the form \tcode{Alloc<U, Args>}, where \tcode{Args} is zero or more type arguments;
18411841
otherwise, the instantiation of \tcode{rebind_alloc} is ill-formed.
18421842
\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
@@ -7730,7 +7730,7 @@
77307730
\recommended
77317731
For a given type \tcode{charT},
77327732
implementations should provide
7733-
a single instantiation of \tcode{basic_format_context}
7733+
a single specialization of \tcode{basic_format_context}
77347734
for appending to
77357735
\tcode{basic_string<charT>},
77367736
\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)
@@ -7618,10 +7618,10 @@
76187618
\tcode{recursive_timed_mutex}, and \tcode{shared_timed_mutex}. They
76197619
meet the requirements set out below.
76207620
In this description, \tcode{m} denotes an object of a mutex type,
7621-
\tcode{rel_time} denotes an object of an
7622-
instantiation of \tcode{duration}\iref{time.duration}, and \tcode{abs_time} denotes an
7623-
object of an
7624-
instantiation of \tcode{time_point}\iref{time.point}.
7621+
\tcode{rel_time} denotes an object of a
7622+
specialization of \tcode{duration}\iref{time.duration}, and \tcode{abs_time} denotes an
7623+
object of a
7624+
specialization of \tcode{time_point}\iref{time.point}.
76257625
\begin{note}
76267626
The timed mutex types meet the \oldconcept{TimedLockable}
76277627
requirements\iref{thread.req.lockable.timed}.
@@ -8012,9 +8012,9 @@
80128012
shared mutex types\iref{thread.sharedmutex.requirements}, and additionally
80138013
meet the requirements set out below. In this description,
80148014
\tcode{m} denotes an object of a shared timed mutex type,
8015-
\tcode{rel_time} denotes an object of an instantiation of
8015+
\tcode{rel_time} denotes an object of a specialization of
80168016
\tcode{duration}\iref{time.duration}, and
8017-
\tcode{abs_time} denotes an object of an instantiation of
8017+
\tcode{abs_time} denotes an object of a specialization of
80188018
\tcode{time_point}\iref{time.point}.
80198019
\begin{note}
80208020
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
@@ -1512,8 +1512,8 @@
15121512
the class template \tcode{tuple} that can be instantiated with any number
15131513
of arguments. Each template argument specifies
15141514
the type of an element in the \tcode{tuple}. Consequently, tuples are
1515-
heterogeneous, fixed-size collections of values. An instantiation of \tcode{tuple} with
1516-
two arguments is similar to an instantiation of \tcode{pair} with the same two arguments.
1515+
heterogeneous, fixed-size collections of values. A specialization of \tcode{tuple} with
1516+
two arguments is similar to a specialization of \tcode{pair} with the same two arguments.
15171517
See~\ref{pairs}.
15181518

15191519
\pnum

0 commit comments

Comments
 (0)