Skip to content

Commit 08c6abf

Browse files
[lib] Use CharT and Traits as template parameter names
1 parent 454ba17 commit 08c6abf

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
@@ -9820,8 +9820,8 @@
98209820
template<class Allocator> struct hash<vector<bool, Allocator>>;
98219821

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

@@ -10652,11 +10652,11 @@
1065210652
\indexlibraryglobal{formatter}%
1065310653
\begin{codeblock}
1065410654
namespace std {
10655-
template<class T, class charT>
10655+
template<class T, class CharT>
1065610656
requires @\exposid{is-vector-bool-reference}@<T>
10657-
struct formatter<T, charT> {
10657+
struct formatter<T, CharT> {
1065810658
private:
10659-
formatter<bool, charT> @\exposid{underlying_}@; // \expos
10659+
formatter<bool, CharT> @\exposid{underlying_}@; // \expos
1066010660

1066110661
public:
1066210662
template<class ParseContext>
@@ -15618,8 +15618,8 @@
1561815618
struct uses_allocator<queue<T, Container>, Alloc>;
1561915619

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

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

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

@@ -16544,8 +16544,8 @@
1654416544
struct uses_allocator<stack<T, Container>, Alloc>;
1654516545

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

@@ -20118,15 +20118,15 @@
2011820118
\indexlibraryglobal{formatter}%
2011920119
\begin{codeblock}
2012020120
namespace std {
20121-
template<class charT, class T, @\libconcept{formattable}@<charT> Container, class... U>
20122-
struct formatter<@\placeholder{adaptor-type}@<T, Container, U...>, charT> {
20121+
template<class CharT, class T, @\libconcept{formattable}@<CharT> Container, class... U>
20122+
struct formatter<@\placeholder{adaptor-type}@<T, Container, U...>, CharT> {
2012320123
private:
2012420124
using @\exposid{maybe-const-container}@ = // \expos
20125-
@\exposid{fmt-maybe-const}@<Container, charT>;
20125+
@\exposid{fmt-maybe-const}@<Container, CharT>;
2012620126
using @\exposid{maybe-const-adaptor}@ = // \expos
2012720127
@\exposid{maybe-const}@<is_const_v<@\exposid{maybe-const-container}@>, // see \ref{ranges.syn}
2012820128
@\placeholder{adaptor-type}@<T, Container, U...>>;
20129-
formatter<ranges::ref_view<@\exposid{maybe-const-container}@>, charT> @\exposid{underlying_}@; // \expos
20129+
formatter<ranges::ref_view<@\exposid{maybe-const-container}@>, CharT> @\exposid{underlying_}@; // \expos
2013020130

2013120131
public:
2013220132
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)