Move specification of deprecated headers to Annex D

Author: tkoeppe

source/future.tex

@@ -50,6 +50,15 @@
 
 \rSec1[depr.c.headers]{C standard library headers}
 
+\pnum
+For compatibility with the C standard library\indextext{library!C standard},
+the \Cpp standard library provides headers
+\tcode{<ccomplex>}~(\ref{ccomplex.syn}),
+\tcode{<cstdalign>}~(\ref{cstdalign.syn}),
+\tcode{<cstdbool>}~(\ref{cstdbool.syn}),
+and \tcode{<ctgmath>}~(\ref{ctgmath.syn}).
+The use of these headers is deprecated.
+
 \pnum
 For compatibility with the 
 \indextext{library!C standard}%
@@ -94,14 +103,6 @@
 
 \end{floattable}
 
-\pnum
-The use of any of the \Cpp headers
-\tcode{<ccomplex>},
-\tcode{<cstdalign>},
-\tcode{<cstdbool>},
-or \tcode{<ctgmath>}
-is deprecated.
-
 \pnum
 Except for the functions declared in \ref{sf.cmath}, every C header, each of
 which has a name of the form
@@ -134,6 +135,71 @@
 the namespace \tcode{std}.
 \end{example}
 
+\rSec2[ccomplex.syn]{Header \tcode{<ccomplex>} synopsis}
+\indexlibrary{\idxhdr{ccomplex}}%
+
+\begin{codeblock}
+#include <complex>
+\end{codeblock}
+
+\pnum
+The header \tcode{<ccomplex>}
+behaves as if it simply includes the header
+\tcode{<complex>}~(\ref{complex.syn}).
+
+\rSec2[cstdalign.syn]{Header \tcode{<cstdalign>} synopsis}
+
+\indexlibrary{\idxcode{__alignas_is_defined}}%
+\indexlibrary{\idxhdr{cstdalign}}%
+\begin{codeblock}
+#define @\xname{alignas_is_defined}@ 1
+\end{codeblock}
+
+\pnum
+\indexlibrary{\idxhdr{cstdalign}}%
+\indexlibrary{\idxhdr{stdalign.h}}%
+The contents of the header \tcode{<cstdalign>} are the same as the C
+standard library header \tcode{<stdalign.h>}, with the following changes:
+The header \tcode{<cstdalign>} and the header \tcode{<stdalign.h>} shall not
+define a macro named \tcode{alignas}.
+
+\xref ISO C~7.15.
+
+\rSec2[cstdbool.syn]{Header \tcode{<cstdbool>} synopsis}
+
+\indexlibrary{\idxhdr{cstdbool}}%
+\indexlibrary{\idxcode{__bool_true_false_are_defined}}%
+\begin{codeblock}
+#define @\xname{bool_true_false_are_defined}@ 1
+\end{codeblock}
+
+\pnum
+\indexlibrary{\idxhdr{stdbool.h}}%
+The contents of the header \tcode{<cstdbool>} are the same as the C
+standard library header \tcode{<stdbool.h>}, with the following changes:
+The header \tcode{<cstdbool>} and the header \tcode{<stdbool.h>} shall not
+define macros named \tcode{bool}, \tcode{true}, or \tcode{false}.
+
+\xref ISO C~7.18.
+
+\rSec2[ctgmath.syn]{Header \tcode{<ctgmath>} synopsis}
+
+\indexlibrary{\idxhdr{ctgmath}}%
+\begin{codeblock}
+#include <complex>
+#include <cmath>
+\end{codeblock}
+
+\pnum
+The header \tcode{<ctgmath>} simply includes the headers
+\tcode{<complex>}~(\ref{complex.syn})
+and \tcode{<cmath>}~(\ref{cmath.syn}).
+
+\pnum
+\begin{note} The overloads provided in C by type-generic macros are already
+provided in \tcode{<complex>} and \tcode{<cmath>} by ``sufficient'' additional
+overloads.\end{note}
+
 \rSec1[depr.str.strstreams]{\tcode{char*} streams}
 
 \pnum

source/lib-intro.tex

@@ -1057,55 +1057,44 @@
 
 
 \pnum
