summaryrefslogtreecommitdiffstats
path: root/clang/test/SemaCXX/ms_struct.cpp
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2015-07-28 16:48:12 +0000
committerNico Weber <nicolasweber@gmx.de>2015-07-28 16:48:12 +0000
commit5672e67b14bfa6b99ec9e3018c565ad27f864a73 (patch)
treeca66607a86dc46c6a62ad173a657339bdd2caf63 /clang/test/SemaCXX/ms_struct.cpp
parent2c656c9417d5f384815c382130813addd87f2551 (diff)
downloadbcm5719-llvm-5672e67b14bfa6b99ec9e3018c565ad27f864a73.tar.gz
bcm5719-llvm-5672e67b14bfa6b99ec9e3018c565ad27f864a73.zip
Rename -Wmsvc-include to -Wmicrosoft-include, now that -Wmicrosoft is split up.
(Keep -Wmsvc-include around as an alias.) While here, also replace the one other mention of "MSVC" in diagnostics with "Microsoft", for consistency. llvm-svn: 243444
Diffstat (limited to 'clang/test/SemaCXX/ms_struct.cpp')
-rw-r--r--clang/test/SemaCXX/ms_struct.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/clang/test/SemaCXX/ms_struct.cpp b/clang/test/SemaCXX/ms_struct.cpp
index 2832b5620f3..414b56b491c 100644
--- a/clang/test/SemaCXX/ms_struct.cpp
+++ b/clang/test/SemaCXX/ms_struct.cpp
@@ -11,9 +11,9 @@ struct A {
struct B : public A {
#ifdef TEST_FOR_ERROR
- // expected-error@-2 {{ms_struct may not produce MSVC-compatible layouts for classes with base classes or virtual functions}}
+ // expected-error@-2 {{ms_struct may not produce Microsoft-compatible layouts for classes with base classes or virtual functions}}
#else
- // expected-warning@-4 {{ms_struct may not produce MSVC-compatible layouts for classes with base classes or virtual functions}}
+ // expected-warning@-4 {{ms_struct may not produce Microsoft-compatible layouts for classes with base classes or virtual functions}}
#endif
unsigned long c:16;
int d;
@@ -26,9 +26,9 @@ static_assert(__builtin_offsetof(B, d) == 12,
// rdar://16178895
struct C {
#ifdef TEST_FOR_ERROR
- // expected-error@-2 {{ms_struct may not produce MSVC-compatible layouts for classes with base classes or virtual functions}}
+ // expected-error@-2 {{ms_struct may not produce Microsoft-compatible layouts for classes with base classes or virtual functions}}
#else
- // expected-warning@-4 {{ms_struct may not produce MSVC-compatible layouts for classes with base classes or virtual functions}}
+ // expected-warning@-4 {{ms_struct may not produce Microsoft-compatible layouts for classes with base classes or virtual functions}}
#endif
virtual void foo();
long long n;
OpenPOWER on IntegriCloud