LWG4428 Metafunctions should not be defined in terms of constant subexpressions

Author: burblebee

source/meta.tex

@@ -5454,13 +5454,14 @@
 
 \pnum
 \throws
-\tcode{meta::exception} unless
+\tcode{meta::exception} if
 \begin{itemize}
 \item
-  \tcode{nonstatic_data_members_of(\brk{}r, access_context::\brk{}unchecked())}
-  is a constant subexpression and
+  the evaluation of
+  \tcode{nonstatic_data_members_of(r, access_context::unchecked())}
+  would exit via an exception or
 \item
-  \tcode{r} does not represent a closure type.
+  \tcode{r} represents a closure type.
 \end{itemize}
 \end{itemdescr}
 
@@ -5477,9 +5478,9 @@
 
 \pnum
 \throws
-\tcode{meta::exception} unless
+\tcode{meta::exception} if the evaluation of
 \tcode{bases_of(r, access_context::unchecked())}
-is a constant subexpression.
+would exit via an exception.
 \end{itemdescr}
 
 \indexlibraryglobal{has_inaccessible_subobjects}%
@@ -6039,7 +6040,8 @@
 \tcode{meta::exception} unless
 \begin{itemize}
 \item
-  \tcode{annotations_of(item)} is a constant expression and
+  the evaluation of
+  \tcode{annotations_of(item)} would not exit via an exception and
 \item
   \tcode{dealias(type)} represents a type and
   \tcode{is_complete_type(type)} is \tcode{true}.