Merge remote-tracking branch 'github-alanquatermain/master'

evadne · evadne · commit 7c78b640ce15 · 2012-09-28T18:10:24.000-07:00
diff --git a/Classes/AQGridViewUpdateItem.m b/Classes/AQGridViewUpdateItem.m
@@ -81,7 +81,7 @@ - (NSString *) description
 	}
 	
 	NSString * animationDesc = @"<Unknown>";
-	switch ( _animation )
+	switch ( (UITableViewRowAnimation)_animation )
 	{
 		case UITableViewRowAnimationFade:
 			animationDesc = @"Fade";
@@ -108,7 +108,7 @@ - (NSString *) description
 			break;
 	}
 	
-	return ( [NSString stringWithFormat: @"%@{index=%u, action=%@, animation=%@, offset=%.02f}", [super description], (unsigned)_index, actionDesc, animationDesc, _offset] );
+	return ( [NSString stringWithFormat: @"%@{index=%u, action=%@, animation=%@, offset=%.02f}", [super description], (unsigned)_index, actionDesc, animationDesc, (double)_offset] );
 }
 
 - (NSComparisonResult) compare: (AQGridViewUpdateItem *) other

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ - (NSString *) description`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`NSString * animationDesc = @"<Unknown>";`
`84`		`- switch ( _animation )`
	`84`	`+ switch ( (UITableViewRowAnimation)_animation )`
`85`	`85`	`{`
`86`	`86`	`case UITableViewRowAnimationFade:`
`87`	`87`	`animationDesc = @"Fade";`
`@@ -108,7 +108,7 @@ - (NSString *) description`
`108`	`108`	`break;`
`109`	`109`	`}`
`110`	`110`
`111`		`- return ( [NSString stringWithFormat: @"%@{index=%u, action=%@, animation=%@, offset=%.02f}", [super description], (unsigned)_index, actionDesc, animationDesc, _offset] );`
	`111`	`+ return ( [NSString stringWithFormat: @"%@{index=%u, action=%@, animation=%@, offset=%.02f}", [super description], (unsigned)_index, actionDesc, animationDesc, (double)_offset] );`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`- (NSComparisonResult) compare: (AQGridViewUpdateItem *) other`