Proposed resolution [SUPERSEDED]:

1. Change in 6.5.2 [class.member.lookup] paragraph 1 as follows:

   A search in a scope X for a name N from a program point P is a single search in X for N from P unless X is the scope of a class or class template T C, in which case the following steps define the result of the search.

2. Change in 6.5.2 [class.member.lookup] paragraph 4 as follows:

   [Note 2: If T C is incomplete, only base classes whose base-specifier appears before P are considered. If T C is an instantiated class, its base classes are not dependent. —end note]

3. Change in 6.5.2 [class.member.lookup] paragraph 6 as follows:

   The result of the search is the declaration set of S(N, T C). If it is an invalid set, the program is ill-formed. If it differs from the result of a search in T C for N in a complete-class context (11.4 [class.mem]) of T C, the program is ill-formed, no diagnostic required.

4. Change in 6.5.2 [class.member.lookup] paragraph 7 as follows:

   If N is a non-dependent conversion-function-id, conversion function templates that are members of T C are considered. For each such template F, the lookup set S(t, T C) is constructed, considering a function template declaration to have the name t only if it corresponds to a declaration of F (6.4.1 [basic.scope.scope]).

5. Change in 6.5.2 [class.member.lookup] paragraph 8 as follows:

   [Note 4: A static member, a nested type or an enumerator defined in a base class T B can unambiguously be found even if an object has more than one base class subobject of type T B. Two base class subobjects share the non-static member subobjects of their common virtual base classes. —end note]