Skip to content

Commit d7ff2ef

Browse files
[lib] Use CharT and Traits as template parameter names
1 parent 166fd7e commit d7ff2ef

File tree

13 files changed

+2955
-2955
lines changed

13 files changed

+2955
-2955
lines changed

source/compatibility.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@
307307

308308
\diffref{istream.unformatted}
309309
\change
310-
Overloaded \tcode{std::basic_istream<char, traits>::ignore}.
310+
Overloaded \tcode{std::basic_istream<char, Traits>::ignore}.
311311
\rationale
312312
Allow \tcode{char} values to be used as delimiters.
313313
\effect
@@ -708,7 +708,7 @@
708708
\change
709709
Removed the \tcode{formatter} specialization:
710710
\begin{codeblock}
711-
template<size_t N> struct formatter<const charT[N], charT>;
711+
template<size_t N> struct formatter<const CharT[N], CharT>;
712712
\end{codeblock}
713713
\rationale
714714
The specialization is inconsistent with the design of \tcode{formatter},

source/containers.tex

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9838,8 +9838,8 @@
98389838
template<class Allocator> struct hash<vector<bool, Allocator>>;
98399839

98409840
// \ref{vector.bool.fmt}, formatter specialization for \tcode{vector<bool>}
9841-
template<class T, class charT> requires @\exposid{is-vector-bool-reference}@<T>
9842-
struct formatter<T, charT>;
9841+
template<class T, class CharT> requires @\exposid{is-vector-bool-reference}@<T>
9842+
struct formatter<T, CharT>;
98439843
}
98449844
\end{codeblock}
98459845

