Merge 2020-11 CWG Motion 5

Author: tkoeppe

source/basic.tex

@@ -1910,6 +1910,14 @@
 \diffref{basic.scope}
 \change
 A \tcode{struct} is a scope in \Cpp{}, not in C.
+For example,
+\begin{codeblock}
+struct X {
+  struct Y { int a; } b;
+};
+struct Y c;
+\end{codeblock}
+is valid in C but not in \Cpp{}, which would require \tcode{X::Y c;}.
 \rationale
 Class scope is crucial to \Cpp{}, and a struct is a class.
 \effect
@@ -2603,7 +2611,7 @@
 \howwide
 Seldom.
 
-\diffref{class.nested.type}
+\diffref{class.member.lookup}
 \change
 In \Cpp{}, a typedef name may not be redeclared in a class definition after being used in that definition.
 

source/classes.tex

@@ -867,15 +867,14 @@
 \begin{itemize}
 \item
 either \tcode{remove_cvref_t<T>} is not a class type, or
-name lookup for the names \tcode{operator\&\&} and \tcode{operator||}
-within the scope of \tcode{remove_cvref_t<T>}
-as if by class member access lookup\iref{class.member.lookup}
-results in an empty declaration set; and
+a search for the names \tcode{operator\&\&} and \tcode{operator||}
+in the scope of \tcode{remove_cvref_t<T>}
+finds nothing; and
 
 \item
-name lookup for the names \tcode{operator\&\&} and \tcode{operator||} in
-the associated namespaces and
-entities of \tcode{T}\iref{basic.lookup.argdep}
+argument-dependent lookup\iref{basic.lookup.argdep}
+for the names \tcode{operator\&\&} and \tcode{operator||}
+with \tcode{T} as the only argument type
 finds no disqualifying declaration (defined below).
 \end{itemize}
 
@@ -942,8 +941,8 @@
 \begin{itemize}
 \item at least one disqualifying parameter is a key parameter; or
 \item the declaration contains no key parameters; or
-\item the declaration declares a function template that
-is not visible in its namespace\iref{namespace.memdef}.
+\item the declaration declares a function template
+to which no name is bound\iref{dcl.meaning}.
 \end{itemize}
 \end{itemize}