Skip to content

Commit c82e95c

Browse files
authored
[zombie.names] Turn lists of zombie names into tables (cplusplus#6925)
1 parent ccfb6ad commit c82e95c

File tree

1 file changed

+120
-95
lines changed

1 file changed

+120
-95
lines changed

Diff for: source/lib-intro.tex

+120-95
Original file line numberDiff line numberDiff line change
@@ -3021,107 +3021,132 @@
30213021
\indextext{brains!names that want to eat your}%
30223022

30233023
\pnum
3024-
In namespace \tcode{std}, the following names are reserved for previous standardization:
3025-
\begin{itemize}
3026-
\item \indexlibraryzombie{auto_ptr} \tcode{auto_ptr},
3027-
\item \indexlibraryzombie{auto_ptr_ref} \tcode{auto_ptr_ref},
3028-
\item \indexlibraryzombie{binary_function} \tcode{binary_function},
3029-
\item \indexlibraryzombie{binary_negate} \tcode{binary_negate},
3030-
\item \indexlibraryzombie{bind1st} \tcode{bind1st},
3031-
\item \indexlibraryzombie{bind2nd} \tcode{bind2nd},
3032-
\item \indexlibraryzombie{binder1st} \tcode{binder1st},
3033-
\item \indexlibraryzombie{binder2nd} \tcode{binder2nd},
3034-
\item \indexlibraryzombie{codecvt_mode} \tcode{codecvt_mode},
3035-
\item \indexlibraryzombie{codecvt_utf16} \tcode{codecvt_utf16},
3036-
\item \indexlibraryzombie{codecvt_utf8} \tcode{codecvt_utf8},
3037-
\item \indexlibraryzombie{codecvt_utf8_utf16} \tcode{codecvt_utf8_utf16},
3038-
\item \indexlibraryzombie{const_mem_fun1_ref_t} \tcode{const_mem_fun1_ref_t},
3039-
\item \indexlibraryzombie{const_mem_fun1_t} \tcode{const_mem_fun1_t},
3040-
\item \indexlibraryzombie{const_mem_fun_ref_t} \tcode{const_mem_fun_ref_t},
3041-
\item \indexlibraryzombie{const_mem_fun_t} \tcode{const_mem_fun_t},
3042-
\item \indexlibraryzombie{consume_header} \tcode{consume_header},
3043-
\item \indexlibraryzombie{declare_no_pointers} \tcode{declare_no_pointers},
3044-
\item \indexlibraryzombie{declare_reachable} \tcode{declare_reachable},
3045-
\item \indexlibraryzombie{generate_header} \tcode{generate_header},
3046-
\item \indexlibraryzombie{get_pointer_safety} \tcode{get_pointer_safety},
3047-
\item \indexlibraryzombie{get_temporary_buffer} \tcode{get_temporary_buffer},
3048-
\item \indexlibraryzombie{get_unexpected} \tcode{get_unexpected},
3049-
\item \indexlibraryzombie{gets} \tcode{gets},
3050-
\item \indexlibraryzombie{is_literal_type} \tcode{is_literal_type},
3051-
\item \indexlibraryzombie{is_literal_type_v} \tcode{is_literal_type_v},
3052-
\item \indexlibraryzombie{istrstream} \tcode{istrstream},
3053-
\item \indexlibraryzombie{little_endian} \tcode{little_endian},
3054-
\item \indexlibraryzombie{mem_fun1_ref_t} \tcode{mem_fun1_ref_t},
3055-
\item \indexlibraryzombie{mem_fun1_t} \tcode{mem_fun1_t},
3056-
\item \indexlibraryzombie{mem_fun_ref_t} \tcode{mem_fun_ref_t},
3057-
\item \indexlibraryzombie{mem_fun_ref} \tcode{mem_fun_ref},
3058-
\item \indexlibraryzombie{mem_fun_t} \tcode{mem_fun_t},
3059-
\item \indexlibraryzombie{mem_fun} \tcode{mem_fun},
3060-
\item \indexlibraryzombie{not1} \tcode{not1},
3061-
\item \indexlibraryzombie{not2} \tcode{not2},
3062-
\item \indexlibraryzombie{ostrstream} \tcode{ostrstream},
3063-
\item \indexlibraryzombie{pointer_safety} \tcode{pointer_safety},
3064-
\item \indexlibraryzombie{pointer_to_binary_function} \tcode{pointer_to_binary_function},
3065-
\item \indexlibraryzombie{pointer_to_unary_function} \tcode{pointer_to_unary_function},
3066-
\item \indexlibraryzombie{ptr_fun} \tcode{ptr_fun},
3067-
\item \indexlibraryzombie{random_shuffle} \tcode{random_shuffle},
3068-
\item \indexlibraryzombie{raw_storage_iterator} \tcode{raw_storage_iterator},
3069-
\item \indexlibraryzombie{result_of} \tcode{result_of},
3070-
\item \indexlibraryzombie{result_of_t} \tcode{result_of_t},
3071-
\item \indexlibraryzombie{return_temporary_buffer} \tcode{return_temporary_buffer},
3072-
\item \indexlibraryzombie{set_unexpected} \tcode{set_unexpected},
3073-
\item \indexlibraryzombie{strstream} \tcode{strstream},
3074-
\item \indexlibraryzombie{strstreambuf} \tcode{strstreambuf},
3075-
\item \indexlibraryzombie{unary_function} \tcode{unary_function},
3076-
\item \indexlibraryzombie{unary_negate} \tcode{unary_negate},
3077-
\item \indexlibraryzombie{uncaught_exception} \tcode{uncaught_exception},
3078-
\item \indexlibraryzombie{undeclare_no_pointers} \tcode{undeclare_no_pointers},
3079-
\item \indexlibraryzombie{undeclare_reachable} \tcode{undeclare_reachable},
3080-
\item \indexlibraryzombie{unexpected_handler} \tcode{unexpected_handler},
3081-
\item \indexlibraryzombie{wbuffer_convert} \tcode{wbuffer_convert},
3082-
and
3083-
\item \indexlibraryzombie{wstring_convert} \tcode{wstring_convert}.
3084-
\end{itemize}
3024+
In namespace \tcode{std}, the names shown in \tref{zombie.names.std} are
3025+
reserved for previous standardization:
3026+
3027+
\begin{multicolfloattable}{Zombie names in namespace \tcode{std}}{zombie.names.std}
3028+
{lll}
3029+
\indexlibraryzombie{auto_ptr} \tcode{auto_ptr} \\
3030+
\indexlibraryzombie{auto_ptr_ref} \tcode{auto_ptr_ref} \\
3031+
\indexlibraryzombie{binary_function} \tcode{binary_function} \\
3032+
\indexlibraryzombie{binary_negate} \tcode{binary_negate} \\
3033+
\indexlibraryzombie{bind1st} \tcode{bind1st} \\
3034+
\indexlibraryzombie{bind2nd} \tcode{bind2nd} \\
3035+
\indexlibraryzombie{binder1st} \tcode{binder1st} \\
3036+
\indexlibraryzombie{binder2nd} \tcode{binder2nd} \\
3037+
\indexlibraryzombie{codecvt_mode} \tcode{codecvt_mode} \\
3038+
\indexlibraryzombie{codecvt_utf16} \tcode{codecvt_utf16} \\
3039+
\indexlibraryzombie{codecvt_utf8} \tcode{codecvt_utf8} \\
3040+
\indexlibraryzombie{codecvt_utf8_utf16} \tcode{codecvt_utf8_utf16} \\
3041+
\indexlibraryzombie{const_mem_fun1_ref_t} \tcode{const_mem_fun1_ref_t} \\
3042+
\indexlibraryzombie{const_mem_fun1_t} \tcode{const_mem_fun1_t} \\
3043+
\indexlibraryzombie{const_mem_fun_ref_t} \tcode{const_mem_fun_ref_t} \\
3044+
\indexlibraryzombie{const_mem_fun_t} \tcode{const_mem_fun_t} \\
3045+
\indexlibraryzombie{consume_header} \tcode{consume_header} \\
3046+
\indexlibraryzombie{declare_no_pointers} \tcode{declare_no_pointers} \\
3047+
\indexlibraryzombie{declare_reachable} \tcode{declare_reachable} \\
3048+
\columnbreak
3049+
\indexlibraryzombie{generate_header} \tcode{generate_header} \\
3050+
\indexlibraryzombie{get_pointer_safety} \tcode{get_pointer_safety} \\
3051+
\indexlibraryzombie{get_temporary_buffer} \tcode{get_temporary_buffer} \\
3052+
\indexlibraryzombie{get_unexpected} \tcode{get_unexpected} \\
3053+
\indexlibraryzombie{gets} \tcode{gets} \\
3054+
\indexlibraryzombie{is_literal_type} \tcode{is_literal_type} \\
3055+
\indexlibraryzombie{is_literal_type_v} \tcode{is_literal_type_v} \\
3056+
\indexlibraryzombie{istrstream} \tcode{istrstream} \\
3057+
\indexlibraryzombie{little_endian} \tcode{little_endian} \\
3058+
\indexlibraryzombie{mem_fun1_ref_t} \tcode{mem_fun1_ref_t} \\
3059+
\indexlibraryzombie{mem_fun1_t} \tcode{mem_fun1_t} \\
3060+
\indexlibraryzombie{mem_fun_ref_t} \tcode{mem_fun_ref_t} \\
3061+
\indexlibraryzombie{mem_fun_ref} \tcode{mem_fun_ref} \\
3062+
\indexlibraryzombie{mem_fun_t} \tcode{mem_fun_t} \\
3063+
\indexlibraryzombie{mem_fun} \tcode{mem_fun} \\
3064+
\indexlibraryzombie{not1} \tcode{not1} \\
3065+
\indexlibraryzombie{not2} \tcode{not2} \\
3066+
\indexlibraryzombie{ostrstream} \tcode{ostrstream} \\
3067+
\indexlibraryzombie{pointer_safety} \tcode{pointer_safety} \\
3068+
\columnbreak
3069+
\indexlibraryzombie{pointer_to_binary_function} \tcode{pointer_to_binary_function} \\
3070+
\indexlibraryzombie{pointer_to_unary_function} \tcode{pointer_to_unary_function} \\
3071+
\indexlibraryzombie{ptr_fun} \tcode{ptr_fun} \\
3072+
\indexlibraryzombie{random_shuffle} \tcode{random_shuffle} \\
3073+
\indexlibraryzombie{raw_storage_iterator} \tcode{raw_storage_iterator} \\
3074+
\indexlibraryzombie{result_of} \tcode{result_of} \\
3075+
\indexlibraryzombie{result_of_t} \tcode{result_of_t} \\
3076+
\indexlibraryzombie{return_temporary_buffer} \tcode{return_temporary_buffer} \\
3077+
\indexlibraryzombie{set_unexpected} \tcode{set_unexpected} \\
3078+
\indexlibraryzombie{strstream} \tcode{strstream} \\
3079+
\indexlibraryzombie{strstreambuf} \tcode{strstreambuf} \\
3080+
\indexlibraryzombie{unary_function} \tcode{unary_function} \\
3081+
\indexlibraryzombie{unary_negate} \tcode{unary_negate} \\
3082+
\indexlibraryzombie{uncaught_exception} \tcode{uncaught_exception} \\
3083+
\indexlibraryzombie{undeclare_no_pointers} \tcode{undeclare_no_pointers} \\
3084+
\indexlibraryzombie{undeclare_reachable} \tcode{undeclare_reachable} \\
3085+
\indexlibraryzombie{unexpected_handler} \tcode{unexpected_handler} \\
3086+
\indexlibraryzombie{wbuffer_convert} \tcode{wbuffer_convert} \\
3087+
\indexlibraryzombie{wstring_convert} \tcode{wstring_convert} \\
3088+
\end{multicolfloattable}
3089+
30853090

30863091
\pnum
3087-
The following names are reserved as members for previous standardization,
3088-
and may not be used as a name for object-like macros in portable code:
3089-
\begin{itemize}
3090-
\item \indexlibraryzombie{argument_type} \tcode{argument_type},
3091-
\item \indexlibraryzombie{first_argument_type} \tcode{first_argument_type},
3092-
\item \indexlibraryzombie{io_state} \tcode{io_state},
3093-
\item \indexlibraryzombie{op} \tcode{op},
3094-
\item \indexlibraryzombie{open_mode} \tcode{open_mode},
3095-
\item \indexlibraryzombie{preferred} \tcode{preferred},
3096-
\item \indexlibraryzombie{second_argument_type} \tcode{second_argument_type},
3097-
\item \indexlibraryzombie{seek_dir} \tcode{seek_dir}, and
3098-
\item \indexlibraryzombie{strict} \tcode{strict}.
3099-
\end{itemize}
3092+
The names shown in \tref{zombie.names.objmacro} are reserved as members for
3093+
previous standardization, and may not be used as a name for object-like macros
3094+
in portable code:
3095+
3096+
\begin{multicolfloattable}{Zombie object-like macros}{zombie.names.objmacro}
3097+
{lll}
3098+
\indexlibraryzombie{argument_type} \tcode{argument_type} \\
3099+
\indexlibraryzombie{first_argument_type} \tcode{first_argument_type} \\
3100+
\indexlibraryzombie{io_state} \tcode{io_state} \\
3101+
\columnbreak
3102+
\indexlibraryzombie{op} \tcode{op} \\
3103+
\indexlibraryzombie{open_mode} \tcode{open_mode} \\
3104+
\indexlibraryzombie{preferred} \tcode{preferred} \\
3105+
\columnbreak
3106+
\indexlibraryzombie{second_argument_type} \tcode{second_argument_type} \\
3107+
\indexlibraryzombie{seek_dir} \tcode{seek_dir} \\
3108+
\indexlibraryzombie{strict} \tcode{strict} \\
3109+
\end{multicolfloattable}
3110+
31003111

31013112
\pnum
3102-
The following names are reserved as member functions for previous
3103-
standardization, and may not be used as a name for function-like macros in
3104-
portable code:
3105-
\begin{itemize}
3106-
\item \indexlibraryzombie{converted} \tcode{converted},
3107-
\item \indexlibraryzombie{from_bytes} \tcode{from_bytes},
3108-
\item \indexlibraryzombie{freeze} \tcode{freeze},
3109-
\item \indexlibraryzombie{pcount} \tcode{pcount},
3110-
\item \indexlibraryzombie{stossc} \tcode{stossc}, and
3111-
\item \indexlibraryzombie{to_bytes} \tcode{to_bytes}.
3112-
\end{itemize}
3113+
The names shown in \tref{zombie.names.fnmacro} are reserved as member functions
3114+
for previous standardization, and may not be used as a name for function-like
3115+
macros in portable code:
3116+
3117+
\begin{multicolfloattable}{Zombie function-like macros}{zombie.names.fnmacro}
3118+
{llllll}
3119+
\indexlibraryzombie{converted} \tcode{converted} \\
3120+
\columnbreak
3121+
\indexlibraryzombie{freeze} \tcode{freeze} \\
3122+
\columnbreak
3123+
\indexlibraryzombie{from_bytes} \tcode{from_bytes} \\
3124+
\columnbreak
3125+
\indexlibraryzombie{pcount} \tcode{pcount} \\
3126+
\columnbreak
3127+
\indexlibraryzombie{stossc} \tcode{stossc} \\
3128+
\columnbreak
3129+
\indexlibraryzombie{to_bytes} \tcode{to_bytes} \\
3130+
\end{multicolfloattable}
31133131

31143132
\pnum
3115-
The following header names are reserved for previous standardization:
3116-
\begin{itemize}
3117-
\item \libnoheader{ccomplex},
3118-
\item \libnoheader{ciso646},
3119-
\item \libnoheader{codecvt},
3120-
\item \libnoheader{cstdalign},
3121-
\item \libnoheader{cstdbool},
3122-
\item \libnoheader{ctgmath}, and
3123-
\item \libnoheader{strstream}.
3124-
\end{itemize}
3133+
The header names shown in \tref{zombie.names.header} are reserved for previous
3134+
standardization:
3135+
3136+
\begin{multicolfloattable}{Zombie headers}{zombie.names.header}
3137+
{lllll}
3138+
\libnoheader{ccomplex} \\
3139+
\libnoheader{ciso646} \\
3140+
\columnbreak
3141+
\libnoheader{codecvt} \\
3142+
\libnoheader{cstdalign} \\
3143+
\columnbreak
3144+
\libnoheader{cstdbool} \\
3145+
\columnbreak
3146+
\libnoheader{ctgmath} \\
3147+
\columnbreak
3148+
\libnoheader{strstream} \\
3149+
\end{multicolfloattable}
31253150

31263151
\rSec4[macro.names]{Macro names}
31273152

0 commit comments

Comments
 (0)