Skip to content

Commit 19a9248

Browse files
jensmaurertkoeppe
jensmaurer
authored and
tkoeppe
committed
[lib] Remove superfluous typename in alias declarations
Also add an automatic check. Fixes NB US 64-127 (C++26 CD).
1 parent 088768b commit 19a9248

File tree

15 files changed

+223
-220
lines changed

15 files changed

+223
-220
lines changed

‎source/containers.tex‎

Lines changed: 66 additions & 67 deletions
Large diffs are not rendered by default.

‎source/exec.tex‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4777,7 +4777,7 @@
47774777
[]<class State, class Rcvr, class Tag, class... Args>(
47784778
auto, State, Rcvr& rcvr, Tag, Args&&... args) noexcept -> void {
47794779
if constexpr (@\libconcept{same_as}@<Tag, set_value_t>) {
4780-
using variant_type = typename State::type;
4780+
using variant_type = State::type;
47814781
@\exposid{TRY-SET-VALUE}@(rcvr, variant_type(@\exposid{decayed-tuple}@<Args...>{std::forward<Args>(args)...}));
47824782
} else {
47834783
Tag()(std::move(rcvr), std::forward<Args>(args)...);
@@ -5057,7 +5057,7 @@
50575057
template<class Sndr, class... Env>
50585058
static consteval void @\exposid{check-types}@() { // \expos
50595059
using associate_data_t = remove_cvref_t<@\exposid{data-type}@<Sndr>>;
5060-
using child_type_t = typename associate_data_t::@\exposid{wrap-sender}@;
5060+
using child_type_t = associate_data_t::@\exposid{wrap-sender}@;
50615061
(void)get_completion_signatures<child_type_t, @\exposid{FWD-ENV-T}@(Env)...>();
50625062
}
50635063
};

‎source/future.tex‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,11 +293,11 @@
293293
template<size_t Len, size_t Align = @\exposid{default-alignment}@> // \seebelow
294294
struct aligned_storage;
295295
template<size_t Len, size_t Align = @\exposid{default-alignment}@> // \seebelow
296-
using @\libglobal{aligned_storage_t}@ = typename aligned_storage<Len, Align>::type;
296+
using @\libglobal{aligned_storage_t}@ = aligned_storage<Len, Align>::type;
297297
template<size_t Len, class... Types>
298298
struct aligned_union;
299299
template<size_t Len, class... Types>
300-
using @\libglobal{aligned_union_t}@ = typename aligned_union<Len, Types...>::type;
300+
using @\libglobal{aligned_union_t}@ = aligned_union<Len, Types...>::type;
301301
}
302302
\end{codeblock}
303303

