[cfe-commits] r89266 - /cfe/trunk/test/SemaCXX/using-directive.cpp

[John McCall]

Author: rjmccall
Date: Wed Nov 18 17:05:13 2009
New Revision: 89266

URL: http://llvm.org/viewvc/llvm-project?rev=89266&view=rev
Log:
Resolve this FIXME:  unelaborated lookups are ambiguous, too.


Modified:
    cfe/trunk/test/SemaCXX/using-directive.cpp

Modified: cfe/trunk/test/SemaCXX/using-directive.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/using-directive.cpp?rev=89266&r1=89265&r2=89266&view=diff

==============================================================================
--- cfe/trunk/test/SemaCXX/using-directive.cpp (original)
+++ cfe/trunk/test/SemaCXX/using-directive.cpp Wed Nov 18 17:05:13 2009
@@ -45,10 +45,10 @@
     using namespace E; // expected-error{{reference to 'E' is ambiguous}}
   }
 
-  struct K2 {}; // expected-note{{candidate found by name lookup is 'A::K2'}}
+  struct K2 {}; // expected-note 2{{candidate found by name lookup is 'A::K2'}}
 }
 
-struct K2 {}; // expected-note{{candidate found by name lookup is 'K2'}}
+struct K2 {}; // expected-note 2{{candidate found by name lookup is 'K2'}}
 
 using namespace A;
 
@@ -56,9 +56,7 @@
 
 struct K2 *k2; // expected-error{{reference to 'K2' is ambiguous}}
 
-// FIXME: This case is incorrectly diagnosed!
-//K2 k3;
-
+K2 *k3; // expected-error{{reference to 'K2' is ambiguous}}
 
 class X { // expected-note{{candidate found by name lookup is 'X'}}
   // FIXME: produce a suitable error message for this