[cfe-commits] r134039 - /cfe/trunk/test/CXX/basic/basic.lookup/basic.lookup.argdep/p4.cpp

[Chandler Carruth]

Author: chandlerc
Date: Tue Jun 28 17:58:10 2011
New Revision: 134039

URL: http://llvm.org/viewvc/llvm-project?rev=134039&view=rev
Log:
Update this test to reflect the new (deterministic) order in r134038.

This was part of Kaelyn's original patch that got dropped while I was
working on it, but after I ran my tests. =/ Sorry.

Modified:
    cfe/trunk/test/CXX/basic/basic.lookup/basic.lookup.argdep/p4.cpp

Modified: cfe/trunk/test/CXX/basic/basic.lookup/basic.lookup.argdep/p4.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/basic/basic.lookup/basic.lookup.argdep/p4.cpp?rev=134039&r1=134038&r2=134039&view=diff
==============================================================================
--- cfe/trunk/test/CXX/basic/basic.lookup/basic.lookup.argdep/p4.cpp (original)
+++ cfe/trunk/test/CXX/basic/basic.lookup/basic.lookup.argdep/p4.cpp Tue Jun 28 17:58:10 2011
@@ -20,7 +20,7 @@
 
 namespace C {
   class C {}; // expected-note {{candidate constructor (the implicit copy constructor) not viable: no known conversion from 'B::B' to 'const C::C &' for 1st argument}}
-  void func(C); // expected-note {{'D::func' declared here}} \
+  void func(C); // expected-note {{'C::func' declared here}} \
                 // expected-note {{passing argument to parameter here}}
   C operator+(C,C);
   D::D operator+(D::D,D::D);
@@ -38,7 +38,7 @@
     // delaying, or argument checking before emitting diagnostics is needed to
     // avoid accepting and printing out a typo correction that proves to be
     // incorrect once argument-dependent lookup resolution has occurred.
-    func(B::B()); // expected-error {{use of undeclared identifier 'func'; did you mean 'D::func'?}} \
+    func(B::B()); // expected-error {{use of undeclared identifier 'func'; did you mean 'C::func'?}} \
                   // expected-error {{no viable conversion from 'B::B' to 'C::C'}}
     func(C::C());
     A::A() + A::A();