Skip to content

Commit 9430782

Browse files
authored
Merge 2018-11 CWG Motion 8
P1002R1 Try-catch blocks in constexpr functions Fixes #2400
2 parents fe38978 + 2763e99 commit 9430782

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

source/declarations.tex

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -797,22 +797,20 @@
797797
each of its parameter types shall be a literal type;
798798

799799
\item
800-
its \grammarterm{function-body} shall be
801-
\tcode{= delete}, \tcode{= default}, or
802-
a \grammarterm{compound-statement}
803-
that does not contain
804-
800+
its \grammarterm{function-body} shall not contain
805801
\begin{itemize}
806802
\item an \grammarterm{asm-definition},
807803
\item a \tcode{goto} statement,
808804
\item an identifier label\iref{stmt.label},
809-
\item a \grammarterm{try-block}, or
810805
\item a definition of a variable
811806
of non-literal type or
812807
of static or thread storage duration or
813808
for which no initialization is performed.
814809
\end{itemize}
815-
810+
\begin{note}
811+
A \grammarterm{function-body} that is \tcode{= delete} or \tcode{= default}
812+
contains none of the above.
813+
\end{note}
816814
\end{itemize}
817815

818816
\begin{example}
@@ -853,10 +851,7 @@
853851
the class shall not have any virtual base classes;
854852

855853
\item
856-
each of the parameter types shall be a literal type;
857-
858-
\item
859-
its \grammarterm{function-body} shall not be a \grammarterm{function-try-block}.
854+
each of the parameter types shall be a literal type.
860855
\end{itemize}
861856

862857
In addition, either its \grammarterm{function-body} shall be

0 commit comments

Comments
 (0)