summaryrefslogtreecommitdiffstats
path: root/clang/lib/AST
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2009-12-11 00:26:36 +0000
committerFariborz Jahanian <fjahanian@apple.com>2009-12-11 00:26:36 +0000
commit73fab4f3f49b7897284d7f5062f6efcc067eb550 (patch)
tree99f3e79a05cac70dd37f47c6ca5c1aad81d33607 /clang/lib/AST
parent18f41967921c120bb93afd072da299e03c97269e (diff)
downloadbcm5719-llvm-73fab4f3f49b7897284d7f5062f6efcc067eb550.tar.gz
bcm5719-llvm-73fab4f3f49b7897284d7f5062f6efcc067eb550.zip
Patch to fix a crash trying to access a category name in
objective-c++ mode and also removed dead-code in this area. (fixes radar 7456710). llvm-svn: 91081
Diffstat (limited to 'clang/lib/AST')
-rw-r--r--clang/lib/AST/DeclBase.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/AST/DeclBase.cpp b/clang/lib/AST/DeclBase.cpp
index 2022b4a28cd..3afb4e44f3e 100644
--- a/clang/lib/AST/DeclBase.cpp
+++ b/clang/lib/AST/DeclBase.cpp
@@ -198,7 +198,6 @@ unsigned Decl::getIdentifierNamespaceForKind(Kind DeclKind) {
case NonTypeTemplateParm:
case ObjCMethod:
case ObjCContainer:
- case ObjCCategory:
case ObjCInterface:
case ObjCProperty:
case ObjCCompatibleAlias:
@@ -220,8 +219,9 @@ unsigned Decl::getIdentifierNamespaceForKind(Kind DeclKind) {
case ObjCImplementation:
return IDNS_ObjCImplementation;
+ case ObjCCategory:
case ObjCCategoryImpl:
- return IDNS_ObjCCategoryImpl;
+ return IDNS_ObjCCategoryName;
case Field:
case ObjCAtDefsField:
OpenPOWER on IntegriCloud