diff options
| author | Douglas Gregor <dgregor@apple.com> | 2015-06-24 22:02:08 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2015-06-24 22:02:08 +0000 |
| commit | aea7afdc1304cfef3b2cf61793729b1f55f26d0a (patch) | |
| tree | 80670a6c9757e83d93e42c74128d0730cbaea889 /clang/test/SemaObjCXX/Inputs/nullability-consistency-5.h | |
| parent | 63d606bdcb606ace3cea3455dcaf0c3dac108d4e (diff) | |
| download | bcm5719-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-5.h')
| -rw-r--r-- | clang/test/SemaObjCXX/Inputs/nullability-consistency-5.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/test/SemaObjCXX/Inputs/nullability-consistency-5.h b/clang/test/SemaObjCXX/Inputs/nullability-consistency-5.h index 3a685af614e..1c74ab882a1 100644 --- a/clang/test/SemaObjCXX/Inputs/nullability-consistency-5.h +++ b/clang/test/SemaObjCXX/Inputs/nullability-consistency-5.h @@ -8,7 +8,7 @@ void suppress1(SUPPRESS_NULLABILITY_WARNING(int *) ptr); // no warning void shouldwarn5(int *ptr); //expected-warning{{missing a nullability type specifier}} -void trigger5(int * __nonnull); +void trigger5(int * _Nonnull); void suppress2(SUPPRESS_NULLABILITY_WARNING(int *) ptr); // no warning |
