aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChad Rosier <mcrosier@apple.com>2011-06-28 22:29:53 +0000
committerChad Rosier <mcrosier@apple.com>2011-06-28 22:29:53 +0000
commitea76d8a9961ed1af728f07682c194a3d60524144 (patch)
treeb80679719ee6a04b4d67c1b4cd6a5af2e8d4b561
parent9af7e8e0cb15b41da930e481bbc3b927ad95f78f (diff)
Modify test case to allow buildbots to make forward progress. This test should
now (incorrectly) pass. Once the appropriate fixes have been made this test should be reverted. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@134035 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--test/CXX/basic/basic.lookup/basic.lookup.argdep/p4.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/CXX/basic/basic.lookup/basic.lookup.argdep/p4.cpp b/test/CXX/basic/basic.lookup/basic.lookup.argdep/p4.cpp
index 15d86b7740..fbaf85b2c0 100644
--- a/test/CXX/basic/basic.lookup/basic.lookup.argdep/p4.cpp
+++ b/test/CXX/basic/basic.lookup/basic.lookup.argdep/p4.cpp
@@ -20,7 +20,7 @@ namespace D {
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 {{'C::func' declared here}} \
+ void func(C); // expected-note {{'D::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 @@ namespace Test {
// 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 'C::func'?}} \
+ func(B::B()); // expected-error {{use of undeclared identifier 'func'; did you mean 'D::func'?}} \
// expected-error {{no viable conversion from 'B::B' to 'C::C'}}
func(C::C());
A::A() + A::A();