Skip to content

Commit d39a889

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

13 files changed

Lines changed: 2965 additions & 2965 deletions

source/compatibility.tex

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

299299
\diffref{istream.unformatted}
300300
\change
301-
Overloaded \tcode{std::basic_istream<char, traits>::ignore}.
301+
Overloaded \tcode{std::basic_istream<char, Traits>::ignore}.
302302
\rationale
303303
Allow \tcode{char} values to be used as delimiters.
304304
\effect
@@ -699,7 +699,7 @@
699699
\change
700700
Removed the \tcode{formatter} specialization:
701701
\begin{codeblock}
702-
template<size_t N> struct formatter<const charT[N], charT>;
702+
template<size_t N> struct formatter<const CharT[N], CharT>;
703703
\end{codeblock}
704704
\rationale
705705
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
@@ -9862,8 +9862,8 @@
98629862
template<class Allocator> struct hash<vector<bool, Allocator>>;
98639863

98649864
// \ref{vector.bool.fmt}, formatter specialization for \tcode{vector<bool>}
9865-
template<class T, class charT> requires @\exposid{is-vector-bool-reference}@<T>
9866-
struct formatter<T, charT>;
9865+
template<class T, class CharT> requires @\exposid{is-vector-bool-reference}@<T>
9866+
struct formatter<T, CharT>;
98679867
}
98689868
\end{codeblock}
98699869

@@ -10759,11 +10759,11 @@
1075910759
\indexlibraryglobal{formatter}%
1076010760
\begin{codeblock}
1076110761
namespace std {
10762-
template<class T, class charT>
10762+
template<class T, class CharT>
1076310763
requires @\exposid{is-vector-bool-reference}@<T>
10764-
struct formatter<T, charT> {
10764+
struct formatter<T, CharT> {
1076510765
private:
10766-
formatter<bool, charT> @\exposid{underlying_}@; // \expos
10766+
formatter<bool, CharT> @\exposid{underlying_}@; // \expos
1076710767

1076810768
public:
1076910769
template<class ParseContext>
@@ -15719,8 +15719,8 @@
1571915719
struct uses_allocator<queue<T, Container>, Alloc>;
1572015720

1572115721
// \ref{container.adaptors.format}, formatter specialization for \tcode{queue}
15722-
template<class charT, class T, @\libconcept{formattable}@<charT> Container>
15723-
struct formatter<queue<T, Container>, charT>;
15722+
template<class CharT, class T, @\libconcept{formattable}@<CharT> Container>
15723+
struct formatter<queue<T, Container>, CharT>;
1572415724

1572515725
template<class T, class Container>
1572615726
constexpr bool enable_nonlocking_formatter_optimization<queue<T, Container>> = false;
@@ -15737,8 +15737,8 @@
1573715737
struct uses_allocator<priority_queue<T, Container, Compare>, Alloc>;
1573815738

1573915739
// \ref{container.adaptors.format}, formatter specialization for \tcode{priority_queue}
15740-
template<class charT, class T, @\libconcept{formattable}@<charT> Container, class Compare>
15741-
struct formatter<priority_queue<T, Container, Compare>, charT>;
15740+
template<class CharT, class T, @\libconcept{formattable}@<CharT> Container, class Compare>
15741+
struct formatter<priority_queue<T, Container, Compare>, CharT>;
1574215742

1574315743
template<class T, class Container, class Compare>
1574415744
constexpr bool
@@ -16652,8 +16652,8 @@
1665216652
struct uses_allocator<stack<T, Container>, Alloc>;
1665316653

1665416654
// \ref{container.adaptors.format}, formatter specialization for \tcode{stack}
16655-
template<class charT, class T, @\libconcept{formattable}@<charT> Container>
16656-
struct formatter<stack<T, Container>, charT>;
16655+
template<class CharT, class T, @\libconcept{formattable}@<CharT> Container>
16656+
struct formatter<stack<T, Container>, CharT>;
1665716657

1665816658
template<class T, class Container>
1665916659
constexpr bool enable_nonlocking_formatter_optimization<stack<T, Container>> = false;
@@ -20335,15 +20335,15 @@
2033520335
\indexlibraryglobal{formatter}%
2033620336
\begin{codeblock}
2033720337
namespace std {
20338-
template<class charT, class T, @\libconcept{formattable}@<charT> Container, class... U>
20339-
struct formatter<@\placeholder{adaptor-type}@<T, Container, U...>, charT> {
20338+
template<class CharT, class T, @\libconcept{formattable}@<CharT> Container, class... U>
20339+
struct formatter<@\placeholder{adaptor-type}@<T, Container, U...>, CharT> {
2034020340
private:
2034120341
using @\exposid{maybe-const-container}@ = // \expos
20342-
@\exposid{fmt-maybe-const}@<Container, charT>;
20342+
@\exposid{fmt-maybe-const}@<Container, CharT>;
2034320343
using @\exposid{maybe-const-adaptor}@ = // \expos
2034420344
@\exposid{maybe-const}@<is_const_v<@\exposid{maybe-const-container}@>, // see \ref{ranges.syn}
2034520345
@\placeholder{adaptor-type}@<T, Container, U...>>;
20346-
formatter<ranges::ref_view<@\exposid{maybe-const-container}@>, charT> @\exposid{underlying_}@; // \expos
20346+
formatter<ranges::ref_view<@\exposid{maybe-const-container}@>, CharT> @\exposid{underlying_}@; // \expos
2034720347

2034820348
public:
2034920349
template<class ParseContext>

source/diagnostics.tex

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

743-
template<class charT, class traits>
744-
basic_ostream<charT, traits>&
745-
operator<<(basic_ostream<charT, traits>& os, const error_code& ec);
743+
template<class CharT, class Traits>
744+
basic_ostream<CharT, Traits>&
745+
operator<<(basic_ostream<CharT, Traits>& os, const error_code& ec);
746746

747747
// \ref{syserr.errcondition.nonmembers}, non-member functions
748748
error_condition make_error_condition(errc e) noexcept;
@@ -1052,9 +1052,9 @@
10521052
// \ref{syserr.errcode.nonmembers}, non-member functions
10531053
error_code make_error_code(errc e) noexcept;
10541054

1055-
template<class charT, class traits>
1056-
basic_ostream<charT, traits>&
1057-
operator<<(basic_ostream<charT, traits>& os, const error_code& ec);
1055+
template<class CharT, class Traits>
1056+
basic_ostream<CharT, Traits>&
1057+
operator<<(basic_ostream<CharT, Traits>& os, const error_code& ec);
10581058
}
10591059
\end{codeblock}
10601060

@@ -1225,8 +1225,8 @@
12251225

12261226
\indexlibrarymember{operator<<}{error_code}%
12271227
\begin{itemdecl}
1228-
template<class charT, class traits>
1229-
basic_ostream<charT, traits>& operator<<(basic_ostream<charT, traits>& os, const error_code& ec);
1228+
template<class CharT, class Traits>
1229+
basic_ostream<CharT, Traits>& operator<<(basic_ostream<CharT, Traits>& os, const error_code& ec);
12301230
\end{itemdecl}
12311231

12321232
\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)