summaryrefslogtreecommitdiffstats
path: root/clang/lib/Lex/PPMacroExpansion.cpp
diff options
context:
space:
mode:
authorJohn McCall <rjmccall@apple.com>2015-02-01 22:34:06 +0000
committerJohn McCall <rjmccall@apple.com>2015-02-01 22:34:06 +0000
commit2859258e2faf21a120a2e4ed096b9af092347ea7 (patch)
treec5a0b24a4b56d90142a58c0dccdf58f332501990 /clang/lib/Lex/PPMacroExpansion.cpp
parent53565c60e7dfe6cb7b7ba347298a0de87ed956af (diff)
downloadbcm5719-llvm-2859258e2faf21a120a2e4ed096b9af092347ea7.tar.gz
bcm5719-llvm-2859258e2faf21a120a2e4ed096b9af092347ea7.zip
Allow objc_bridge(id) to be used on typedefs of [cv] void*.
rdar://19678874 llvm-svn: 227774
Diffstat (limited to 'clang/lib/Lex/PPMacroExpansion.cpp')
-rw-r--r--clang/lib/Lex/PPMacroExpansion.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Lex/PPMacroExpansion.cpp b/clang/lib/Lex/PPMacroExpansion.cpp
index cd05d06633f..68c4f50df79 100644
--- a/clang/lib/Lex/PPMacroExpansion.cpp
+++ b/clang/lib/Lex/PPMacroExpansion.cpp
@@ -912,7 +912,8 @@ static bool HasFeature(const Preprocessor &PP, const IdentifierInfo *II) {
.Case("objc_dictionary_literals", LangOpts.ObjC2)
.Case("objc_boxed_expressions", LangOpts.ObjC2)
.Case("arc_cf_code_audited", true)
- .Case("objc_bridge_id", LangOpts.ObjC2)
+ .Case("objc_bridge_id", true)
+ .Case("objc_bridge_id_on_typedefs", true)
// C11 features
.Case("c_alignas", LangOpts.C11)
.Case("c_alignof", LangOpts.C11)
OpenPOWER on IntegriCloud