Resolve printf templates with %u for NSUInteger output. Remove duplicate header definition

This commit is contained in:
Saul Mora
2012-05-19 16:00:24 -06:00
parent 8c3540b8be
commit f35c305ffd
3 changed files with 2 additions and 3 deletions

View File

@@ -31,7 +31,7 @@ NSUInteger const kMagicalRecordImportMaximumAttributeFailoverDepth = 10;
for (NSUInteger i = 1; i < kMagicalRecordImportMaximumAttributeFailoverDepth && value == nil; i++)
{
attributeName = [NSString stringWithFormat:@"%@.%ld", kMagicalRecordImportAttributeKeyMapKey, i];
attributeName = [NSString stringWithFormat:@"%@.%u", kMagicalRecordImportAttributeKeyMapKey, i];
lookupKey = [[attributeInfo userInfo] valueForKey:attributeName];
if (lookupKey == nil)
{

View File

@@ -118,7 +118,7 @@ static NSUInteger defaultBatchSize = kMagicalRecordDefaultBatchSize;
}
else
{
MRLog(@"Property '%@' not found in %ld properties for %@", propertyName, [propDict count], NSStringFromClass(self));
MRLog(@"Property '%@' not found in %u properties for %@", propertyName, [propDict count], NSStringFromClass(self));
}
}
}

View File

@@ -19,6 +19,5 @@
+ (NSManagedObjectModel *) MR_newManagedObjectModelNamed:(NSString *)modelFileName NS_RETURNS_RETAINED;
+ (NSManagedObjectModel *) MR_managedObjectModelNamed:(NSString *)modelFileName;
+ (NSManagedObjectModel *) MR_newModelNamed:(NSString *) modelName inBundleNamed:(NSString *) bundleName NS_RETURNS_RETAINED;
+ (NSManagedObjectModel *) MR_mergedObjectModelFromMainBundle;
@end