summaryrefslogtreecommitdiffstats
path: root/clang/test/ASTMerge
diff options
context:
space:
mode:
authorSean Callanan <scallanan@apple.com>2016-11-07 21:10:31 +0000
committerSean Callanan <scallanan@apple.com>2016-11-07 21:10:31 +0000
commite8fee34c62f8cd1f89135fec35bf6031af0029fe (patch)
tree847deff6ca12a34213df65997ac71d9600ae180e /clang/test/ASTMerge
parent891bb4872c8098f8a851a92e989af3252b46f5ad (diff)
downloadbcm5719-llvm-e8fee34c62f8cd1f89135fec35bf6031af0029fe.tar.gz
bcm5719-llvm-e8fee34c62f8cd1f89135fec35bf6031af0029fe.zip
Updated ASTMerge/macro.m to use _Nullable.
llvm-svn: 286151
Diffstat (limited to 'clang/test/ASTMerge')
-rw-r--r--clang/test/ASTMerge/Inputs/macro1.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/test/ASTMerge/Inputs/macro1.h b/clang/test/ASTMerge/Inputs/macro1.h
index f089e612543..96133949678 100644
--- a/clang/test/ASTMerge/Inputs/macro1.h
+++ b/clang/test/ASTMerge/Inputs/macro1.h
@@ -2,4 +2,4 @@ typedef void *VoidRef;
void maybeNull(
int i,
- __nullable VoidRef *__nullable);
+ _Nullable VoidRef *_Nullable);
OpenPOWER on IntegriCloud