‎source/iostreams.tex‎

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1814,9 +1814,9 @@
18141814
class basic_ios : public ios_base {
18151815
public:
18161816
using char_type = charT;
1817-
using int_type = typename traits::int_type;
1818-
using pos_type = typename traits::pos_type;
1819-
using off_type = typename traits::off_type;
1817+
using int_type = traits::int_type;
1818+
using pos_type = traits::pos_type;
1819+
using off_type = traits::off_type;
18201820
using traits_type = traits;
18211821

18221822
// \ref{iostate.flags}, flags functions
@@ -2999,9 +2999,9 @@
29992999
class basic_streambuf {
30003000
public:
30013001
using char_type = charT;
3002-
using int_type = typename traits::int_type;
3003-
using pos_type = typename traits::pos_type;
3004-
using off_type = typename traits::off_type;
3002+
using int_type = traits::int_type;
3003+
using pos_type = traits::pos_type;
3004+
using off_type = traits::off_type;
30053005
using traits_type = traits;
30063006

30073007
virtual ~basic_streambuf();
@@ -4310,9 +4310,9 @@
43104310
public:
43114311
// types (inherited from \tcode{basic_ios}\iref{ios})
43124312
using char_type = charT;
4313-
using int_type = typename traits::int_type;
4314-
using pos_type = typename traits::pos_type;
4315-
using off_type = typename traits::off_type;
4313+
using int_type = traits::int_type;
4314+
using pos_type = traits::pos_type;
4315+
using off_type = traits::off_type;
43164316
using traits_type = traits;
43174317

43184318
// \ref{istream.cons}, constructor/destructor
@@ -5803,9 +5803,9 @@
58035803
public basic_ostream<charT, traits> {
58045804
public:
58055805
using char_type = charT;
5806-
using int_type = typename traits::int_type;
5807-
using pos_type = typename traits::pos_type;
5808-
using off_type = typename traits::off_type;
5806+
using int_type = traits::int_type;
5807+
using pos_type = traits::pos_type;
5808+
using off_type = traits::off_type;
58095809
using traits_type = traits;
58105810

58115811
// \ref{iostream.cons}, constructor
@@ -5934,9 +5934,9 @@
59345934
public:
59355935
// types (inherited from \tcode{basic_ios}\iref{ios})
59365936
using char_type = charT;
5937-
using int_type = typename traits::int_type;
5938-
using pos_type = typename traits::pos_type;
5939-
using off_type = typename traits::off_type;
5937+
using int_type = traits::int_type;
5938+
using pos_type = traits::pos_type;
5939+
using off_type = traits::off_type;
59405940
using traits_type = traits;
59415941

59425942
// \ref{ostream.cons}, constructor/destructor
@@ -8038,9 +8038,9 @@
80388038
class basic_stringbuf : public basic_streambuf<charT, traits> {
80398039
public:
80408040
using char_type = charT;
8041-
using int_type = typename traits::int_type;
8042-
using pos_type = typename traits::pos_type;
8043-
using off_type = typename traits::off_type;
8041+
using int_type = traits::int_type;
8042+
using pos_type = traits::pos_type;
8043+
using off_type = traits::off_type;
80448044
using traits_type = traits;
80458045
using allocator_type = Allocator;
80468046

@@ -8898,9 +8898,9 @@
88988898
class basic_istringstream : public basic_istream<charT, traits> {
88998899
public:
89008900
using char_type = charT;
8901-
using int_type = typename traits::int_type;
8902-
using pos_type = typename traits::pos_type;
8903-
using off_type = typename traits::off_type;
8901+
using int_type = traits::int_type;
8902+
using pos_type = traits::pos_type;
8903+
using off_type = traits::off_type;
89048904
using traits_type = traits;
89058905
using allocator_type = Allocator;
89068906

@@ -9269,9 +9269,9 @@
92699269
class basic_ostringstream : public basic_ostream<charT, traits> {
92709270
public:
92719271
using char_type = charT;
9272-
using int_type = typename traits::int_type;
9273-
using pos_type = typename traits::pos_type;
9274-
using off_type = typename traits::off_type;
9272+
using int_type = traits::int_type;
9273+
using pos_type = traits::pos_type;
9274+
using off_type = traits::off_type;
92759275
using traits_type = traits;
92769276
using allocator_type = Allocator;
92779277

@@ -9640,9 +9640,9 @@
96409640
class basic_stringstream : public basic_iostream<charT, traits> {
96419641
public:
96429642
using char_type = charT;
9643-
using int_type = typename traits::int_type;
9644-
using pos_type = typename traits::pos_type;
9645-
using off_type = typename traits::off_type;
9643+
using int_type = traits::int_type;
9644+
using pos_type = traits::pos_type;
9645+
using off_type = traits::off_type;
96469646
using traits_type = traits;
96479647
using allocator_type = Allocator;
96489648

@@ -10091,9 +10091,9 @@
1009110091
: public basic_streambuf<charT, traits> {
1009210092
public:
1009310093
using char_type = charT;
10094-
using int_type = typename traits::int_type;
10095-
using pos_type = typename traits::pos_type;
10096-
using off_type = typename traits::off_type;
10094+
using int_type = traits::int_type;
10095+
using pos_type = traits::pos_type;
10096+
using off_type = traits::off_type;
1009710097
using traits_type = traits;
1009810098

1009910099
// \ref{spanbuf.cons}, constructors
@@ -10418,9 +10418,9 @@
1041810418
: public basic_istream<charT, traits> {
1041910419
public:
1042010420
using char_type = charT;
10421-
using int_type = typename traits::int_type;
10422-
using pos_type = typename traits::pos_type;
10423-
using off_type = typename traits::off_type;
10421+
using int_type = traits::int_type;
10422+
using pos_type = traits::pos_type;
10423+
using off_type = traits::off_type;
1042410424
using traits_type = traits;
1042510425

1042610426
// \ref{ispanstream.cons}, constructors
@@ -10606,9 +10606,9 @@
1060610606
: public basic_ostream<charT, traits> {
1060710607
public:
1060810608
using char_type = charT;
10609-
using int_type = typename traits::int_type;
10610-
using pos_type = typename traits::pos_type;
10611-
using off_type = typename traits::off_type;
10609+
using int_type = traits::int_type;
10610+
using pos_type = traits::pos_type;
10611+
using off_type = traits::off_type;
1061210612
using traits_type = traits;
1061310613

1061410614
// \ref{ospanstream.cons}, constructors
@@ -10745,9 +10745,9 @@
1074510745
: public basic_iostream<charT, traits> {
1074610746
public:
1074710747
using char_type = charT;
10748-
using int_type = typename traits::int_type;
10749-
using pos_type = typename traits::pos_type;
10750-
using off_type = typename traits::off_type;
10748+
using int_type = traits::int_type;
10749+
using pos_type = traits::pos_type;
10750+
using off_type = traits::off_type;
1075110751
using traits_type = traits;
1075210752

1075310753
// \ref{spanstream.cons}, constructors
@@ -10989,9 +10989,9 @@
1098910989
class basic_filebuf : public basic_streambuf<charT, traits> {
1099010990
public:
1099110991
using char_type = charT;
10992-
using int_type = typename traits::int_type;
10993-
using pos_type = typename traits::pos_type;
10994-
using off_type = typename traits::off_type;
10992+
using int_type = traits::int_type;
10993+
using pos_type = traits::pos_type;
10994+
using off_type = traits::off_type;
1099510995
using traits_type = traits;
1099610996
using native_handle_type = @\impdefx{type of \tcode{native_handle_type}}@; // see \ref{file.native}
1099710997

@@ -11788,11 +11788,11 @@
1178811788
class basic_ifstream : public basic_istream<charT, traits> {
1178911789
public:
1179011790
using char_type = charT;
11791-
using int_type = typename traits::int_type;
11792-
using pos_type = typename traits::pos_type;
11793-
using off_type = typename traits::off_type;
11791+
using int_type = traits::int_type;
11792+
using pos_type = traits::pos_type;
11793+
using off_type = traits::off_type;
1179411794
using traits_type = traits;
11795-
using native_handle_type = typename basic_filebuf<charT, traits>::native_handle_type;
11795+
using native_handle_type = basic_filebuf<charT, traits>::native_handle_type;
1179611796

1179711797
// \ref{ifstream.cons}, constructors
1179811798
basic_ifstream();
@@ -12047,11 +12047,11 @@
1204712047
class basic_ofstream : public basic_ostream<charT, traits> {
1204812048
public:
1204912049
using char_type = charT;
12050-
using int_type = typename traits::int_type;
12051-
using pos_type = typename traits::pos_type;
12052-
using off_type = typename traits::off_type;
12050+
using int_type = traits::int_type;
12051+
using pos_type = traits::pos_type;
12052+
using off_type = traits::off_type;
1205312053
using traits_type = traits;
12054-
using native_handle_type = typename basic_filebuf<charT, traits>::native_handle_type;
12054+
using native_handle_type = basic_filebuf<charT, traits>::native_handle_type;
1205512055

1205612056
// \ref{ofstream.cons}, constructors
1205712057
basic_ofstream();
@@ -12304,11 +12304,11 @@
1230412304
class basic_fstream : public basic_iostream<charT, traits> {
1230512305
public:
1230612306
using char_type = charT;
12307-
using int_type = typename traits::int_type;
12308-
using pos_type = typename traits::pos_type;
12309-
using off_type = typename traits::off_type;
12307+
using int_type = traits::int_type;
12308+
using pos_type = traits::pos_type;
12309+
using off_type = traits::off_type;
1231012310
using traits_type = traits;
12311-
using native_handle_type = typename basic_filebuf<charT, traits>::native_handle_type;
12311+
using native_handle_type = basic_filebuf<charT, traits>::native_handle_type;
1231212312

1231312313
// \ref{fstream.cons}, constructors
1231412314
basic_fstream();
@@ -12621,9 +12621,9 @@
1262112621
class basic_syncbuf : public basic_streambuf<charT, traits> {
1262212622
public:
1262312623
using char_type = charT;
12624-
using int_type = typename traits::int_type;
12625-
using pos_type = typename traits::pos_type;
12626-
using off_type = typename traits::off_type;
12624+
using int_type = traits::int_type;
12625+
using pos_type = traits::pos_type;
12626+
using off_type = traits::off_type;
1262712627
using traits_type = traits;
1262812628
using allocator_type = Allocator;
1262912629

@@ -12934,9 +12934,9 @@
1293412934
class basic_osyncstream : public basic_ostream<charT, traits> {
1293512935
public:
1293612936
using char_type = charT;
12937-
using int_type = typename traits::int_type;
12938-
using pos_type = typename traits::pos_type;
12939-
using off_type = typename traits::off_type;
12937+
using int_type = traits::int_type;
12938+
using pos_type = traits::pos_type;
12939+
using off_type = traits::off_type;
1294012940
using traits_type = traits;
1294112941

1294212942
using allocator_type = Allocator;

‎source/iterators.tex‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@
771771
template<class T>
772772
requires requires { typename T::difference_type; }
773773
struct incrementable_traits<T> {
774-
using difference_type = typename T::difference_type;
774+
using difference_type = T::difference_type;
775775
};
776776

777777
template<class T>
@@ -1016,11 +1016,11 @@
10161016
\tcode{iterator_traits<I>}
10171017
has the following publicly accessible members:
10181018
\begin{codeblock}
1019-
using iterator_category = typename I::iterator_category;
1020-
using value_type = typename I::value_type;
1021-
using difference_type = typename I::difference_type;
1019+
using iterator_category = I::iterator_category;
1020+
using value_type = I::value_type;
1021+
using difference_type = I::difference_type;
10221022
using pointer = @\seebelow@;
1023-
using reference = typename I::reference;
1023+
using reference = I::reference;
10241024
\end{codeblock}
10251025
If the \grammarterm{qualified-id} \tcode{I::pointer} is valid and
10261026
denotes a type, then \tcode{iterator_traits<I>::pointer} names that type;
@@ -1034,8 +1034,8 @@
10341034
publicly accessible members:
10351035
\begin{codeblock}
10361036
using iterator_category = @\seebelow@;
1037-
using value_type = typename indirectly_readable_traits<I>::value_type;
1038-
using difference_type = typename incrementable_traits<I>::difference_type;
1037+
using value_type = indirectly_readable_traits<I>::value_type;
1038+
using difference_type = incrementable_traits<I>::difference_type;
10391039
using pointer = @\seebelow@;
10401040
using reference = @\seebelow@;
10411041
\end{codeblock}
@@ -3201,7 +3201,7 @@
32013201
using iterator_category = @\seebelow@;
32023202
using value_type = iter_value_t<Iterator>;
32033203
using difference_type = iter_difference_t<Iterator>;
3204-
using pointer = typename iterator_traits<Iterator>::pointer;
3204+
using pointer = iterator_traits<Iterator>::pointer;
32053205
using reference = iter_reference_t<Iterator>;
32063206

32073207
constexpr reverse_iterator();
@@ -5920,9 +5920,9 @@
59205920
using value_type = iter_value_t<I>; // present only
59215921
// if \tcode{I} models \libconcept{indirectly_readable}
59225922
using difference_type = iter_difference_t<I>;
5923-
using iterator_concept = typename I::iterator_concept; // present only
5923+
using iterator_concept = I::iterator_concept; // present only
59245924
// if the \grammarterm{qualified-id} \tcode{I::iterator_concept} is valid and denotes a type
5925-
using iterator_category = typename I::iterator_category; // present only
5925+
using iterator_category = I::iterator_category; // present only
59265926
// if the \grammarterm{qualified-id} \tcode{I::iterator_category} is valid and denotes a type
59275927
constexpr counted_iterator() requires @\libconcept{default_initializable}@<I> = default;
59285928
constexpr counted_iterator(I x, iter_difference_t<I> n);
@@ -6892,12 +6892,12 @@
68926892
public:
68936893
using iterator_category = input_iterator_tag;
68946894
using value_type = charT;
6895-
using difference_type = typename traits::off_type;
6895+
using difference_type = traits::off_type;
68966896
using pointer = @\unspec@;
68976897
using reference = charT;
68986898
using char_type = charT;
68996899
using traits_type = traits;
6900-
using int_type = typename traits::int_type;
6900+
using int_type = traits::int_type;
69016901
using streambuf_type = basic_streambuf<charT,traits>;
69026902
using istream_type = basic_istream<charT,traits>;
69036903

0 commit comments

Comments
 (0)