@@ -10723,11 +10723,11 @@
1072310723
\indexlibraryglobal{formatter}%
1072410724
\begin{codeblock}
1072510725
namespace std {
10726-
template<class T, class charT>
10726+
template<class T, class CharT>
1072710727
requires @\exposid{is-vector-bool-reference}@<T>
10728-
struct formatter<T, charT> {
10728+
struct formatter<T, CharT> {
1072910729
private:
10730-
formatter<bool, charT> @\exposid{underlying_}@; // \expos
10730+
formatter<bool, CharT> @\exposid{underlying_}@; // \expos
1073110731

1073210732
public:
1073310733
template<class ParseContext>
@@ -15698,8 +15698,8 @@
1569815698
struct uses_allocator<queue<T, Container>, Alloc>;
1569915699

1570015700
// \ref{container.adaptors.format}, formatter specialization for \tcode{queue}
15701-
template<class charT, class T, @\libconcept{formattable}@<charT> Container>
15702-
struct formatter<queue<T, Container>, charT>;
15701+
template<class CharT, class T, @\libconcept{formattable}@<CharT> Container>
15702+
struct formatter<queue<T, Container>, CharT>;
1570315703

1570415704
template<class T, class Container>
1570515705
constexpr bool enable_nonlocking_formatter_optimization<queue<T, Container>> = false;
@@ -15716,8 +15716,8 @@
1571615716
struct uses_allocator<priority_queue<T, Container, Compare>, Alloc>;
1571715717

1571815718
// \ref{container.adaptors.format}, formatter specialization for \tcode{priority_queue}
15719-
template<class charT, class T, @\libconcept{formattable}@<charT> Container, class Compare>
15720-
struct formatter<priority_queue<T, Container, Compare>, charT>;
15719+
template<class CharT, class T, @\libconcept{formattable}@<CharT> Container, class Compare>
15720+
struct formatter<priority_queue<T, Container, Compare>, CharT>;
1572115721

1572215722
template<class T, class Container, class Compare>
1572315723
constexpr bool
@@ -16631,8 +16631,8 @@
1663116631
struct uses_allocator<stack<T, Container>, Alloc>;
1663216632

1663316633
// \ref{container.adaptors.format}, formatter specialization for \tcode{stack}
16634-
template<class charT, class T, @\libconcept{formattable}@<charT> Container>
16635-
struct formatter<stack<T, Container>, charT>;
16634+
template<class CharT, class T, @\libconcept{formattable}@<CharT> Container>
16635+
struct formatter<stack<T, Container>, CharT>;
1663616636

1663716637
template<class T, class Container>
1663816638
constexpr bool enable_nonlocking_formatter_optimization<stack<T, Container>> = false;
@@ -20314,15 +20314,15 @@
2031420314
\indexlibraryglobal{formatter}%
2031520315
\begin{codeblock}
2031620316
namespace std {
20317-
template<class charT, class T, @\libconcept{formattable}@<charT> Container, class... U>
20318-
struct formatter<@\placeholder{adaptor-type}@<T, Container, U...>, charT> {
20317+
template<class CharT, class T, @\libconcept{formattable}@<CharT> Container, class... U>
20318+
struct formatter<@\placeholder{adaptor-type}@<T, Container, U...>, CharT> {
2031920319
private:
2032020320
using @\exposid{maybe-const-container}@ = // \expos
20321-
@\exposid{fmt-maybe-const}@<Container, charT>;
20321+
@\exposid{fmt-maybe-const}@<Container, CharT>;
2032220322
using @\exposid{maybe-const-adaptor}@ = // \expos
2032320323
@\exposid{maybe-const}@<is_const_v<@\exposid{maybe-const-container}@>, // see \ref{ranges.syn}
2032420324
@\placeholder{adaptor-type}@<T, Container, U...>>;
20325-
formatter<ranges::ref_view<@\exposid{maybe-const-container}@>, charT> @\exposid{underlying_}@; // \expos
20325+
formatter<ranges::ref_view<@\exposid{maybe-const-container}@>, CharT> @\exposid{underlying_}@; // \expos
2032620326

2032720327
public:
2032820328
template<class ParseContext>

source/diagnostics.tex

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -737,9 +737,9 @@
737737
// \ref{syserr.errcode.nonmembers}, non-member functions
738738
error_code make_error_code(errc e) noexcept;
739739

740-
template<class charT, class traits>
741-
basic_ostream<charT, traits>&
742-
operator<<(basic_ostream<charT, traits>& os, const error_code& ec);
740+
template<class CharT, class Traits>
741+
basic_ostream<CharT, Traits>&
742+
operator<<(basic_ostream<CharT, Traits>& os, const error_code& ec);
743743

744744
// \ref{syserr.errcondition.nonmembers}, non-member functions
745745
error_condition make_error_condition(errc e) noexcept;
@@ -1049,9 +1049,9 @@
10491049
// \ref{syserr.errcode.nonmembers}, non-member functions
10501050
error_code make_error_code(errc e) noexcept;
10511051

1052-
template<class charT, class traits>
1053-
basic_ostream<charT, traits>&
1054-
operator<<(basic_ostream<charT, traits>& os, const error_code& ec);
1052+
template<class CharT, class Traits>
1053+
basic_ostream<CharT, Traits>&
1054+
operator<<(basic_ostream<CharT, Traits>& os, const error_code& ec);
10551055
}
10561056
\end{codeblock}
10571057

@@ -1222,8 +1222,8 @@
12221222

12231223
\indexlibrarymember{operator<<}{error_code}%
12241224
\begin{itemdecl}
1225-
template<class charT, class traits>
1226-
basic_ostream<charT, traits>& operator<<(basic_ostream<charT, traits>& os, const error_code& ec);
1225+
template<class CharT, class Traits>
1226+
basic_ostream<CharT, Traits>& operator<<(basic_ostream<CharT, Traits>& os, const error_code& ec);
12271227
\end{itemdecl}
12281228

12291229
\begin{itemdescr}

source/intro.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@
382382
\termref{defns.character}{character}{} type
383383
that precede the terminating null character type
384384
value
385-
\tcode{charT()}
385+
\tcode{CharT()}
386386

387387
\definition{observer function}{defns.observer}
388388
\defncontext{library}

0 commit comments

Comments
 (0)