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/lib/Sema/SemaCodeComplete.cpp | |
| parent | 63d606bdcb606ace3cea3455dcaf0c3dac108d4e (diff) | |
| download | llvm-aea7afdc1304cfef3b2cf61793729b1f55f26d0a.zip llvm-aea7afdc1304cfef3b2cf61793729b1f55f26d0a.tar.gz llvm-aea7afdc1304cfef3b2cf61793729b1f55f26d0a.tar.bz2 | |
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/lib/Sema/SemaCodeComplete.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaCodeComplete.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/Sema/SemaCodeComplete.cpp b/clang/lib/Sema/SemaCodeComplete.cpp index ebb6bbc..ff6a3ee 100644 --- a/clang/lib/Sema/SemaCodeComplete.cpp +++ b/clang/lib/Sema/SemaCodeComplete.cpp @@ -1343,9 +1343,9 @@ static void AddTypeSpecifierResults(const LangOptions &LangOpts, } // Nullability - Results.AddResult(Result("__nonnull", CCP_Type)); - Results.AddResult(Result("__null_unspecified", CCP_Type)); - Results.AddResult(Result("__nullable", CCP_Type)); + Results.AddResult(Result("_Nonnull", CCP_Type)); + Results.AddResult(Result("_Null_unspecified", CCP_Type)); + Results.AddResult(Result("_Nullable", CCP_Type)); } static void AddStorageSpecifiers(Sema::ParserCompletionContext CCC, |