[depr.meta.types] Merge POD deprecation into existing type traits deprecation section and reorganize the section a bit

Author: tkoeppe

source/future.tex

@@ -2148,38 +2148,80 @@
 \begin{codeblock}
 namespace std {
   template <class T> struct is_literal_type;
-
   template <class T> constexpr bool is_literal_type_v = is_literal_type<T>::value;
 
-  template <class> struct result_of; // not defined
+  template <class> struct result_of;    // not defined
   template <class Fn, class... ArgTypes> struct result_of<Fn(ArgTypes...)>;
-
   template <class T> using result_of_t = typename result_of<T>::type;
+
+  template <class T> struct is_pod;
+  template <class T> inline constexpr bool is_pod_v = is_pod<T>::value;
 }
 \end{codeblock}
 
+\pnum
+The behavior of a program that adds specializations for
+any of the templates defined in this subclause is undefined,
+unless explicitly permitted by the specification of the corresponding template.
+
+\begin{itemdecl}
+template <class T> struct is_literal_type;
+\end{itemdecl}
+
+\begin{itemdescr}
 \pnum
 \requires
-For \tcode{is_literal_type},
 \tcode{remove_all_extents_t<T>} shall be a complete type or \cv{}~\tcode{void}.
-For \tcode{result_of<Fn(ArgTypes...)>},
-\tcode{Fn} and all types in the parameter pack \tcode{ArgTypes} shall be complete types,
-\cv{}~\tcode{void}, or arrays of unknown bound.
 
 \pnum
 \tcode{is_literal_type<T>} is a \tcode{UnaryTypeTrait}\iref{meta.rqmts}
 with a base characteristic of \tcode{true_type}
 if \tcode{T} is a literal type\iref{basic.types}, and
 \tcode{false_type} otherwise.
+\end{itemdescr}
+
+\begin{itemdecl}
+template <class Fn, class... ArgTypes> struct result_of<Fn(ArgTypes...)>;
+\end{itemdecl}
+
+\begin{itemdescr}
+\pnum
+\requires
+\tcode{Fn} and all types in the parameter pack \tcode{ArgTypes} shall be complete types,
+\cv{}~\tcode{void}, or arrays of unknown bound.
+
+\pnum
 The partial specialization \tcode{result_of<Fn(ArgTypes...)>} is a
-\tcode{TransformationTrait} whose member typedef \tcode{type} is defined
-if and only if \tcode{invoke_result<Fn, ArgTypes...>::type} is defined.
+\tcode{TransformationTrait}\iref{meta.rqmts} whose member typedef \tcode{type} is defined
+if and only if \tcode{invoke_result<Fn, ArgTypes...>::type}\iref{func.invoke} is defined.
 If \tcode{type} is defined, it names the same type as \tcode{invoke_result_t<Fn, ArgTypes...>}.
+\end{itemdescr}
+
+\begin{itemdecl}
+template <class T> struct is_pod;
+\end{itemdecl}
 
+\begin{itemdescr}
 \pnum
-The behavior of a program that adds specializations for
-any of the templates defined in this subclause is undefined,
-unless explicitly permitted by the specification of the corresponding template.
+\requires
+\tcode{remove_all_extents_t<T>} shall be a complete type or \cv{} \tcode{void}.
+
+\pnum
+\tcode{is_pod<T>} is a \tcode{UnaryTypeTrait}\iref{meta.rqmts}
+with a base characteristic of \tcode{true_type}
+if \tcode{T} is a POD type,
+and \tcode{false_type} otherwise.
+\indextext{POD}%
+A POD class is a class that is both a trivial class and a standard-layout class,
+and has no non-static data members of type non-POD class (or array thereof).
+A POD type is a scalar type, a POD class, an array of such a type,
+or a cv-qualified version of one of these types.
+
+\pnum
+\begin{note}
+It is unspecified whether a closure type\iref{expr.prim.lambda.closure} is a POD type.
+\end{note}
+\end{itemdescr}
 
 \rSec1[depr.iterator.primitives]{Deprecated iterator primitives}
 
@@ -3016,36 +3058,3 @@
 \pnum
 \effects The destructor shall delete \tcode{cvtptr}.
 \end{itemdescr}
-
-\rSec1[depr.ispod]{Identification of POD types}
-\indexlibrary{\idxcode{is_pod}}%
-
-\pnum
-The following type property
-is defined in header \indexhdr{type_traits}\tcode{<type_traits>}
-in addition to those defined in \ref{meta.unary.prop}:
-
-\begin{itemdecl}
-template <class T> struct is_pod;
-template <class T> inline constexpr bool is_pod_v = is_pod<T>::value;
-\end{itemdecl}
-
-\begin{itemdescr}
-\pnum
-\requires
-\tcode{remove_all_extents_t<T>} shall be a complete type or \cv{} \tcode{void}.
-
-\pnum
-\tcode{is_pod<T>} is a \tcode{UnaryTypeTrait}\iref{meta.rqmts}
-with a base characteristic of \tcode{true_type}
-if \tcode{T} is a POD type,
-and \tcode{false_type} otherwise.
-\indextext{POD}%
-A POD class is a class that is both a trivial class and a standard-layout class,
-and has no non-static data members of type non-POD class (or array thereof).
-A POD type is a scalar type, a POD class, an array of such a type,
-or a cv-qualified version of one of these types.
-\begin{note}
-It is unspecified whether a closure type\iref{expr.prim.lambda.closure} is a POD type.
-\end{note}
-\end{itemdescr}