Skip to content

Commit 27c1be4

Browse files
jensmaurertkoeppe
jensmaurer
authored and
tkoeppe
committed
[std] Use grammar typedef-name instead of 'typedef name'.
The former includes names introduced by alias-declarations, the latter (arguably) does not.
1 parent 5465744 commit 27c1be4

8 files changed

Lines changed: 17 additions & 17 deletions

File tree

‎source/atomics.tex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3825,7 +3825,7 @@
38253825
Each of the \grammarterm{using-declaration}s for
38263826
\tcode{int$N$_t}, \tcode{uint$N$_t}, \tcode{intptr_t}, and \tcode{uintptr_t}
38273827
listed above is defined if and only if the implementation defines
3828-
the corresponding typedef name in \ref{atomics.syn}.
3828+
the corresponding \grammarterm{typedef-name} in \ref{atomics.syn}.
38293829

38303830
\pnum
38313831
Neither the \tcode{_Atomic} macro,

‎source/basic.tex‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1106,7 +1106,7 @@
11061106
\begin{codeblock}
11071107
typedef unsigned char T;
11081108
template<class T
1109-
= T // lookup finds the typedef name of \tcode{\keyword{unsigned} \keyword{char}}
1109+
= T // lookup finds the \grammarterm{typedef-name}
11101110
, T // lookup finds the template parameter
11111111
N = 0> struct A { };
11121112
\end{codeblock}
@@ -1912,7 +1912,7 @@
19121912
The set of entities is determined entirely by
19131913
the types of the function arguments
19141914
(and any template template arguments).
1915-
Typedef names and \grammarterm{using-declaration}{s}
1915+
Any \grammarterm{typedef-name}s and \grammarterm{using-declaration}{s}
19161916
used to specify the types
19171917
do not contribute to this set.
19181918
The set of entities

‎source/classes.tex‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4140,8 +4140,8 @@
41404140
the function selected by overload resolution.
41414141
\begin{note}
41424142
Because access control applies to the declarations named, if access control is applied to a
4143-
typedef name, only the accessibility of the typedef name itself is considered.
4144-
The accessibility of the entity referred to by the typedef is not considered.
4143+
\grammarterm{typedef-name}, only the accessibility of the typedef or alias declaration itself is considered.
4144+
The accessibility of the entity referred to by the \grammarterm{typedef-name} is not considered.
41454145
For example,
41464146

41474147
\begin{codeblock}
@@ -4152,7 +4152,7 @@
41524152
};
41534153

41544154
void f() {
4155-
A::BB x; // OK, typedef name \tcode{A::BB} is public
4155+
A::BB x; // OK, typedef \tcode{A::BB} is public
41564156
A::B y; // access error, \tcode{A::B} is private
41574157
}
41584158
\end{codeblock}

‎source/compatibility.tex‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2241,9 +2241,9 @@
22412241

22422242
\diffref{dcl.typedef}
22432243
\change
2244-
A \Cpp{} typedef name must be different from any class type name declared
2244+
A \Cpp{} \grammarterm{typedef-name} must be different from any class type name declared
22452245
in the same scope (except if the typedef is a synonym of the class name with the
2246-
same name). In C, a typedef name and a struct tag name declared in the same scope
2246+
same name). In C, a \grammarterm{typedef-name} and a struct tag name declared in the same scope
22472247
can have the same name (because they have different name spaces).
22482248

22492249
Example:
@@ -2669,7 +2669,7 @@
26692669

26702670
\diffref{class.member.lookup}
26712671
\change
2672-
In \Cpp{}, a typedef name may not be redeclared in a class definition after being used in that definition.
2672+
In \Cpp{}, a \grammarterm{typedef-name} may not be redeclared in a class definition after being used in that definition.
26732673

26742674
Example:
26752675
\begin{codeblock}

‎source/iostreams.tex‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18187,8 +18187,8 @@
1818718187
\pnum
1818818188
Each of the \tcode{PRI} macros listed in this subclause
1818918189
is defined if and only if the implementation
18190-
defines the corresponding typedef name in~\ref{cstdint.syn}.
18190+
defines the corresponding \grammarterm{typedef-name} in~\ref{cstdint.syn}.
1819118191
Each of the \tcode{SCN} macros listed in this subclause
1819218192
is defined if and only if the implementation
18193-
defines the corresponding typedef name in~\ref{cstdint.syn} and
18193+
defines the corresponding \grammarterm{typedef-name} in~\ref{cstdint.syn} and
1819418194
has a suitable \tcode{fscanf} length modifier for the type.

‎source/strings.tex‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -661,7 +661,7 @@
661661
constexpr typename basic_string<charT, traits, Allocator>::size_type
662662
erase_if(basic_string<charT, traits, Allocator>& c, Predicate pred);
663663

664-
// \tcode{basic_string} typedef names
664+
// \tcode{basic_string} \grammarterm{typedef-name}s
665665
using @\libglobal{string}@ = basic_string<char>;
666666
using @\libglobal{u8string}@ = basic_string<char8_t>;
667667
using @\libglobal{u16string}@ = basic_string<char16_t>;
@@ -4013,7 +4013,7 @@
40134013
operator<<(basic_ostream<charT, traits>& os,
40144014
basic_string_view<charT, traits> str);
40154015

4016-
// \tcode{basic_string_view} typedef names
4016+
// \tcode{basic_string_view} \grammarterm{typedef-name}s
40174017
using string_view = basic_string_view<char>;
40184018
using u8string_view = basic_string_view<char8_t>;
40194019
using u16string_view = basic_string_view<char16_t>;

‎source/support.tex‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1935,13 +1935,13 @@
19351935
are also optional;
19361936
however, if an implementation defines integer types
19371937
with the corresponding width and no padding bits,
1938-
it defines the corresponding typedef names.
1938+
it defines the corresponding \grammarterm{typedef-name}s.
19391939
Each of the macros listed in this subclause
19401940
is defined if and only if
1941-
the implementation defines the corresponding typedef name.
1941+
the implementation defines the corresponding \grammarterm{typedef-name}.
19421942
\begin{note}
19431943
The macros \tcode{INT\placeholdernc{N}_C} and \tcode{UINT\placeholdernc{N}_C}
1944-
correspond to the typedef names
1944+
correspond to the \grammarterm{typedef-name}s
19451945
\tcode{int_least\placeholdernc{N}_t} and \tcode{uint_least\placeholdernc{N}_t},
19461946
respectively.
19471947
\end{note}

‎source/utilities.tex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21738,7 +21738,7 @@
2173821738
template<class Allocator>
2173921739
class basic_stacktrace;
2174021740

21741-
// \tcode{basic_stacktrace} typedef names
21741+
// \tcode{basic_stacktrace} \grammarterm{typedef-name}s
2174221742
using stacktrace = basic_stacktrace<allocator<stacktrace_entry>>;
2174321743

2174421744
// \ref{stacktrace.basic.nonmem}, non-member functions

0 commit comments

Comments
 (0)