@@ -226,17 +226,17 @@ struct CompareBitfieldWidthExpression { |
|
|
226 |
226 |
#else |
227 |
227 |
struct CompareMatchingBitfields compareMatchingBitfields; |
228 |
228 |
struct CompareBitfieldPresence1 compareBitfieldPresence1; |
229 |
|
-// expected-error@first.h:* {{'CompareBitfieldPresence1' has different definitions in different modules; first difference is definition in module 'First.Hidden' found bitfield 'bitfieldPresence1'}} |
230 |
|
-// expected-note@second.h:* {{but in 'Second' found non-bitfield 'bitfieldPresence1'}} |
|
229 |
+// expected-error@first.h:* {{'CompareBitfieldPresence1' has different definitions in different modules; first difference is definition in module 'First.Hidden' found bit-field 'bitfieldPresence1'}} |
|
230 |
+// expected-note@second.h:* {{but in 'Second' found non-bit-field 'bitfieldPresence1'}} |
231 |
231 |
struct CompareBitfieldPresence2 compareBitfieldPresence2; |
232 |
|
-// expected-error@first.h:* {{'CompareBitfieldPresence2' has different definitions in different modules; first difference is definition in module 'First.Hidden' found non-bitfield 'bitfieldPresence2'}} |
233 |
|
-// expected-note@second.h:* {{but in 'Second' found bitfield 'bitfieldPresence2'}} |
|
232 |
+// expected-error@first.h:* {{'CompareBitfieldPresence2' has different definitions in different modules; first difference is definition in module 'First.Hidden' found non-bit-field 'bitfieldPresence2'}} |
|
233 |
+// expected-note@second.h:* {{but in 'Second' found bit-field 'bitfieldPresence2'}} |
234 |
234 |
struct CompareBitfieldWidth compareBitfieldWidth; |
235 |
|
-// expected-error@first.h:* {{'CompareBitfieldWidth' has different definitions in different modules; first difference is definition in module 'First.Hidden' found bitfield 'bitfieldWidth' with one width expression}} |
236 |
|
-// expected-note@second.h:* {{but in 'Second' found bitfield 'bitfieldWidth' with different width expression}} |
|
235 |
+// expected-error@first.h:* {{'CompareBitfieldWidth' has different definitions in different modules; first difference is definition in module 'First.Hidden' found bit-field 'bitfieldWidth' with one width expression}} |
|
236 |
+// expected-note@second.h:* {{but in 'Second' found bit-field 'bitfieldWidth' with different width expression}} |
237 |
237 |
struct CompareBitfieldWidthExpression compareBitfieldWidthExpression; |
238 |
|
-// expected-error@first.h:* {{'CompareBitfieldWidthExpression' has different definitions in different modules; first difference is definition in module 'First.Hidden' found bitfield 'bitfieldWidthExpression' with one width expression}} |
239 |
|
-// expected-note@second.h:* {{but in 'Second' found bitfield 'bitfieldWidthExpression' with different width expressio}} |
|
238 |
+// expected-error@first.h:* {{'CompareBitfieldWidthExpression' has different definitions in different modules; first difference is definition in module 'First.Hidden' found bit-field 'bitfieldWidthExpression' with one width expression}} |
|
239 |
+// expected-note@second.h:* {{but in 'Second' found bit-field 'bitfieldWidthExpression' with different width expressio}} |
240 |
240 |
#endif |
241 |
241 |
|
242 |
242 |
#if defined(FIRST) |