aboutsummaryrefslogtreecommitdiff
path: root/lib/Sema/SemaDeclObjC.cpp
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 /lib/Sema/SemaDeclObjC.cpp
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 'lib/Sema/SemaDeclObjC.cpp')
-rw-r--r--lib/Sema/SemaDeclObjC.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index 27500fcd69..6be9c7ceeb 100644
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -1537,7 +1537,7 @@ void Sema::CheckProtocolMethodDefs(SourceLocation ImpLoc,
// uses the protocol.
if (ObjCMethodDecl *MethodInClass =
IDecl->lookupInstanceMethod(method->getSelector(),
- true /*noCategoryLookup*/))
+ true /*shallowCategoryLookup*/))
if (C || MethodInClass->isSynthesized())
continue;
unsigned DIAG = diag::warn_unimplemented_protocol_method;
@@ -1561,7 +1561,7 @@ void Sema::CheckProtocolMethodDefs(SourceLocation ImpLoc,
(!Super || !Super->lookupClassMethod(method->getSelector()))) {
// See above comment for instance method lookups.
if (C && IDecl->lookupClassMethod(method->getSelector(),
- true /*noCategoryLookup*/))
+ true /*shallowCategoryLookup*/))
continue;
unsigned DIAG = diag::warn_unimplemented_protocol_method;
if (Diags.getDiagnosticLevel(DIAG, ImpLoc) !=