diff options
Diffstat (limited to 'clang/test')
| -rw-r--r-- | clang/test/SemaCXX/qual-id-test.cpp | 4 | ||||
| -rw-r--r-- | clang/test/SemaTemplate/instantiate-method.cpp | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/clang/test/SemaCXX/qual-id-test.cpp b/clang/test/SemaCXX/qual-id-test.cpp index ecb6aa9b359..02e69996c77 100644 --- a/clang/test/SemaCXX/qual-id-test.cpp +++ b/clang/test/SemaCXX/qual-id-test.cpp @@ -48,7 +48,7 @@ namespace C a.A::sub::x(); a.A::B::base::x(); - a.bad::x(); // expected-error{{type 'struct bad' is not a direct or virtual base of ''struct A::sub''}} + a.bad::x(); // expected-error{{type 'struct bad' is not a direct or virtual base of ''A::sub''}} a->foo(); a->member::foo(); @@ -69,7 +69,7 @@ namespace C a->A::sub::x(); a->A::B::base::x(); - a->bad::x(); // expected-error{{type 'struct bad' is not a direct or virtual base of ''struct A::sub''}} + a->bad::x(); // expected-error{{type 'struct bad' is not a direct or virtual base of ''A::sub''}} (*a)->foo(); (*a)->member::foo(); diff --git a/clang/test/SemaTemplate/instantiate-method.cpp b/clang/test/SemaTemplate/instantiate-method.cpp index a82e84d36c9..2351d882f9c 100644 --- a/clang/test/SemaTemplate/instantiate-method.cpp +++ b/clang/test/SemaTemplate/instantiate-method.cpp @@ -95,7 +95,9 @@ struct X0 : X0Base { template<typename U> struct X1 : X0<U> { int &f2() { - return X0Base::f(); // expected-error{{call to non-static member function without an object argument}} + // FIXME: We should be able to do this lookup and diagnose the error + // *despite* the fact that we can't decide the relationship yet. + return X0Base::f(); // expected-FIXME-error{{call to non-static member function without an object argument}} } }; |
