summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2012-04-05 22:14:12 +0000
committerFariborz Jahanian <fjahanian@apple.com>2012-04-05 22:14:12 +0000
commitbf393be8a0b8b573ceb23ed19ac953832a2a69e4 (patch)
tree1d637f75accac73f5e94a90e7e89b6d1124794c4 /include
parent856183c79a6fdb0291315223fb338d4895ba0cf1 (diff)
objective-c: Don't warn when a category does not implement a method
declared in its adopted protocol when another category declares it because that category will implement it. // rdar://11186449 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@154132 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
-rw-r--r--include/clang/AST/DeclObjC.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/clang/AST/DeclObjC.h b/include/clang/AST/DeclObjC.h
index 37a2e9ff8b..4ae073ec46 100644
--- a/include/clang/AST/DeclObjC.h
+++ b/include/clang/AST/DeclObjC.h
@@ -901,14 +901,14 @@ public:
// Lookup a method. First, we search locally. If a method isn't
// found, we search referenced protocols and class categories.
ObjCMethodDecl *lookupMethod(Selector Sel, bool isInstance,
- bool noCategoryLookup= false) const;
+ bool shallowCategoryLookup= false) const;
ObjCMethodDecl *lookupInstanceMethod(Selector Sel,
- bool noCategoryLookup = false) const {
- return lookupMethod(Sel, true/*isInstance*/, noCategoryLookup);
+ bool shallowCategoryLookup = false) const {
+ return lookupMethod(Sel, true/*isInstance*/, shallowCategoryLookup);
}
ObjCMethodDecl *lookupClassMethod(Selector Sel,
- bool noCategoryLookup = false) const {
- return lookupMethod(Sel, false/*isInstance*/, noCategoryLookup);
+ bool shallowCategoryLookup = false) const {
+ return lookupMethod(Sel, false/*isInstance*/, shallowCategoryLookup);
}
ObjCInterfaceDecl *lookupInheritedClass(const IdentifierInfo *ICName);