diff --git a/source/iterators.tex b/source/iterators.tex index e0116c79d8..ce4f39d679 100644 --- a/source/iterators.tex +++ b/source/iterators.tex @@ -890,7 +890,7 @@ \pnum \begin{note} -Some legacy output iterators define a nested type named \tcode{value_type} +Some legacy output iterators declare a nested type named \tcode{value_type} that is an alias for \keyword{void}. These types are not \libconcept{indirectly_readable} and have no associated value types. @@ -917,7 +917,7 @@ \begin{codeblock} iterator_traits::iterator_category \end{codeblock} -be defined as the iterator's iterator category. +be declared as the iterator's iterator category. In addition, the types \indexlibrarymember{pointer}{iterator_traits}% \indexlibrarymember{reference}{iterator_traits}% @@ -925,7 +925,7 @@ iterator_traits::pointer iterator_traits::reference \end{codeblock} -shall be defined as the iterator's pointer and reference types; +shall be declared as the iterator's pointer and reference types; that is, for an iterator object \tcode{a} of class type, the same type as @@ -943,7 +943,7 @@ iterator_traits::difference_type iterator_traits::reference \end{codeblock} -may be defined as \keyword{void}. +may be declared as \keyword{void}. \pnum The definitions in this subclause make use of the following @@ -1103,7 +1103,7 @@ the \oldconcept{InputIter\-ator} requirements\iref{input.iterators}, an \tcode{iterator_traits} specialization might have \tcode{iterator_concept} denote \tcode{input_iterator_tag} -but not define \tcode{iterator_category}. +but not declare \tcode{iterator_category}. \end{example} \pnum @@ -2770,7 +2770,7 @@ For every iterator of type \tcode{I}, \tcode{iterator_traits::it\-er\-a\-tor_ca\-te\-go\-ry} -shall be defined to be a category tag that describes the +shall be declared to be a category tag that describes the iterator's behavior. Additionally, \tcode{iterator_traits::it\-er\-a\-tor_con\-cept} @@ -4384,7 +4384,7 @@ \end{itemize} \pnum -The member \grammarterm{typedef-name} \tcode{iterator_category} is defined +The member \grammarterm{typedef-name} \tcode{iterator_category} is declared if and only if \tcode{Iterator} models \libconcept{forward_iterator}. In that case, \tcode{basic_const_iterator::iterator_category} denotes @@ -4860,7 +4860,7 @@ \end{itemize} \pnum -The member \grammarterm{typedef-name} \tcode{iterator_category} is defined +The member \grammarterm{typedef-name} \tcode{iterator_category} is declared if and only if the \grammarterm{qualified-id} \tcode{iterator_traits::iterator_category} is valid and denotes a type. @@ -5520,7 +5520,7 @@ \pnum The nested \grammarterm{typedef-name} \tcode{iterator_category} of the specialization of \tcode{iterator_traits} for \tcode{common_iterator} -is defined if and only if \tcode{iter_difference_t} is an integral type. +is declared if and only if \tcode{iter_difference_t} is an integral type. In that case, \tcode{iterator_category} denotes \tcode{forward_iterator_tag} if the \grammarterm{qualified-id} \tcode{iterator_traits::iterator_category} diff --git a/source/lib-intro.tex b/source/lib-intro.tex index b78c4f80eb..fc9168ed29 100644 --- a/source/lib-intro.tex +++ b/source/lib-intro.tex @@ -531,8 +531,8 @@ \pnum Several entities and \grammarterm{typedef-name}{s} -defined in \ref{\firstlibchapter} through \ref{\lastlibchapter} and \ref{depr} -are only defined for the purpose of exposition. +declared in \ref{\firstlibchapter} through \ref{\lastlibchapter} and \ref{depr} +are only declared for the purpose of exposition. The declaration of such an entity or \grammarterm{typedef-name} is followed by a comment ending in \expos. @@ -601,14 +601,14 @@ the library. \pnum -Certain types defined in \ref{input.output} are used to describe implementation-defined types. +Certain types shown in \ref{input.output} are used to describe implementation-defined types. \indextext{types!implementation-defined}% They are based on other types, but with added constraints. \rSec4[enumerated.types]{Enumerated types} \pnum -Several types defined in \ref{input.output} are +Several types specified in \ref{input.output} and \ref{re} are \defnadjx{enumerated}{types}{type}. Each enumerated type may be implemented as an enumeration or as a synonym for an enumeration. @@ -641,7 +641,7 @@ \rSec4[bitmask.types]{Bitmask types} \pnum -Several types defined in \ref{\firstlibchapter} through \ref{\lastlibchapter} +Several types specified in \ref{\firstlibchapter} through \ref{\lastlibchapter} and \ref{depr} are \defnx{bitmask types}{type!bitmask}. Each bitmask type can be implemented as an @@ -3376,7 +3376,7 @@ \tcode{::T} and \tcode{std::T} -are reserved to the implementation and, when defined, +are reserved to the implementation and, when declared, \tcode{::T} shall be identical to \tcode{std::T}. diff --git a/source/meta.tex b/source/meta.tex index e46476d742..f94676ec80 100644 --- a/source/meta.tex +++ b/source/meta.tex @@ -127,7 +127,7 @@ modifies a property of a type. It shall be a class template that takes one template type argument and, optionally, additional arguments that help -define the modification. It shall define a publicly accessible nested type +define the modification. It shall declare a publicly accessible nested type named \tcode{type}, which shall be a synonym for the modified type. \pnum @@ -2298,7 +2298,7 @@ \tcode{template} \tcode{struct common_type;} & Unless this trait is specialized, - the member \tcode{type} is defined or omitted as specified below. + the member \tcode{type} is declared or omitted as specified below. If it is omitted, there shall be no member \tcode{type}. Each type in the template parameter pack \tcode{T} shall be complete, \cv{}~\keyword{void}, or an array of unknown bound. \\ \rowsep @@ -2314,7 +2314,7 @@ \tcode{template} \tcode{struct \libglobal{common_reference};} & - The member \grammarterm{typedef-name} \tcode{type} is defined or omitted + The member \grammarterm{typedef-name} \tcode{type} is declared or omitted as specified below. Each type in the parameter pack \tcode{T} shall be complete or \cv{} \keyword{void}. \\ \rowsep @@ -2450,7 +2450,7 @@ \pnum For the \tcode{common_type} trait applied to a template parameter pack \tcode{T} of types, -the member \tcode{type} shall be either defined or not present as follows: +the member \tcode{type} shall be either declared or not present as follows: \begin{itemize} \item If \tcode{sizeof...(T)} is zero, there shall be no member \tcode{type}. @@ -2523,7 +2523,7 @@ \pnum For the \tcode{common_reference} trait applied to a parameter pack -\tcode{T} of types, the member \tcode{type} shall be either defined or not +\tcode{T} of types, the member \tcode{type} shall be either declared or not present as follows: \begin{itemize} \item If \tcode{sizeof...(T)} is zero, there shall be no member \tcode{type}. @@ -2593,7 +2593,7 @@ \pnum \begin{example} -Given these definitions: +Given these declarations: \begin{codeblock} using PF1 = bool (&)(); using PF2 = short (*)(long); @@ -7289,5 +7289,5 @@ \tcode{ronna}, and \tcode{quetta}, if both of the constants used in its specification are representable by \tcode{intmax_t}, the typedef is -defined; if either of the constants is not representable by \tcode{intmax_t}, -the typedef is not defined. +declared; if either of the constants is not representable by \tcode{intmax_t}, +the typedef is not declared. diff --git a/source/ranges.tex b/source/ranges.tex index 2a606adfea..d64228f58b 100644 --- a/source/ranges.tex +++ b/source/ranges.tex @@ -4933,7 +4933,7 @@ \end{itemize} \pnum -The member \grammarterm{typedef-name} \tcode{iterator_category} is defined +The member \grammarterm{typedef-name} \tcode{iterator_category} is declared if and only if \tcode{V} models \libconcept{forward_range}. In that case, \tcode{\exposid{iterator}::iterator_category} is defined as follows: @@ -5462,7 +5462,7 @@ \end{itemize} \pnum -The member \grammarterm{typedef-name} \tcode{iterator_category} is defined +The member \grammarterm{typedef-name} \tcode{iterator_category} is declared if and only if \exposid{Base} models \libconcept{forward_range}. In that case, \tcode{\exposid{iterator}::iterator_category} is defined as follows: @@ -6867,7 +6867,7 @@ \end{itemize} \pnum -The member \grammarterm{typedef-name} \tcode{iterator_category} is defined +The member \grammarterm{typedef-name} \tcode{iterator_category} is declared if and only if \exposid{ref-is-glvalue} is \tcode{true}, \exposid{Base} models \libconcept{forward_range}, and \tcode{range_reference_t<\exposid{Base}>} models \libconcept{forward_range}. @@ -7440,7 +7440,7 @@ \end{itemize} \pnum -The member \grammarterm{typedef-name} \tcode{iterator_category} is defined +The member \grammarterm{typedef-name} \tcode{iterator_category} is declared if and only if \exposid{ref-is-glvalue} is \tcode{true}, and \exposid{Base} and \exposid{InnerBase} each model \libconcept{forward_range}. In that case, @@ -9064,7 +9064,7 @@ \end{itemize} \pnum -The member \grammarterm{typedef-name} \tcode{iterator_category} is defined +The member \grammarterm{typedef-name} \tcode{iterator_category} is declared if and only if \tcode{\exposconcept{all-forward}} is modeled. In that case, @@ -10376,7 +10376,7 @@ \end{itemize} \pnum -The member \grammarterm{typedef-name} \tcode{iterator_category} is defined +The member \grammarterm{typedef-name} \tcode{iterator_category} is declared if and only if \exposid{Base} models \libconcept{forward_range}. In that case, \tcode{iterator_category} is defined as follows: Let \tcode{C} denote the type @@ -12193,7 +12193,7 @@ \pnum The member \grammarterm{typedef-name} \tcode{\exposid{iterator}::iterator_category} -is defined if and only if \exposid{Base} models \libconcept{forward_range}. +is declared if and only if \exposid{Base} models \libconcept{forward_range}. In that case, \tcode{\exposid{iterator}::iterator_category} is defined as follows: \begin{itemize} @@ -16188,7 +16188,7 @@ \end{itemize} \pnum -The member \grammarterm{typedef-name} \tcode{iterator_category} is defined +The member \grammarterm{typedef-name} \tcode{iterator_category} is declared if and only if \exposid{Base} models \libconcept{forward_range}. In that case, \tcode{\exposid{iterator}::iterator_category} is defined as follows: diff --git a/source/support.tex b/source/support.tex index 19e19d6f11..dac31c4541 100644 --- a/source/support.tex +++ b/source/support.tex @@ -2073,10 +2073,10 @@ are also optional; however, if an implementation defines integer types with the corresponding width and no padding bits, -it defines the corresponding \grammarterm{typedef-name}s. +it declares the corresponding \grammarterm{typedef-name}s. Each of the macros listed in this subclause is defined if and only if -the implementation defines the corresponding \grammarterm{typedef-name}. +the implementation declares the corresponding \grammarterm{typedef-name}. \begin{note} The macros \tcode{INT\placeholdernc{N}_C} and \tcode{UINT\placeholdernc{N}_C} correspond to the \grammarterm{typedef-name}s @@ -2087,7 +2087,7 @@ \rSec2[stdfloat.syn]{Header \tcode{} synopsis} \pnum -The header \libheader{stdfloat} defines type aliases for +The header \libheader{stdfloat} declares type aliases for the optional extended floating-point types that are specified in \ref{basic.extended.fp}. diff --git a/source/text.tex b/source/text.tex index df1715da2b..4719f1e41c 100644 --- a/source/text.tex +++ b/source/text.tex @@ -6629,7 +6629,7 @@ \topline \lhdr{Type} & \rhdr{Meaning} \\ \rowsep none, \tcode{p} & -If \tcode{uintptr_t} is defined, +If \tcode{uintptr_t} is declared, \begin{codeblock} to_chars(first, last, reinterpret_cast(value), 16) \end{codeblock} diff --git a/source/threads.tex b/source/threads.tex index 9be4571b79..ab9698f561 100644 --- a/source/threads.tex +++ b/source/threads.tex @@ -2859,10 +2859,10 @@ \pnum The type aliases \tcode{atomic_int$N$_t}, \tcode{atomic_uint$N$_t}, \tcode{atomic_intptr_t}, and \tcode{atomic_uintptr_t} -are defined if and only if +are declared if and only if \tcode{int$N$_t}, \tcode{uint$N$_t}, \tcode{intptr_t}, and \tcode{uintptr_t} -are defined, respectively. +are declared, respectively. \pnum \indexlibraryglobal{atomic_signed_lock_free}% @@ -7225,7 +7225,7 @@ \pnum Each of the \grammarterm{using-declaration}s for \tcode{int$N$_t}, \tcode{uint$N$_t}, \tcode{intptr_t}, and \tcode{uintptr_t} -listed above is defined if and only if the implementation defines +listed above is declared if and only if the implementation declares the corresponding \grammarterm{typedef-name} in \ref{atomics.syn}. \pnum