Skip to content

Commit 8ea2c1d

Browse files
[lib] Use CharT and Traits as template parameter names
1 parent b1ff1df commit 8ea2c1d

File tree

13 files changed

+2952
-2952
lines changed

13 files changed

+2952
-2952
lines changed

source/compatibility.tex

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

335335
\diffref{istream.unformatted}
336336
\change
337-
Overloaded \tcode{std::basic_istream<char, traits>::ignore}.
337+
Overloaded \tcode{std::basic_istream<char, Traits>::ignore}.
338338
\rationale
339339
Allow \tcode{char} values to be used as delimiters.
340340
\effect
@@ -735,7 +735,7 @@
735735
\change
736736
Removed the \tcode{formatter} specialization:
737737
\begin{codeblock}
738-
template<size_t N> struct formatter<const charT[N], charT>;
738+
template<size_t N> struct formatter<const CharT[N], CharT>;
739739
\end{codeblock}
740740
\rationale
741741
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
@@ -9826,8 +9826,8 @@
98269826
template<class Allocator> struct hash<vector<bool, Allocator>>;
98279827

98289828
// \ref{vector.bool.fmt}, formatter specialization for \tcode{vector<bool>}
9829-
template<class T, class charT> requires @\exposid{is-vector-bool-reference}@<T>
9830-
struct formatter<T, charT>;
9829+
template<class T, class CharT> requires @\exposid{is-vector-bool-reference}@<T>
9830+
struct formatter<T, CharT>;
98319831
}
98329832
\end{codeblock}
98339833

@@ -10658,11 +10658,11 @@
1065810658
\indexlibraryglobal{formatter}%
1065910659
\begin{codeblock}
1066010660
namespace std {
10661-
template<class T, class charT>
10661+
template<class T, class CharT>
1066210662
requires @\exposid{is-vector-bool-reference}@<T>
10663-
struct formatter<T, charT> {
10663+
struct formatter<T, CharT> {
1066410664
private:
10665-
formatter<bool, charT> @\exposid{underlying_}@; // \expos
10665+
formatter<bool, CharT> @\exposid{underlying_}@; // \expos
1066610666

1066710667
public:
1066810668
template<class ParseContext>
@@ -15624,8 +15624,8 @@
1562415624
struct uses_allocator<queue<T, Container>, Alloc>;
1562515625

1562615626
// \ref{container.adaptors.format}, formatter specialization for \tcode{queue}
15627-
template<class charT, class T, @\libconcept{formattable}@<charT> Container>
15628-
struct formatter<queue<T, Container>, charT>;
15627+
template<class CharT, class T, @\libconcept{formattable}@<CharT> Container>
15628+
struct formatter<queue<T, Container>, CharT>;
1562915629

1563015630
// \ref{priority.queue}, class template \tcode{priority_queue}
1563115631
template<class T, class Container = vector<T>,
@@ -15639,8 +15639,8 @@
1563915639
struct uses_allocator<priority_queue<T, Container, Compare>, Alloc>;
1564015640

1564115641
// \ref{container.adaptors.format}, formatter specialization for \tcode{priority_queue}
15642-
template<class charT, class T, @\libconcept{formattable}@<charT> Container, class Compare>
15643-
struct formatter<priority_queue<T, Container, Compare>, charT>;
15642+
template<class CharT, class T, @\libconcept{formattable}@<CharT> Container, class Compare>
15643+
struct formatter<priority_queue<T, Container, Compare>, CharT>;
1564415644
}
1564515645
\end{codeblock}
1564615646

@@ -16550,8 +16550,8 @@
1655016550
struct uses_allocator<stack<T, Container>, Alloc>;
1655116551

1655216552
// \ref{container.adaptors.format}, formatter specialization for \tcode{stack}
16553-
template<class charT, class T, @\libconcept{formattable}@<charT> Container>
16554-
struct formatter<stack<T, Container>, charT>;
16553+
template<class CharT, class T, @\libconcept{formattable}@<CharT> Container>
16554+
struct formatter<stack<T, Container>, CharT>;
1655516555
}
1655616556
\end{codeblock}
1655716557

@@ -20103,15 +20103,15 @@
2010320103
\indexlibraryglobal{formatter}%
2010420104
\begin{codeblock}
2010520105
namespace std {
20106-
template<class charT, class T, @\libconcept{formattable}@<charT> Container, class... U>
20107-
struct formatter<@\placeholder{adaptor-type}@<T, Container, U...>, charT> {
20106+
template<class CharT, class T, @\libconcept{formattable}@<CharT> Container, class... U>
20107+
struct formatter<@\placeholder{adaptor-type}@<T, Container, U...>, CharT> {
2010820108
private:
2010920109
using @\exposid{maybe-const-container}@ = // \expos
20110-
@\exposid{fmt-maybe-const}@<Container, charT>;
20110+
@\exposid{fmt-maybe-const}@<Container, CharT>;
2011120111
using @\exposid{maybe-const-adaptor}@ = // \expos
2011220112
@\exposid{maybe-const}@<is_const_v<@\exposid{maybe-const-container}@>, // see \ref{ranges.syn}
2011320113
@\placeholder{adaptor-type}@<T, Container, U...>>;
20114-
formatter<ranges::ref_view<@\exposid{maybe-const-container}@>, charT> @\exposid{underlying_}@; // \expos
20114+
formatter<ranges::ref_view<@\exposid{maybe-const-container}@>, CharT> @\exposid{underlying_}@; // \expos
2011520115

2011620116
public:
2011720117
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)