Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #141 from seanm/master

Minor warning fix, 64->32 truncation, format strings
  • Loading branch information...
commit 6a0e67cb57a6890df134edad70f70a85b7776607 2 parents ce9cae1 + 375147f
Jonathan 'Wolf' Rentzsch authored
4 MiscMerge/MiscMergeExpression.m
View
@@ -441,14 +441,14 @@ - (NSString *)nameDescription
- (NSString *)description
{
- NSInteger index, count = [expressions count];
+ NSUInteger index, count = [expressions count];
NSMutableString *string = [NSMutableString stringWithFormat:@"%@(", [self nameDescription]];
for ( index = 0; index < count; index++ ) {
if ( index > 0 )
[string appendString:@","];
- [string appendFormat:@"%d=%@", index, [expressions objectAtIndex:index]];
+ [string appendFormat:@"%lu=%@", (unsigned long)index, [expressions objectAtIndex:index]];
}
[string appendString:@")"];
4 templates/machine.m.motemplate
View
@@ -143,8 +143,8 @@ const struct <$managedObjectClassName$>FetchedProperties <$managedObjectClassNam
result = [results objectAtIndex:0];
break;
default:
- NSLog(@"WARN fetch request <$FetchRequest.name$>: 0 or 1 objects expected, %u found (substitutionVariables:%@, results:%@)",
- (unsigned)[results count],
+ NSLog(@"WARN fetch request <$FetchRequest.name$>: 0 or 1 objects expected, %lu found (substitutionVariables:%@, results:%@)",
+ (unsigned long)[results count],
substitutionVariables,
results);
}
Please sign in to comment.
Something went wrong with that request. Please try again.