Skip to content
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.

Sign up for GitHub

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

Fix some minor warnings #87

Merged
merged 3 commits into from
Oct 22, 2013
Merged

Fix some minor warnings #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
830ee85
Use correct NSNumber method for incoming type.
mbaltaks Oct 22, 2013
cd4b38d
Don't return a nil object pointer as a TyphoonCollectionType
mbaltaks Oct 22, 2013
965ebe1
Don't return a nil object pointer as a TyphoonCollectionType
mbaltaks Oct 22, 2013
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
2 changes: 1 addition & 1 deletion Source/Component/Initializer/Collection/TyphoonParameterInjectedAsCollection.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ -(TyphoonCollectionType)collectionType {

[NSException raise:NSInvalidArgumentException format:@"Required collection type '%@' is neither an NSSet nor NSArray.",
NSStringFromClass(clazz)];
return nil;
return 0;
}

@end
4 changes: 2 additions & 2 deletions Source/Component/Properties/Collection/TyphoonPropertyInjectedAsCollection.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ - (TyphoonCollectionType)resolveCollectionTypeWith:(id<TyphoonIntrospectiveNSObj

[NSException raise:NSInvalidArgumentException format:@"Property named '%@' on '%@' is neither an NSSet nor NSArray.", _name,
NSStringFromClass(describedClass)];
return nil;
return 0;
}

/* ====================================================================================================================================== */
Expand Down Expand Up @@ -100,4 +100,4 @@ - (NSString*)description
}


@end
@end
4 changes: 2 additions & 2 deletions Source/TypeConversion/Converters/TyphoonPrimitiveTypeConverter.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ - (unsigned long)convertToUnsignedLong:(NSString*)stringValue
NSScanner* scanner = [[NSScanner alloc] initWithString:stringValue];
long long converted = 0;
[scanner scanLongLong:&converted];
return [[NSNumber numberWithLong:converted] unsignedLongValue];
return [[NSNumber numberWithLongLong:converted] unsignedLongValue];
}

- (unsigned long long)convertToUnsignedLongLong:(NSString*)stringValue
Expand Down Expand Up @@ -204,4 +204,4 @@ - (void)setPrimitiveArgumentFor:(NSInvocation*)invocation index:(NSUInteger)inde
}


@end
@end