diff --git a/clang/test/SemaCXX/constructor-initializer.cpp b/clang/test/SemaCXX/constructor-initializer.cpp --- a/clang/test/SemaCXX/constructor-initializer.cpp +++ b/clang/test/SemaCXX/constructor-initializer.cpp @@ -94,11 +94,11 @@ Current() : Derived(1), ::Derived(), // expected-warning {{some initializers aren't given in the correct order}} \ // expected-note {{field 'Derived' will be initialized after base '::Derived'}} \ // expected-note {{base class '::Derived' will be initialized after base 'Derived::V'}} - ::Derived::Base(), // expected-error {{type '::Derived::Base' is not a direct or virtual base of 'Current'}} - Derived::Base1(), // expected-error {{type 'Derived::Base1' is not a direct or virtual base of 'Current'}} - Derived::V(), - ::NonExisting(), // expected-error {{member initializer 'NonExisting' does not name a non-static data member or}} - INT::NonExisting() {} // expected-error {{'INT' (aka 'int') is not a class, namespace, or enumeration}} \ + ::Derived::Base(), // expected-error {{type '::Derived::Base' is not a direct or virtual base of 'Current'}} + Derived::Base1(), // expected-error {{type 'Derived::Base1' is not a direct or virtual base of 'Current'}} + Derived::V(), + ::NonExisting(), // expected-error {{member initializer 'NonExisting' does not name a non-static data member or}} + INT::NonExisting() {} // expected-error {{'INT' (aka 'int') is not a class, namespace, or enumeration}} \ // expected-error {{member initializer 'NonExisting' does not name a non-static data member or}} }; diff --git a/clang/test/SemaCXX/warn-reorder-ctor-initialization.cpp b/clang/test/SemaCXX/warn-reorder-ctor-initialization.cpp --- a/clang/test/SemaCXX/warn-reorder-ctor-initialization.cpp +++ b/clang/test/SemaCXX/warn-reorder-ctor-initialization.cpp @@ -5,14 +5,13 @@ struct BB1 {}; class complex : public BB, BB1 { -public: +public: complex() - : s2(1), // expected-warning {{some initializers aren't given in the correct order}} expected-note {{field 's2' will be initialized after field 's1'}} - s1(1), - s3(3), // expected-note {{field 's3' will be initialized after base 'BB1'}} - BB1(), // expected-note {{base class 'BB1' will be initialized after base 'BB'}} - BB() - {} + : s2(1), // expected-warning {{some initializers aren't given in the correct order}} expected-note {{field 's2' will be initialized after field 's1'}} + s1(1), + s3(3), // expected-note {{field 's3' will be initialized after base 'BB1'}} + BB1(), // expected-note {{base class 'BB1' will be initialized after base 'BB'}} + BB() {} int s1; int s2; int s3;