summaryrefslogtreecommitdiffstats
path: root/clang/test/SemaCXX/anonymous-union.cpp
diff options
context:
space:
mode:
authorDavid Majnemer <david.majnemer@gmail.com>2014-12-10 23:08:43 +0000
committerDavid Majnemer <david.majnemer@gmail.com>2014-12-10 23:08:43 +0000
commit867b4d807b68ae3acfa964392016162da6934fda (patch)
tree8b8c0dafd737c31e68770aaa73d7b9780f1c4a2d /clang/test/SemaCXX/anonymous-union.cpp
parent96761959d42d8688a3f860b3b01a399a6c91890e (diff)
downloadbcm5719-llvm-867b4d807b68ae3acfa964392016162da6934fda.tar.gz
bcm5719-llvm-867b4d807b68ae3acfa964392016162da6934fda.zip
Forgot to commit this change with r223975
llvm-svn: 223979
Diffstat (limited to 'clang/test/SemaCXX/anonymous-union.cpp')
-rw-r--r--clang/test/SemaCXX/anonymous-union.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/test/SemaCXX/anonymous-union.cpp b/clang/test/SemaCXX/anonymous-union.cpp
index 3b568fd8704..46d426cf0c0 100644
--- a/clang/test/SemaCXX/anonymous-union.cpp
+++ b/clang/test/SemaCXX/anonymous-union.cpp
@@ -80,12 +80,12 @@ union { // expected-error{{anonymous unions at namespace or global scope must be
};
static union {
- int int_val2;
+ int int_val2; // expected-note{{previous definition is here}}
float float_val2;
};
void PR21858() {
- void int_val2();
+ void int_val2(); // expected-error{{redefinition of 'int_val2' as different kind of symbol}}
}
void f() {
OpenPOWER on IntegriCloud