When pretty-printing tag types, only print the tag if we're in C (and
therefore not creating ElaboratedTypes, which are still pretty-printed
with the written tag).
Most of these testcase changes were done by script, so don't feel too
sorry for my fingers.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@98149 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/SemaCXX/warn-reorder-ctor-initialization.cpp b/test/SemaCXX/warn-reorder-ctor-initialization.cpp
index 35b32b2..2634202 100644
--- a/test/SemaCXX/warn-reorder-ctor-initialization.cpp
+++ b/test/SemaCXX/warn-reorder-ctor-initialization.cpp
@@ -9,9 +9,9 @@
complex() : s2(1), // expected-warning {{member 's2' will be initialized after}}
s1(1) , // expected-note {{field s1}}
s3(3), // expected-warning {{member 's3' will be initialized after}}
- BB1(), // expected-note {{base 'struct BB1'}} \
- // expected-warning {{base class 'struct BB1' will be initialized after}}
- BB() {} // expected-note {{base 'struct BB'}}
+ BB1(), // expected-note {{base 'BB1'}} \
+ // expected-warning {{base class 'BB1' will be initialized after}}
+ BB() {} // expected-note {{base 'BB'}}
int s1;
int s2;
int s3;
@@ -44,14 +44,14 @@
struct D : public A, public B {
- D() : A(), V() { } // expected-warning {{base class 'struct A' will be initialized after}} \
- // expected-note {{base 'struct V'}}
+ D() : A(), V() { } // expected-warning {{base class 'A' will be initialized after}} \
+ // expected-note {{base 'V'}}
};
struct E : public A, public B, private virtual V {
- E() : A(), V() { } // expected-warning {{base class 'struct A' will be initialized after}} \
- // expected-note {{base 'struct V'}}
+ E() : A(), V() { } // expected-warning {{base class 'A' will be initialized after}} \
+ // expected-note {{base 'V'}}
};
@@ -64,13 +64,13 @@
};
struct F : public A1, public B1, private virtual V {
- F() : A1(), V() { } // expected-warning {{base class 'struct A1' will be initialized after}} \
- // expected-note {{base 'struct V'}}
+ F() : A1(), V() { } // expected-warning {{base class 'A1' will be initialized after}} \
+ // expected-note {{base 'V'}}
};
struct X : public virtual A, virtual V, public virtual B {
- X(): A(), V(), B() {} // expected-warning {{base class 'struct A' will be initialized after}} \
- // expected-note {{base 'struct V'}}
+ X(): A(), V(), B() {} // expected-warning {{base class 'A' will be initialized after}} \
+ // expected-note {{base 'V'}}
};
class Anon {