-The facilities of the C standard library are provided in 26
-\indextext{library!C standard}%
-additional headers, as shown in Table~\ref{tab:cpp.c.headers}.%
+The facilities of the C standard library\indextext{library!C standard}
+are provided in 22 additional headers, as shown in Table~\ref{tab:cpp.c.headers}.%
 \footnote{It is intentional that there is no \Cpp header
 for any of these C headers:
-\indextext{\idxhdr{stdatomic.h}}%
-\indextext{\idxhdr{stdnoreturn.h}}%
-\indextext{\idxhdr{threads.h}}%
-\tcode{<stdatomic.h>},
-\tcode{<stdnoreturn.h>},
-\tcode{<threads.h>}.}
+\tcode{<stdatomic.h>}\indextext{\idxhdr{stdatomic.h}},
+\tcode{<stdnoreturn.h>}\indextext{\idxhdr{stdnoreturn.h}},
+\tcode{<threads.h>}\indextext{\idxhdr{threads.h}}.
+See also \ref{depr.c.headers} and \ref{diff.mods.to.headers}.}
 
 \begin{floattable}{\Cpp headers for C library facilities}{tab:cpp.c.headers}
 {lllll}
 \topline
-
 \tcode{<cassert>}           &
 \tcode{<cinttypes>}         &
 \tcode{<csignal>}           &
 \tcode{<cstdio>}            &
 \tcode{<cwchar>}            \\
 
-\tcode{<ccomplex>}          &
+\tcode{<cctype>}            &
 \tcode{<ciso646>}           &
-\tcode{<cstdalign>}         &
+\tcode{<cstdarg>}           &
 \tcode{<cstdlib>}           &
 \tcode{<cwctype>}           \\
 
-\tcode{<cctype>}            &
+\tcode{<cerrno>}            &
 \tcode{<climits>}           &
-\tcode{<cstdarg>}           &
+\tcode{<cstddef>}           &
 \tcode{<cstring>}           & \\
 
-\tcode{<cerrno>}            &
-\tcode{<clocale>}           &
-\tcode{<cstdbool>}          &
-\tcode{<ctgmath>}           & \\
-
 \tcode{<cfenv>}             &
-\tcode{<cmath>}             &
-\tcode{<cstddef>}           &
+\tcode{<clocale>}           &
+\tcode{<cstdint>}           &
 \tcode{<ctime>}             & \\
 
 \tcode{<cfloat>}            &
+\tcode{<cmath>}             &
 \tcode{<csetjmp>}           &
-\tcode{<cstdint>}           &
 \tcode{<cuchar>}            & \\
-
-
 \end{floattable}
 
 \pnum
@@ -1294,7 +1283,7 @@
 \ref{support.rtti}  & Type identification          &   \tcode{<typeinfo>}      \\ \rowsep
 \ref{support.exception} & Exception handling      &   \tcode{<exception>}     \\ \rowsep
 \ref{support.initlist}  & Initializer lists & \tcode{<initializer_list>} \\ \rowsep
-\ref{support.runtime} & Other runtime support     &   \tcode{<cstdalign>} \tcode{<cstdarg>} \tcode{<cstdbool>}       \\ \rowsep
+\ref{support.runtime} & Other runtime support     &   \tcode{<cstdarg>} \\ \rowsep
 \ref{meta} & Type traits     &   \tcode{<type_traits>}  \\ \rowsep
 \ref{atomics} & Atomics       &   \tcode{<atomic>}     \\
 \end{libsumtab}

source/numerics.tex

@@ -25,8 +25,7 @@
 \ref{numarray}  & Numeric arrays     & \tcode{<valarray>}  \\ \rowsep
 \ref{numeric.ops} & Generalized numeric operations  & \tcode{<numeric>} \\ \rowsep
 \ref{c.math}  & Mathematical functions for & \tcode{<cmath>}   \\
-              & floating point types       & \tcode{<ctgmath>} \\
-              &                            & \tcode{<cstdlib>} \\
+              & floating point types       & \tcode{<cstdlib>} \\
 \end{libsumtab}
 
 \rSec1[numerics.defns]{Definitions}
@@ -1358,17 +1357,6 @@
 \tcode{complex<float>\{0.0f, static_cast<float>(d)\}}.
 \end{itemdescr}
 
