Merge 2024-06 CWG Motion 2

P3345R0 Core Language Working Group "ready" Issues, issues 2819, 2858, and 2876 (and subsuming 2144)

Author: tkoeppe

source/declarations.tex

@@ -256,16 +256,29 @@
 \end{codeblock}
 \end{example}
 
+\pnum
+\indextext{initialization!definition and}%
+An object definition causes
+storage of appropriate size and alignment to be reserved and
+any appropriate initialization\iref{dcl.init} to be done.
+
 \pnum
 \indextext{definition!declaration as}%
 Syntactic components beyond those found in the general form of
 \grammarterm{simple-declaration} are added to a function declaration to make a
-\grammarterm{function-definition}. An object declaration, however, is also
-a definition unless it contains the \keyword{extern} specifier and has no
-initializer\iref{basic.def}.
-\indextext{initialization!definition and}%
-An object definition causes storage of appropriate size and alignment to be reserved and
-any appropriate initialization\iref{dcl.init} to be done.
+\grammarterm{function-definition}.
+A token sequence starting with \tcode{\{} or \tcode{=}
+is treated as a \grammarterm{function-body}\iref{dcl.fct.def.general}
+if the type of the \grammarterm{declarator-id}\iref{dcl.meaning.general}
+is a function type, and
+is otherwise
+treated as a \grammarterm{brace-or-equal-initializer}\iref{dcl.init.general}.
+\begin{note}
+If the declaration acquires a function type through template instantiation,
+the program is ill-formed; see \ref{temp.spec.general}.
+The function type of a function definition
+cannot be specified with a \grammarterm{typedef-name}\iref{dcl.fct}.
+\end{note}
 
 \pnum
 A \grammarterm{nodeclspec-function-declaration} shall declare a

source/expressions.tex

@@ -1661,7 +1661,7 @@
 a declarative \grammarterm{nested-name-specifier}.
 \end{itemize}
 A declarative \grammarterm{nested-name-specifier}
-shall not have a \grammarterm{decltype-specifier}.
+shall not have a \grammarterm{computed-type-specifier}.
 A declaration that uses a declarative \grammarterm{nested-name-specifier}
 shall be a friend declaration or
 inhabit a scope that contains the entity being redeclared or specialized.
@@ -7625,7 +7625,9 @@
 from a prvalue \tcode{P} of type ``pointer to \cv{}~\keyword{void}''
 to a type ``\cvqual{cv1} pointer to  \tcode{T}'',
 where  \tcode{T} is not \cvqual{cv2}~\keyword{void},
-unless \tcode{P} points to an object whose type is similar to \tcode{T};
+unless \tcode{P}
+is a null pointer value or
+points to an object whose type is similar to \tcode{T};
 
 \item
 a \keyword{reinterpret_cast}\iref{expr.reinterpret.cast};