Skip to content

Commit cee095e

Browse files
authored
[depr.conversions.string] remove redundent respecification (cplusplus#6004)
There are several typedef names defined precisely in the deprecated code conversion facets classes that are redundantly respecified in text. Nowhere else in the library does this; any specified typedef names are _see below_ definitions, not repeats of the class definition. Needless redundancy is always a risk of divergence, however small, so remove the respecification in text form.
1 parent 9296c05 commit cee095e

File tree

1 file changed

+5
-51
lines changed

1 file changed

+5
-51
lines changed

source/future.tex

+5-51
Original file line numberDiff line numberDiff line change
@@ -2133,6 +2133,10 @@
21332133
\end{example}
21342134

21352135
\indexlibraryglobal{wstring_convert}%
2136+
\indexlibrarymember{byte_string}{wstring_convert}%
2137+
\indexlibrarymember{int_type}{wstring_convert}%
2138+
\indexlibrarymember{state_type}{wstring_convert}%
2139+
\indexlibrarymember{wide_string}{wstring_convert}%
21362140
\begin{codeblock}
21372141
namespace std {
21382142
template<class Codecvt, class Elem = wchar_t,
@@ -2203,16 +2207,6 @@
22032207
\item \tcode{cvtcount} --- a conversion count
22042208
\end{itemize}
22052209

2206-
\indexlibrarymember{byte_string}{wstring_convert}%
2207-
\begin{itemdecl}
2208-
using byte_string = basic_string<char, char_traits<char>, ByteAlloc>;
2209-
\end{itemdecl}
2210-
2211-
\begin{itemdescr}
2212-
\pnum
2213-
The type shall be a synonym for \tcode{basic_string<char, char_traits<char>, ByteAlloc>}.
2214-
\end{itemdescr}
2215-
22162210
\indexlibrarymember{converted}{wstring_convert}%
22172211
\begin{itemdecl}
22182212
size_t converted() const noexcept;
@@ -2261,16 +2255,6 @@
22612255
Otherwise, the member function throws an object of class \tcode{range_error}.
22622256
\end{itemdescr}
22632257

2264-
\indexlibrarymember{int_type}{wstring_convert}%
2265-
\begin{itemdecl}
2266-
using int_type = typename wide_string::traits_type::int_type;
2267-
\end{itemdecl}
2268-
2269-
\begin{itemdescr}
2270-
\pnum
2271-
The type shall be a synonym for \tcode{wide_string::traits_type::int_type}.
2272-
\end{itemdescr}
2273-
22742258
\indexlibrarymember{state}{wstring_convert}%
22752259
\begin{itemdecl}
22762260
state_type state() const;
@@ -2282,16 +2266,6 @@
22822266
\tcode{cvtstate}.
22832267
\end{itemdescr}
22842268

2285-
\indexlibrarymember{state_type}{wstring_convert}%
2286-
\begin{itemdecl}
2287-
using state_type = typename Codecvt::state_type;
2288-
\end{itemdecl}
2289-
2290-
\begin{itemdescr}
2291-
\pnum
2292-
The type shall be a synonym for \tcode{Codecvt::state_type}.
2293-
\end{itemdescr}
2294-
22952269
\indexlibrarymember{to_bytes}{wstring_convert}%
22962270
\begin{itemdecl}
22972271
byte_string to_bytes(Elem wchar);
@@ -2329,17 +2303,6 @@
23292303
Otherwise, the member function shall throw an object of class \tcode{range_error}.
23302304
\end{itemdescr}
23312305

2332-
\indexlibrarymember{wide_string}{wstring_convert}%
2333-
\begin{itemdecl}
2334-
using wide_string = basic_string<Elem, char_traits<Elem>, WideAlloc>;
2335-
\end{itemdecl}
2336-
2337-
\begin{itemdescr}
2338-
\pnum
2339-
The type shall be a synonym for \tcode{basic_string<Elem,
2340-
char_traits<Elem>, WideAlloc>}.
2341-
\end{itemdescr}
2342-
23432306
\indexlibraryctor{wstring_convert}%
23442307
\begin{itemdecl}
23452308
explicit wstring_convert(Codecvt* pcvt);
@@ -2390,6 +2353,7 @@
23902353
without affecting any streams or locales.
23912354

23922355
\indexlibraryglobal{wbuffer_convert}%
2356+
\indexlibrarymember{state_type}{wbuffer_convert}%
23932357
\begin{codeblock}
23942358
namespace std {
23952359
template<class Codecvt, class Elem = wchar_t, class Tr = char_traits<Elem>>
@@ -2476,16 +2440,6 @@
24762440
The previous value of \tcode{bufptr}.
24772441
\end{itemdescr}
24782442

2479-
\indexlibrarymember{state_type}{wbuffer_convert}%
2480-
\begin{itemdecl}
2481-
using state_type = typename Codecvt::state_type;
2482-
\end{itemdecl}
2483-
2484-
\begin{itemdescr}
2485-
\pnum
2486-
The type shall be a synonym for \tcode{Codecvt::state_type}.
2487-
\end{itemdescr}
2488-
24892443
\indexlibraryctor{wbuffer_convert}%
24902444
\begin{itemdecl}
24912445
explicit wbuffer_convert(

0 commit comments

Comments
 (0)