-\rSec2[ccomplex.syn]{Header \tcode{<ccomplex>} synopsis}
-\indexlibrary{\idxhdr{ccomplex}}%
-
-\begin{codeblock}
-#include <complex>
-\end{codeblock}
-
-\pnum
-The header \tcode{<ccomplex>}
-behaves as if it simply includes the header \tcode{<complex>}.
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -11283,20 +11271,3 @@
 \end{itemdescr}
 
 \indextext{mathematical special functions|)}
-
-\rSec2[ctgmath.syn]{Header \tcode{<ctgmath>} synopsis}
-
-\indexlibrary{\idxhdr{ctgmath}}%
-\begin{codeblock}
-#include <complex>
-#include <cmath>
-\end{codeblock}
-
-\pnum
-The header \tcode{<ctgmath>} simply includes the headers \tcode{<complex>}
-and \tcode{<cmath>}.
-
-\pnum
-\begin{note} The overloads provided in C by type-generic macros are already
-provided in \tcode{<complex>} and \tcode{<cmath>} by ``sufficient'' additional
-overloads.\end{note}

source/support.tex

@@ -32,12 +32,10 @@
 \ref{support.dynamic}     & Dynamic memory management &   \tcode{<new>}       \\ \rowsep
 \ref{support.rtti}        & Type identification       &   \tcode{<typeinfo>}  \\ \rowsep
 \ref{support.exception}   & Exception handling        &   \tcode{<exception>} \\ \rowsep
-\ref{support.initlist}    & Initializer lists & \tcode{<initializer_list>}    \\ \rowsep
+\ref{support.initlist}    & Initializer lists    & \tcode{<initializer_list>} \\ \rowsep
 \ref{support.runtime}     & Other runtime support     &   \tcode{<csignal>}   \\
                           &                           &   \tcode{<csetjmp>}   \\
-                          &                           &   \tcode{<cstdalign>} \\
                           &                           &   \tcode{<cstdarg>}   \\
-                          &                           &   \tcode{<cstdbool>}  \\
                           &                           &   \tcode{<cstdlib>}   \\
 \end{libsumtab}
 
@@ -3513,9 +3511,7 @@
 Headers
 \tcode{<csetjmp>} (nonlocal jumps),
 \tcode{<csignal>} (signal handling),
-\tcode{<cstdalign> (alignment),}
 \tcode{<cstdarg>} (variable arguments),
-\tcode{<cstdbool>} (\xname{bool_true_false_are_defined}),
 and
 \tcode{<cstdlib>} (runtime environment \tcode{getenv(), system()}),
 provide further compatibility with C code.
@@ -3620,41 +3616,6 @@
 
 \xref ISO C~7.13.
 
-\rSec2[cstdbool.syn]{Header \tcode{<cstdbool>} synopsis}
-
-\indexlibrary{\idxhdr{cstdbool}}%
-\indexlibrary{\idxcode{__bool_true_false_are_defined}}%
-\begin{codeblock}
-#define @\xname{bool_true_false_are_defined}@ 1
-\end{codeblock}
-
-\pnum
-\indexlibrary{\idxhdr{stdbool.h}}%
-The contents of the header \tcode{<cstdbool>} are the same as the C
-standard library header \tcode{<stdbool.h>}, with the following changes:
-The header \tcode{<cstdbool>} and the header \tcode{<stdbool.h>} shall not
-define macros named \tcode{bool}, \tcode{true}, or \tcode{false}.
-
-\xref ISO C~7.18.
-
-\rSec2[cstdalign.syn]{Header \tcode{<cstdalign>} synopsis}
-
-\indexlibrary{\idxcode{__alignas_is_defined}}%
-\indexlibrary{\idxhdr{cstdalign}}%
-\begin{codeblock}
-#define @\xname{alignas_is_defined}@ 1
-\end{codeblock}
-
-\pnum
-\indexlibrary{\idxhdr{cstdalign}}%
-\indexlibrary{\idxhdr{stdalign.h}}%
-The contents of the header \tcode{<cstdalign>} are the same as the C
-standard library header \tcode{<stdalign.h>}, with the following changes:
-The header \tcode{<cstdalign>} and the header \tcode{<stdalign.h>} shall not
-define a macro named \tcode{alignas}.
-
-\xref ISO C~7.15.
-
 \rSec2[csignal.syn]{Header \tcode{<csignal>} synopsis}
 
 \indexlibrary{\idxhdr{csignal}}%