LWG3767 codecvt<charN_t, char8_t, mbstate_t> incorrectly added to locale

burblebee · tkoeppe · commit 28e1f3308e4e · 2024-04-16T00:39:18.000+01:00
diff --git a/source/future.tex b/source/future.tex
@@ -2410,6 +2410,8 @@
 \begin{codeblock}
 codecvt<char16_t, char, mbstate_t>
 codecvt<char32_t, char, mbstate_t>
+codecvt<char16_t, char8_t, mbstate_t>
+codecvt<char32_t, char8_t, mbstate_t>
 \end{codeblock}
 
 \pnum
@@ -2420,18 +2422,22 @@
 \begin{codeblock}
 codecvt_byname<char16_t, char, mbstate_t>
 codecvt_byname<char32_t, char, mbstate_t>
+codecvt_byname<char16_t, char8_t, mbstate_t>
+codecvt_byname<char32_t, char8_t, mbstate_t>
 \end{codeblock}
 
 \pnum
 The following class template specializations are required
 in addition to those specified in~\ref{locale.codecvt}.
 \indextext{UTF-8}%
 \indextext{UTF-16}%
-The specialization \tcode{codecvt<char16_t, char, mbstate_t>}
-converts between the UTF-16 and UTF-8 encoding forms, and
+The specializations \tcode{codecvt<char16_t, char, mbstate_t>} and
+\tcode{codecvt<char16_t, char8_t, mbstate_t>}
+convert between the UTF-16 and UTF-8 encoding forms, and
 \indextext{UTF-32}%
-the specialization \tcode{codecvt<char32_t, char, mbstate_t>}
-converts between the UTF-32 and UTF-8 encoding forms.
+the specializations \tcode{codecvt<char32_t, char, mbstate_t>} and
+\tcode{codecvt<char32_t, char8_t, mbstate_t>}
+convert between the UTF-32 and UTF-8 encoding forms.
 
 \rSec1[depr.fs.path.factory]{Deprecated filesystem path factory functions}
 
diff --git a/source/locales.tex b/source/locales.tex
@@ -320,8 +320,6 @@
 collate     &   \tcode{collate<char>}, \tcode{collate<wchar_t>}                 \\ \rowsep
 ctype       &   \tcode{ctype<char>}, \tcode{ctype<wchar_t>}                     \\
             &   \tcode{codecvt<char, char, mbstate_t>}                            \\
-            &   \tcode{codecvt<char16_t, char8_t, mbstate_t>}        \\
-            &   \tcode{codecvt<char32_t, char8_t, mbstate_t>}        \\
             &   \tcode{codecvt<wchar_t, char, mbstate_t>}                         \\ \rowsep
 monetary    &   \tcode{moneypunct<char>}, \tcode{moneypunct<wchar_t>}           \\
             &   \tcode{moneypunct<char, true>}, \tcode{moneypunct<wchar_t, true>} \\
@@ -356,8 +354,6 @@
 collate     &   \tcode{collate_byname<char>}, \tcode{collate_byname<wchar_t>}       \\ \rowsep
 ctype       &   \tcode{ctype_byname<char>}, \tcode{ctype_byname<wchar_t>}           \\
             &   \tcode{codecvt_byname<char, char, mbstate_t>}                       \\
-            &   \tcode{codecvt_byname<char16_t, char8_t, mbstate_t>}                   \\
-            &   \tcode{codecvt_byname<char32_t, char8_t, mbstate_t>}                   \\
             &   \tcode{codecvt_byname<wchar_t, char, mbstate_t>}                    \\ \rowsep
 monetary    &   \tcode{moneypunct_byname<char, International>}                      \\
             &   \tcode{moneypunct_byname<wchar_t, International>}                   \\
@@ -1684,13 +1680,6 @@
 convert the implementation-defined native character set.
 \tcode{codecvt<char, char, mbstate_t>} implements a degenerate conversion;
 it does not convert at all.
-\indextext{UTF-8}%
-\indextext{UTF-16}%
-\indextext{UTF-32}%
-The specialization \tcode{codecvt<char16_t, char8_t, mbstate_t>}
-converts between the UTF-16 and UTF-8 encoding forms, and
-the specialization \tcode{codecvt<char32_t, char8_t, mbstate_t>}
-converts between the UTF-32 and UTF-8 encoding forms.
 \tcode{codecvt<wchar_t, char, mbstate_t>}
 converts between the native character sets for ordinary and wide characters.
 Specializations on \tcode{mbstate_t}
