diff options
Diffstat (limited to 'clang/test')
| -rw-r--r-- | clang/test/CXX/class/class.mem/p2.cpp | 7 | ||||
| -rw-r--r-- | clang/test/CXX/drs/dr1xx.cpp | 4 | ||||
| -rw-r--r-- | clang/test/Parser/cxx-default-delete.cpp | 2 | ||||
| -rw-r--r-- | clang/test/SemaCXX/constructor.cpp | 3 |
4 files changed, 6 insertions, 10 deletions
diff --git a/clang/test/CXX/class/class.mem/p2.cpp b/clang/test/CXX/class/class.mem/p2.cpp index d45c0386065..1f0dfd05a20 100644 --- a/clang/test/CXX/class/class.mem/p2.cpp +++ b/clang/test/CXX/class/class.mem/p2.cpp @@ -76,13 +76,10 @@ namespace PR12629 { namespace PR12688 { struct S { - // FIXME: Producing one error saying this can't have the same name - // as the class because it's not a constructor, then producing - // another error saying this can't have a return type because - // it is a constructor, is redundant and inconsistent. + // FIXME: Maybe suppress the "constructor cannot have a return type" error + // if the return type is invalid. nonsense S() throw (more_nonsense); // \ // expected-error {{'nonsense'}} \ - // expected-error {{has the same name as its class}} \ // expected-error {{constructor cannot have a return type}} }; } diff --git a/clang/test/CXX/drs/dr1xx.cpp b/clang/test/CXX/drs/dr1xx.cpp index cc6c5af8170..d8d9307a5eb 100644 --- a/clang/test/CXX/drs/dr1xx.cpp +++ b/clang/test/CXX/drs/dr1xx.cpp @@ -943,10 +943,10 @@ namespace dr188 { // dr188: yes namespace dr194 { // dr194: yes struct A { A(); - void A(); // expected-error {{has the same name as its class}} expected-error {{constructor cannot have a return type}} + void A(); // expected-error {{constructor cannot have a return type}} }; struct B { - void B(); // expected-error {{has the same name as its class}} expected-error {{constructor cannot have a return type}} + void B(); // expected-error {{constructor cannot have a return type}} B(); }; struct C { diff --git a/clang/test/Parser/cxx-default-delete.cpp b/clang/test/Parser/cxx-default-delete.cpp index df24b3d0075..8766d861732 100644 --- a/clang/test/Parser/cxx-default-delete.cpp +++ b/clang/test/Parser/cxx-default-delete.cpp @@ -19,5 +19,5 @@ struct foo { void baz() = delete; struct quux { - int quux() = default; // expected-error{{constructor cannot have a return type}} expected-error {{member 'quux' has the same name as its class}} + int quux() = default; // expected-error{{constructor cannot have a return type}} }; diff --git a/clang/test/SemaCXX/constructor.cpp b/clang/test/SemaCXX/constructor.cpp index fa930bdb95d..105605c6e37 100644 --- a/clang/test/SemaCXX/constructor.cpp +++ b/clang/test/SemaCXX/constructor.cpp @@ -15,8 +15,7 @@ class Foo { virtual Foo(double); // expected-error{{constructor cannot be declared 'virtual'}} Foo(long) const; // expected-error{{'const' qualifier is not allowed on a constructor}} - int Foo(int, int); // expected-error{{constructor cannot have a return type}} \ - // expected-error{{member 'Foo' has the same name as its class}} + int Foo(int, int); // expected-error{{constructor cannot have a return type}} volatile Foo(float); // expected-error{{constructor cannot have a return type}} }; |
