Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions source/lib-intro.tex
Original file line number Diff line number Diff line change
Expand Up @@ -2341,12 +2341,12 @@

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

\pnum
Expand Down Expand Up @@ -3068,7 +3068,7 @@
Let \tcode{\placeholder{F}} denote
a standard library function\iref{global.functions},
a standard library static member function,
or an instantiation
or a specialization
of a standard library function template.
Unless \tcode{\placeholder{F}} is designated
an \defnadj{addressable}{function},
Expand All @@ -3090,7 +3090,7 @@
or
if it attempts to form a pointer-to-member designating
either a standard library non-static member function\iref{member.functions}
or an instantiation of a standard library member function template.
or a specialization of a standard library member function template.

\pnum
Let \tcode{\placeholder{F}} denote
Expand Down
4 changes: 2 additions & 2 deletions source/memory.tex
Original file line number Diff line number Diff line change
Expand Up @@ -841,7 +841,7 @@
the \grammarterm{qualified-id} \tcode{Ptr::rebind<U>} is valid and denotes a
type\iref{temp.deduct}; otherwise,
\tcode{SomePointer<U, Args>} if
\tcode{Ptr} is a class template instantiation of the form \tcode{SomePointer<T, Args>},
\tcode{Ptr} is a class template specialization of the form \tcode{SomePointer<T, Args>},
where \tcode{Args} is zero or more type arguments; otherwise, the instantiation of
\tcode{rebind} is ill-formed.
\end{itemdescr}
Expand Down Expand Up @@ -1836,7 +1836,7 @@
\templalias \tcode{Alloc::rebind<T>::other} if
the \grammarterm{qualified-id} \tcode{Alloc::rebind<T>::other} is valid and denotes a
type\iref{temp.deduct}; otherwise,
\tcode{Alloc<T, Args>} if \tcode{Alloc} is a class template instantiation
\tcode{Alloc<T, Args>} if \tcode{Alloc} is a class template specialization
of the form \tcode{Alloc<U, Args>}, where \tcode{Args} is zero or more type arguments;
otherwise, the instantiation of \tcode{rebind_alloc} is ill-formed.
\end{itemdescr}
Expand Down
4 changes: 2 additions & 2 deletions source/numerics.tex
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
These include arithmetic types,
pointers, the library class
\tcode{complex},
and instantiations of
and specializations of
\tcode{valarray}
for value types.
\end{footnote}
Expand Down Expand Up @@ -4452,7 +4452,7 @@
\pnum
\begin{note}
If the values $g_i$ produced by \tcode{g} are uniformly distributed,
the instantiation's results are distributed as uniformly as possible.
\tcode{generate_canonical}'s results are distributed as uniformly as possible.
Obtaining a value in this way
can be a useful step
in the process of transforming
Expand Down
2 changes: 1 addition & 1 deletion source/text.tex
Original file line number Diff line number Diff line change
Expand Up @@ -7730,7 +7730,7 @@
\recommended
For a given type \tcode{charT},
implementations should provide
a single instantiation of \tcode{basic_format_context}
a single specialization of \tcode{basic_format_context}
for appending to
\tcode{basic_string<charT>},
\tcode{vector<charT>},
Expand Down
18 changes: 9 additions & 9 deletions source/threads.tex
Original file line number Diff line number Diff line change
Expand Up @@ -293,9 +293,9 @@
\pnum
A type \tcode{L} meets the \defnoldconcept{TimedLockable} requirements if it meets the \oldconcept{Lockable}
requirements and the following expressions are well-formed and have the specified semantics
(\tcode{m} denotes a value of type \tcode{L}, \tcode{rel_time} denotes a value of an
instantiation of \tcode{duration}\iref{time.duration}, and \tcode{abs_time} denotes a value
of an instantiation of \tcode{time_point}\iref{time.point}).
(\tcode{m} denotes a value of type \tcode{L}, \tcode{rel_time} denotes a value of a
specialization of \tcode{duration}\iref{time.duration}, and \tcode{abs_time} denotes a value
of a specialization of \tcode{time_point}\iref{time.point}).

\begin{itemdecl}
m.try_lock_for(rel_time)
Expand Down Expand Up @@ -7618,10 +7618,10 @@
\tcode{recursive_timed_mutex}, and \tcode{shared_timed_mutex}. They
meet the requirements set out below.
In this description, \tcode{m} denotes an object of a mutex type,
\tcode{rel_time} denotes an object of an
instantiation of \tcode{duration}\iref{time.duration}, and \tcode{abs_time} denotes an
object of an
instantiation of \tcode{time_point}\iref{time.point}.
\tcode{rel_time} denotes an object of a
specialization of \tcode{duration}\iref{time.duration}, and \tcode{abs_time} denotes an
object of a
specialization of \tcode{time_point}\iref{time.point}.
\begin{note}
The timed mutex types meet the \oldconcept{TimedLockable}
requirements\iref{thread.req.lockable.timed}.
Expand Down Expand Up @@ -8012,9 +8012,9 @@
shared mutex types\iref{thread.sharedmutex.requirements}, and additionally
meet the requirements set out below. In this description,
\tcode{m} denotes an object of a shared timed mutex type,
\tcode{rel_time} denotes an object of an instantiation of
\tcode{rel_time} denotes an object of a specialization of
\tcode{duration}\iref{time.duration}, and
\tcode{abs_time} denotes an object of an instantiation of
\tcode{abs_time} denotes an object of a specialization of
\tcode{time_point}\iref{time.point}.
\begin{note}
The shared timed mutex types meet the \oldconcept{SharedTimedLockable}
Expand Down
4 changes: 2 additions & 2 deletions source/utilities.tex
Original file line number Diff line number Diff line change
Expand Up @@ -1512,8 +1512,8 @@
the class template \tcode{tuple} that can be instantiated with any number
of arguments. Each template argument specifies
the type of an element in the \tcode{tuple}. Consequently, tuples are
heterogeneous, fixed-size collections of values. An instantiation of \tcode{tuple} with
two arguments is similar to an instantiation of \tcode{pair} with the same two arguments.
heterogeneous, fixed-size collections of values. A specialization of \tcode{tuple} with
two arguments is similar to a specialization of \tcode{pair} with the same two arguments.
See~\ref{pairs}.

\pnum
Expand Down