Skip to content

Commit f9fd449

Browse files
[lib] Use CharT and Traits as template parameter names
1 parent 1dd46d8 commit f9fd449

12 files changed

+2962
-2962
lines changed

source/compatibility.tex

+1-1
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@
666666
\change
667667
Removed the \tcode{formatter} specialization:
668668
\begin{codeblock}
669-
template<size_t N> struct formatter<const charT[N], charT>;
669+
template<size_t N> struct formatter<const CharT[N], CharT>;
670670
\end{codeblock}
671671
\rationale
672672
The specialization is inconsistent with the design of \tcode{formatter},

source/containers.tex

+15-15
Original file line numberDiff line numberDiff line change
@@ -9825,8 +9825,8 @@
98259825
template<class Allocator> struct hash<vector<bool, Allocator>>;
98269826

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

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

1066510665
public:
1066610666
template<class ParseContext>
@@ -15622,8 +15622,8 @@
1562215622
struct uses_allocator<queue<T, Container>, Alloc>;
1562315623

1562415624
// \ref{container.adaptors.format}, formatter specialization for \tcode{queue}
15625-
template<class charT, class T, @\libconcept{formattable}@<charT> Container>
15626-
struct formatter<queue<T, Container>, charT>;
15625+
template<class CharT, class T, @\libconcept{formattable}@<CharT> Container>
15626+
struct formatter<queue<T, Container>, CharT>;
1562715627

1562815628
// \ref{priority.queue}, class template \tcode{priority_queue}
1562915629
template<class T, class Container = vector<T>,
@@ -15637,8 +15637,8 @@
1563715637
struct uses_allocator<priority_queue<T, Container, Compare>, Alloc>;
1563815638

1563915639
// \ref{container.adaptors.format}, formatter specialization for \tcode{priority_queue}
15640-
template<class charT, class T, @\libconcept{formattable}@<charT> Container, class Compare>
15641-
struct formatter<priority_queue<T, Container, Compare>, charT>;
15640+
template<class CharT, class T, @\libconcept{formattable}@<CharT> Container, class Compare>
15641+
struct formatter<priority_queue<T, Container, Compare>, CharT>;
1564215642
}
1564315643
\end{codeblock}
1564415644

@@ -16548,8 +16548,8 @@
1654816548
struct uses_allocator<stack<T, Container>, Alloc>;
1654916549

1655016550
// \ref{container.adaptors.format}, formatter specialization for \tcode{stack}
16551-
template<class charT, class T, @\libconcept{formattable}@<charT> Container>
16552-
struct formatter<stack<T, Container>, charT>;
16551+
template<class CharT, class T, @\libconcept{formattable}@<CharT> Container>
16552+
struct formatter<stack<T, Container>, CharT>;
1655316553
}
1655416554
\end{codeblock}
1655516555

@@ -20121,15 +20121,15 @@
2012120121
\indexlibraryglobal{formatter}%
2012220122
\begin{codeblock}
2012320123
namespace std {
20124-
template<class charT, class T, @\libconcept{formattable}@<charT> Container, class... U>
20125-
struct formatter<@\placeholder{adaptor-type}@<T, Container, U...>, charT> {
20124+
template<class CharT, class T, @\libconcept{formattable}@<CharT> Container, class... U>
20125+
struct formatter<@\placeholder{adaptor-type}@<T, Container, U...>, CharT> {
2012620126
private:
2012720127
using @\exposid{maybe-const-container}@ = // \expos
20128-
@\exposid{fmt-maybe-const}@<Container, charT>;
20128+
@\exposid{fmt-maybe-const}@<Container, CharT>;
2012920129
using @\exposid{maybe-const-adaptor}@ = // \expos
2013020130
@\exposid{maybe-const}@<is_const_v<@\exposid{maybe-const-container}@>, // see \ref{ranges.syn}
2013120131
@\placeholder{adaptor-type}@<T, Container, U...>>;
20132-
formatter<ranges::ref_view<@\exposid{maybe-const-container}@>, charT> @\exposid{underlying_}@; // \expos
20132+
formatter<ranges::ref_view<@\exposid{maybe-const-container}@>, CharT> @\exposid{underlying_}@; // \expos
2013320133

2013420134
public:
2013520135
template<class ParseContext>

source/diagnostics.tex

+8-8
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@
378378
\termref{defns.character}{character}{} type
379379
that precede the terminating null character type
380380
value
381-
\tcode{charT()}
381+
\tcode{CharT()}
382382

383383
\definition{observer function}{defns.observer}
384384
\defncontext{library}

0 commit comments

Comments
 (0)