diff options
Diffstat (limited to 'test/CXX/conv/conv.mem/p4.cpp')
| -rw-r--r-- | test/CXX/conv/conv.mem/p4.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/CXX/conv/conv.mem/p4.cpp b/test/CXX/conv/conv.mem/p4.cpp index e0748d892362..1618ae125d2f 100644 --- a/test/CXX/conv/conv.mem/p4.cpp +++ b/test/CXX/conv/conv.mem/p4.cpp @@ -47,7 +47,7 @@ namespace test3 { // Can't be virtual even if there's a non-virtual path. namespace test4 { struct A : Base {}; - struct Derived : Base, virtual A {}; + struct Derived : Base, virtual A {}; // expected-warning {{direct base 'Base' is inaccessible due to ambiguity:\n struct test4::Derived -> struct Base\n struct test4::Derived -> struct test4::A -> struct Base}} void test() { int (Derived::*d) = data_ptr; // expected-error {{ambiguous conversion from pointer to member of base class 'Base' to pointer to member of derived class 'test4::Derived':}} int (Derived::*m)() = method_ptr; // expected-error {{ambiguous conversion from pointer to member of base class 'Base' to pointer to member of derived class 'test4::Derived':}} |