diff options
Diffstat (limited to 'test/CXX/drs/dr0xx.cpp')
| -rw-r--r-- | test/CXX/drs/dr0xx.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/CXX/drs/dr0xx.cpp b/test/CXX/drs/dr0xx.cpp index 5b34cc3..dd0d4d1 100644 --- a/test/CXX/drs/dr0xx.cpp +++ b/test/CXX/drs/dr0xx.cpp @@ -425,7 +425,7 @@ namespace dr39 { // dr39: no using V::z; float &z(float); }; - struct C : A, B, virtual V {} c; + struct C : A, B, virtual V {} c; // expected-warning {{direct base 'dr39::example2::A' is inaccessible due to ambiguity:\n struct dr39::example2::C -> struct dr39::example2::A\n struct dr39::example2::C -> struct dr39::example2::B -> struct dr39::example2::A}} int &x = c.x(0); // expected-error {{found in multiple base classes}} // FIXME: This is valid, because we find the same static data member either way. int &y = c.y(0); // expected-error {{found in multiple base classes}} @@ -864,7 +864,7 @@ namespace dr77 { // dr77: yes namespace dr78 { // dr78: sup ???? // Under DR78, this is valid, because 'k' has static storage duration, so is // zero-initialized. - const int k; // expected-error {{default initialization of an object of const}} expected-note{{add an explicit initializer to initialize 'k'}} + const int k; // expected-error {{default initialization of an object of const}} } // dr79: na @@ -994,7 +994,7 @@ namespace dr91 { // dr91: yes int k = f(U()); } -namespace dr92 { // dr92: yes +namespace dr92 { // FIXME: Issue is still open. void f() throw(int, float); void (*p)() throw(int) = &f; // expected-error {{target exception specification is not superset of source}} void (*q)() throw(int); |
