Merge pull request #109 from ethoms/clang-warnings-stage2

Stage 2 of clang compiler warning patches.
pull/186/head
extrafu 2015-11-04 13:48:27 -05:00
commit d805cdfef4
4 changed files with 9 additions and 9 deletions

View File

@ -267,7 +267,7 @@
- (BOOL)isEqual:(id)_other {
if(_other == nil)
return NO;
if([_other class] != self->isa)
if([_other class] != object_getClass(self))
return NO;
if([_other hash] != [self hash])
return NO;

View File

@ -697,7 +697,7 @@
BOOL otherIsPersonal;
otherIsPersonal = ([otherFolder isKindOfClass: [SOGoContactGCSFolder class]]
|| ([otherFolder isKindOfClass: isa] && [otherFolder isPersonalSource]));
|| ([otherFolder isKindOfClass: object_getClass(self)] && [otherFolder isPersonalSource]));
if (isPersonalSource)
{

View File

@ -364,7 +364,7 @@ Class SOGoCacheGCSObjectK = Nil;
if (record)
{
if ([[record objectForKey: @"c_type"] intValue] == MAPIFolderCacheObject)
objectClass = isa;
objectClass = object_getClass(self);
else
objectClass = SOGoCacheGCSObjectK;

View File

@ -880,7 +880,7 @@
reason = [NSString stringWithFormat: @"method '%@' is not available"
@" for class '%@'", NSStringFromSelector (_cmd),
NSStringFromClass (isa)];
NSStringFromClass (object_getClass(self))];
return [NSException exceptionWithName: @"SQLSourceIOException"
reason: reason
@ -893,7 +893,7 @@
reason = [NSString stringWithFormat: @"method '%@' is not available"
@" for class '%@'", NSStringFromSelector (_cmd),
NSStringFromClass (isa)];
NSStringFromClass (object_getClass(self))];
return [NSException exceptionWithName: @"SQLSourceIOException"
reason: reason
@ -906,7 +906,7 @@
reason = [NSString stringWithFormat: @"method '%@' is not available"
@" for class '%@'", NSStringFromSelector (_cmd),
NSStringFromClass (isa)];
NSStringFromClass (object_getClass(self))];
return [NSException exceptionWithName: @"SQLSourceIOException"
reason: reason
@ -932,7 +932,7 @@
reason = [NSString stringWithFormat: @"method '%@' is not available"
@" for class '%@'", NSStringFromSelector (_cmd),
NSStringFromClass (isa)];
NSStringFromClass (object_getClass(self))];
return [NSException exceptionWithName: @"SQLSourceIOException"
reason: reason
@ -947,7 +947,7 @@
reason = [NSString stringWithFormat: @"method '%@' is not available"
@" for class '%@'", NSStringFromSelector (_cmd),
NSStringFromClass (isa)];
NSStringFromClass (object_getClass(self))];
return [NSException exceptionWithName: @"SQLSourceIOException"
reason: reason
@ -961,7 +961,7 @@
reason = [NSString stringWithFormat: @"method '%@' is not available"
@" for class '%@'", NSStringFromSelector (_cmd),
NSStringFromClass (isa)];
NSStringFromClass (object_getClass(self))];
return [NSException exceptionWithName: @"SQLSourceIOException"
reason: reason