Skip to content

Fix shadow warnings of a local variable versus an instance variable. #4548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 30, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions stdlib/public/runtime/SwiftObject.mm
Original file line number Diff line number Diff line change
Expand Up @@ -243,18 +243,18 @@ - (void)dealloc {
}

- (BOOL)isKindOfClass:(Class)someClass {
for (auto isa = _swift_getClassOfAllocated(self); isa != nullptr;
isa = _swift_getSuperclass(isa))
if (isa == (const ClassMetadata*) someClass)
for (auto cls = _swift_getClassOfAllocated(self); cls != nullptr;
cls = _swift_getSuperclass(cls))
if (cls == (const ClassMetadata*) someClass)
return YES;

return NO;
}

+ (BOOL)isSubclassOfClass:(Class)someClass {
for (auto isa = (const ClassMetadata*) self; isa != nullptr;
isa = _swift_getSuperclass(isa))
if (isa == (const ClassMetadata*) someClass)
for (auto cls = (const ClassMetadata*) self; cls != nullptr;
cls = _swift_getSuperclass(cls))
if (cls == (const ClassMetadata*) someClass)
return YES;

return NO;
Expand Down