Skip to content

Commit 6edbc1e

Browse files
[lib] Use CharT and Traits as template parameter names
1 parent 4452e28 commit 6edbc1e

File tree

12 files changed

+2948
-2948
lines changed

12 files changed

+2948
-2948
lines changed

source/compatibility.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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
@@ -9821,8 +9821,8 @@
98219821
template<class Allocator> struct hash<vector<bool, Allocator>>;
98229822

98239823
// \ref{vector.bool.fmt}, formatter specialization for \tcode{vector<bool>}
9824-
template<class T, class charT> requires @\exposid{is-vector-bool-reference}@<T>
9825-
struct formatter<T, charT>;
9824+
template<class T, class CharT> requires @\exposid{is-vector-bool-reference}@<T>
9825+
struct formatter<T, CharT>;
98269826
}
98279827
\end{codeblock}
98289828

@@ -10653,11 +10653,11 @@
1065310653
\indexlibraryglobal{formatter}%
1065410654
\begin{codeblock}
1065510655
namespace std {
10656-
template<class T, class charT>
10656+
template<class T, class CharT>
1065710657
requires @\exposid{is-vector-bool-reference}@<T>
10658-
struct formatter<T, charT> {
10658+
struct formatter<T, CharT> {
1065910659
private:
10660-
formatter<bool, charT> @\exposid{underlying_}@; // \expos
10660+
formatter<bool, CharT> @\exposid{underlying_}@; // \expos
1066110661

1066210662
public:
1066310663
template<class ParseContext>
@@ -15619,8 +15619,8 @@
1561915619
struct uses_allocator<queue<T, Container>, Alloc>;
1562015620

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

1562515625
// \ref{priority.queue}, class template \tcode{priority_queue}
1562615626
template<class T, class Container = vector<T>,
@@ -15634,8 +15634,8 @@
1563415634
struct uses_allocator<priority_queue<T, Container, Compare>, Alloc>;
1563515635

1563615636
// \ref{container.adaptors.format}, formatter specialization for \tcode{priority_queue}
15637-
template<class charT, class T, @\libconcept{formattable}@<charT> Container, class Compare>
15638-
struct formatter<priority_queue<T, Container, Compare>, charT>;
15637+
template<class CharT, class T, @\libconcept{formattable}@<CharT> Container, class Compare>
15638+
struct formatter<priority_queue<T, Container, Compare>, CharT>;
1563915639
}
1564015640
\end{codeblock}
1564115641

@@ -16545,8 +16545,8 @@
1654516545
struct uses_allocator<stack<T, Container>, Alloc>;
1654616546

1654716547
// \ref{container.adaptors.format}, formatter specialization for \tcode{stack}
16548-
template<class charT, class T, @\libconcept{formattable}@<charT> Container>
16549-
struct formatter<stack<T, Container>, charT>;
16548+
template<class CharT, class T, @\libconcept{formattable}@<CharT> Container>
16549+
struct formatter<stack<T, Container>, CharT>;
1655016550
}
1655116551
\end{codeblock}
1655216552

@@ -20098,15 +20098,15 @@
2009820098
\indexlibraryglobal{formatter}%
2009920099
\begin{codeblock}
2010020100
namespace std {
20101-
template<class charT, class T, @\libconcept{formattable}@<charT> Container, class... U>
20102-
struct formatter<@\placeholder{adaptor-type}@<T, Container, U...>, charT> {
20101+
template<class CharT, class T, @\libconcept{formattable}@<CharT> Container, class... U>
20102+
struct formatter<@\placeholder{adaptor-type}@<T, Container, U...>, CharT> {
2010320103
private:
2010420104
using @\exposid{maybe-const-container}@ = // \expos
20105-
@\exposid{fmt-maybe-const}@<Container, charT>;
20105+
@\exposid{fmt-maybe-const}@<Container, CharT>;
2010620106
using @\exposid{maybe-const-adaptor}@ = // \expos
2010720107
@\exposid{maybe-const}@<is_const_v<@\exposid{maybe-const-container}@>, // see \ref{ranges.syn}
2010820108
@\placeholder{adaptor-type}@<T, Container, U...>>;
20109-
formatter<ranges::ref_view<@\exposid{maybe-const-container}@>, charT> @\exposid{underlying_}@; // \expos
20109+
formatter<ranges::ref_view<@\exposid{maybe-const-container}@>, CharT> @\exposid{underlying_}@; // \expos
2011020110

2011120111
public:
2011220112
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
@@ -390,7 +390,7 @@
390390
\termref{defns.character}{character}{} type
391391
that precede the terminating null character type
392392
value
393-
\tcode{charT()}
393+
\tcode{CharT()}
394394

395395
\definition{observer function}{defns.observer}
396396
\defncontext{library}

0 commit comments

Comments
 (0)