summaryrefslogtreecommitdiffstats
path: root/clang/test/SemaObjCXX/Inputs/nullability-consistency-3.h
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2015-06-24 22:02:08 +0000
committerDouglas Gregor <dgregor@apple.com>2015-06-24 22:02:08 +0000
commitaea7afdc1304cfef3b2cf61793729b1f55f26d0a (patch)
tree80670a6c9757e83d93e42c74128d0730cbaea889 /clang/test/SemaObjCXX/Inputs/nullability-consistency-3.h
parent63d606bdcb606ace3cea3455dcaf0c3dac108d4e (diff)
downloadbcm5719-llvm-aea7afdc1304cfef3b2cf61793729b1f55f26d0a.tar.gz
bcm5719-llvm-aea7afdc1304cfef3b2cf61793729b1f55f26d0a.zip
Replace __double_underscored type nullability qualifiers with _Uppercase_underscored
Addresses a conflict with glibc's __nonnull macro by renaming the type nullability qualifiers as follows: __nonnull -> _Nonnull __nullable -> _Nullable __null_unspecified -> _Null_unspecified This is the major part of rdar://problem/21530726, but does not yet provide the Darwin-specific behavior for the old names. llvm-svn: 240596
Diffstat (limited to 'clang/test/SemaObjCXX/Inputs/nullability-consistency-3.h')
-rw-r--r--clang/test/SemaObjCXX/Inputs/nullability-consistency-3.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/test/SemaObjCXX/Inputs/nullability-consistency-3.h b/clang/test/SemaObjCXX/Inputs/nullability-consistency-3.h
index a0c0d381bb8..520d1a4b344 100644
--- a/clang/test/SemaObjCXX/Inputs/nullability-consistency-3.h
+++ b/clang/test/SemaObjCXX/Inputs/nullability-consistency-3.h
@@ -1 +1 @@
-void double_declarator1(int *__nonnull *); // expected-warning{{pointer is missing a nullability type specifier (__nonnull, __nullable, or __null_unspecified)}}
+void double_declarator1(int *_Nonnull *); // expected-warning{{pointer is missing a nullability type specifier (_Nonnull, _Nullable, or _Null_unspecified)}}
OpenPOWER on IntegriCloud