Merge pull request rentzsch#141 from seanm/master

Minor warning fix, 64->32 truncation, format strings

Author: rentzsch

MiscMerge/MiscMergeExpression.m

@@ -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:@")"];

templates/machine.m.motemplate

@@ -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);
 		}