Skip to content
Browse files

Fixed some small type errors that don't have any effect on iOS, but c…

…ould cause problems if we were to build for OS X.
  • Loading branch information...
1 parent bde8fd5 commit a688f9e3c8c9477ec0d7203467dceb7c4c2cee4b @dented42 dented42 committed Dec 1, 2011
Showing with 11 additions and 11 deletions.
  1. +1 −1 Kiwi/KWFailure.m
  2. +4 −4 Kiwi/KWHaveMatcher.m
  3. +6 −6 Kiwi/KWReceiveMatcher.m
View
2 Kiwi/KWFailure.m
@@ -56,7 +56,7 @@ - (void)dealloc {
#pragma mark Getting Exception Representations
- (NSException *)exceptionValue {
- NSNumber *lineNumber = [NSNumber numberWithUnsignedInt:self.callSite.lineNumber];
+ NSNumber *lineNumber = [NSNumber numberWithUnsignedInteger:self.callSite.lineNumber];
NSDictionary *userInfo = [NSDictionary dictionaryWithObjectsAndKeys:self.callSite.filename, SenTestFilenameKey,
lineNumber, SenTestLineNumberKey, nil];
return [NSException exceptionWithName:@"KWFailureException" reason:message userInfo:userInfo];
View
8 Kiwi/KWHaveMatcher.m
@@ -213,8 +213,8 @@ + (NSMethodSignature *)invocationCapturer:(KWInvocationCapturer *)anInvocationCa
+ (void)invocationCapturer:(KWInvocationCapturer *)anInvocationCapturer didCaptureInvocation:(NSInvocation *)anInvocation {
NSDictionary *userInfo = anInvocationCapturer.userInfo;
id verifier = [userInfo objectForKey:MatchVerifierKey];
- KWCountType countType = [[userInfo objectForKey:CountTypeKey] unsignedIntValue];
- KWCountType count = [[userInfo objectForKey:CountKey] unsignedIntValue];
+ KWCountType countType = [[userInfo objectForKey:CountTypeKey] unsignedIntegerValue];
+ NSUInteger count = [[userInfo objectForKey:CountKey] unsignedIntegerValue];
switch (countType) {
case KWCountTypeExact:
@@ -240,8 +240,8 @@ @implementation KWMatchVerifier(KWHaveMatcherAdditions)
- (NSDictionary *)userInfoForHaveMatcherWithCountType:(KWCountType)aCountType count:(NSUInteger)aCount {
return [NSDictionary dictionaryWithObjectsAndKeys:self, MatchVerifierKey,
- [NSNumber numberWithUnsignedInt:aCountType], CountTypeKey,
- [NSNumber numberWithUnsignedInt:aCount], CountKey, nil];
+ [NSNumber numberWithUnsignedInteger:aCountType], CountTypeKey,
+ [NSNumber numberWithUnsignedInteger:aCount], CountKey, nil];
}
- (id)have:(NSUInteger)aCount {
View
12 Kiwi/KWReceiveMatcher.m
@@ -188,8 +188,8 @@ + (NSMethodSignature *)invocationCapturer:(KWInvocationCapturer *)anInvocationCa
+ (void)invocationCapturer:(KWInvocationCapturer *)anInvocationCapturer didCaptureInvocation:(NSInvocation *)anInvocation {
NSDictionary *userInfo = anInvocationCapturer.userInfo;
id verifier = [userInfo objectForKey:MatchVerifierKey];
- KWCountType countType = [[userInfo objectForKey:CountTypeKey] unsignedIntValue];
- NSUInteger count = [[userInfo objectForKey:CountKey] unsignedIntValue];
+ KWCountType countType = [[userInfo objectForKey:CountTypeKey] unsignedIntegerValue];
+ NSUInteger count = [[userInfo objectForKey:CountKey] unsignedIntegerValue];
NSValue *stubValue = [userInfo objectForKey:StubValueKey];
KWMessagePattern *messagePattern = [KWMessagePattern messagePatternFromInvocation:anInvocation];
@@ -266,14 +266,14 @@ - (void)receive:(SEL)aSelector andReturn:(id)aValue withCountAtMost:(NSUInteger)
- (NSDictionary *)userInfoForReceiveMatcherWithCountType:(KWCountType)aCountType count:(NSUInteger)aCount {
return [NSDictionary dictionaryWithObjectsAndKeys:self, MatchVerifierKey,
- [NSNumber numberWithUnsignedInt:aCountType], CountTypeKey,
- [NSNumber numberWithUnsignedInt:aCount], CountKey, nil];
+ [NSNumber numberWithUnsignedInteger:aCountType], CountTypeKey,
+ [NSNumber numberWithUnsignedInteger:aCount], CountKey, nil];
}
- (NSDictionary *)userInfoForReceiveMatcherWithCountType:(KWCountType)aCountType count:(NSUInteger)aCount value:(id)aValue {
return [NSDictionary dictionaryWithObjectsAndKeys:self, MatchVerifierKey,
- [NSNumber numberWithUnsignedInt:aCountType], CountTypeKey,
- [NSNumber numberWithUnsignedInt:aCount], CountKey,
+ [NSNumber numberWithUnsignedInteger:aCountType], CountTypeKey,
+ [NSNumber numberWithUnsignedInteger:aCount], CountKey,
[NSValue valueWithNonretainedObject:aValue], StubValueKey, nil];
}

0 comments on commit a688f9e

Please sign in to comment.
Something went wrong with that request. Please try again.