diff --git a/source/compatibility.tex b/source/compatibility.tex index a46c9a71cc..3e0614222e 100644 --- a/source/compatibility.tex +++ b/source/compatibility.tex @@ -1578,7 +1578,7 @@ Remove deprecated type traits. \rationale The traits had unreliable or awkward interfaces. The \tcode{is_literal_type} -trait provided no way to detect which subset of constructors and member +trait provided no way to detect which subset of member functions of a type were declared \keyword{constexpr}. The \tcode{result_of} trait had a surprising syntax that did not directly support function types. It has been superseded by the \tcode{invoke_result} trait. diff --git a/source/containers.tex b/source/containers.tex index 6a71104dd1..b3f31cda67 100644 --- a/source/containers.tex +++ b/source/containers.tex @@ -641,7 +641,7 @@ allocator argument, then the allocator type must support value-initialization. \end{note} A copy of this allocator is used for any memory allocation and element construction -performed, by these constructors and by all member functions, +performed, by these constructors and by all other member functions, during the lifetime of each container object or until the allocator is replaced. The allocator may be replaced only via assignment or \tcode{swap()}. Allocator replacement is performed by @@ -17058,7 +17058,7 @@ containers of different sizes is undefined. \pnum -The effect of calling a constructor or member function +The effect of calling a member function that takes a \tcode{sorted_unique_t} argument with a container, containers, or range that is not sorted with respect to \tcode{key_comp()}, or @@ -18255,7 +18255,7 @@ with containers of different sizes is undefined. \pnum -The effect of calling a constructor or member function +The effect of calling a member function that takes a \tcode{sorted_equivalent_t} argument with a container, containers, or range that are not sorted with respect to \tcode{key_comp()} is undefined. @@ -18887,7 +18887,7 @@ as \tcode{KeyContainer::value_type}. \pnum -The effect of calling a constructor or member function +The effect of calling a member function that takes a \tcode{sorted_unique_t} argument with a range that is not sorted with respect to \tcode{key_comp()}, or that contains equal elements, is undefined. @@ -19557,7 +19557,7 @@ as \tcode{KeyContainer::value_type}. \pnum -The effect of calling a constructor or member function +The effect of calling a member function that takes a \tcode{sorted_equivalent_t} argument with a range that is not sorted with respect to \tcode{key_comp()} is undefined. diff --git a/source/declarations.tex b/source/declarations.tex index 341c1bc1f3..d451d6b206 100644 --- a/source/declarations.tex +++ b/source/declarations.tex @@ -937,7 +937,7 @@ declares that function to be a \defnx{constexpr function}{specifier!\idxcode{constexpr}!function}. \begin{note} -A function or constructor declared with the \keyword{consteval} specifier +A function declared with the \keyword{consteval} specifier is an immediate function\iref{expr.const}. \end{note} A destructor, an allocation function, or a deallocation function @@ -5491,7 +5491,7 @@ \end{itemize} \begin{note} Aggregate initialization does not allow accessing -protected and private base class' members or constructors. +protected and private base class' members, including constructors. \end{note} \pnum diff --git a/source/expressions.tex b/source/expressions.tex index 51ff9a3ce5..5f225c835e 100644 --- a/source/expressions.tex +++ b/source/expressions.tex @@ -3764,7 +3764,7 @@ \grammarterm{initializer-clause}{s} which constitute the arguments to the function. \begin{note} -If the postfix expression is a function or member function name, +If the postfix expression is a function name, the appropriate function and the validity of the call are determined according to the rules in~\ref{over.match}. \end{note} @@ -3793,7 +3793,7 @@ \pnum \begin{note} -If a function or member function name is used, and name +If a function name is used, and name lookup\iref{basic.lookup} does not find a declaration of that name, the program is ill-formed. No function is implicitly declared by such a call. @@ -9155,7 +9155,7 @@ in an immediate-escalating function. \pnum -An \defnadj{immediate}{function} is a function or constructor that is either +An \defnadj{immediate}{function} is a function that is either \begin{itemize} \item declared with the \keyword{consteval} specifier, or diff --git a/source/lib-intro.tex b/source/lib-intro.tex index 7d6d3012ff..48b6a6ef3f 100644 --- a/source/lib-intro.tex +++ b/source/lib-intro.tex @@ -3750,7 +3750,7 @@ any standard library function signature as \keyword{constexpr} except for those where it is explicitly required. Within any header that provides any non-defining declarations of constexpr -functions or constructors an implementation shall provide corresponding definitions. +functions an implementation shall provide corresponding definitions. \rSec3[algorithm.stable]{Requirements for stable algorithms} diff --git a/source/templates.tex b/source/templates.tex index 9ef3133aef..2c959a96b1 100644 --- a/source/templates.tex +++ b/source/templates.tex @@ -6395,10 +6395,8 @@ a member of a class template, or a class member template, the variable or class that is explicitly specialized shall be specified with a \grammarterm{simple-template-id}. -In the explicit specialization declaration for a function template or -a member function template, -the function or member function explicitly specialized may be specified -using a \grammarterm{template-id}. +In the explicit specialization declaration for a function template, +the function explicitly specialized may be specified using a \grammarterm{template-id}. \begin{example} \begin{codeblock} template struct A { @@ -6766,7 +6764,7 @@ \end{example} \pnum -If a function template or a member function template specialization is used in +If a function template specialization is used in a way that involves overload resolution, a declaration of the specialization is implicitly instantiated\iref{temp.over}. diff --git a/source/utilities.tex b/source/utilities.tex index 0a26e0266a..716f266bcf 100644 --- a/source/utilities.tex +++ b/source/utilities.tex @@ -805,7 +805,7 @@ \end{codeblock} \pnum -Constructors and member functions of \tcode{pair} do not throw exceptions unless one of +Member functions of \tcode{pair} do not throw exceptions unless one of the element-wise operations specified to be called for that operation throws an exception.