diff options
| author | rdivacky <rdivacky@FreeBSD.org> | 2010-03-10 17:45:58 +0000 |
|---|---|---|
| committer | rdivacky <rdivacky@FreeBSD.org> | 2010-03-10 17:45:58 +0000 |
| commit | 27c39af73c0d7d0b97e57b3a905040d4cefc9708 (patch) | |
| tree | 56c1dd85a159948815817b5a90bedb39cf9ad105 /test/SemaCXX/constructor-initializer.cpp | |
| parent | d2e6cf1d1c6468396ec057119c32aa58b1ee5ac9 (diff) | |
| download | FreeBSD-src-27c39af73c0d7d0b97e57b3a905040d4cefc9708.zip FreeBSD-src-27c39af73c0d7d0b97e57b3a905040d4cefc9708.tar.gz | |
Update clang to r98164.
Diffstat (limited to 'test/SemaCXX/constructor-initializer.cpp')
| -rw-r--r-- | test/SemaCXX/constructor-initializer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/SemaCXX/constructor-initializer.cpp b/test/SemaCXX/constructor-initializer.cpp index 2efb7b9..96dfa8b 100644 --- a/test/SemaCXX/constructor-initializer.cpp +++ b/test/SemaCXX/constructor-initializer.cpp @@ -27,7 +27,7 @@ public: class E : public D, public B { public: - E() : B(), D() { } // expected-error{{base class initializer 'class B' names both a direct base class and an inherited virtual base class}} + E() : B(), D() { } // expected-error{{base class initializer 'B' names both a direct base class and an inherited virtual base class}} }; @@ -65,7 +65,7 @@ struct S : Y, virtual X { }; struct Z : S { - Z() : X(), S(), E() {} // expected-error {{type 'class E' is not a direct or virtual base of 'Z'}} + Z() : X(), S(), E() {} // expected-error {{type 'E' is not a direct or virtual base of 'Z'}} }; class U { @@ -104,13 +104,13 @@ struct M { // expected-note 2 {{candidate constructor (the implicit }; struct N : M { - N() : M(1), // expected-error {{no matching constructor for initialization of 'struct M'}} - m1(100) { } // expected-error {{no matching constructor for initialization of 'struct M'}} + N() : M(1), // expected-error {{no matching constructor for initialization of 'M'}} + m1(100) { } // expected-error {{no matching constructor for initialization of 'M'}} M m1; }; struct P : M { - P() { } // expected-error {{base class 'struct M'}} \ + P() { } // expected-error {{constructor for 'P' must explicitly initialize the base class 'M' which does not have a default constructor}} \ // expected-error {{member 'm'}} M m; // expected-note {{member is declared here}} }; |
