Skip to content

Commit

Permalink
Merge pull request jverkoey#549 from jlaws/master
Browse files Browse the repository at this point in the history
Fix 64-bit compile-time warnings in Nimbus Overview.
  • Loading branch information
stephanemoore committed Jun 9, 2014
2 parents 08a6559 + c868b87 commit 7190df3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/overview/src/NIOverviewMemoryCacheController.m
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,15 @@ - (void)refreshModel {
if ([self.cache isKindOfClass:[NIImageMemoryCache class]]) {
NIImageMemoryCache* imageCache = (NIImageMemoryCache *)self.cache;
summary = [NSString stringWithFormat:
@"Number of images: %d\nNumber of pixels: %@/%@\nStress limit: %@",
@"Number of images: %zd\nNumber of pixels: %@/%@\nStress limit: %@",
self.cache.count,
NIStringFromBytes(imageCache.numberOfPixels),
NIStringFromBytes(imageCache.maxNumberOfPixels),
NIStringFromBytes(imageCache.maxNumberOfPixelsUnderStress)];

} else {
summary = [NSString stringWithFormat:
@"Number of objects: %d",
@"Number of objects: %zd",
self.cache.count];
}
[contents addObject:[NITableViewModelFooter footerWithTitle:summary]];
Expand Down
2 changes: 1 addition & 1 deletion src/overview/src/NIOverviewPageView.m
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@ - (void)update {
entry = imageEntry;

} else {
self.label1.text = [NSString stringWithFormat:@"%d objects", self.cache.count];
self.label1.text = [NSString stringWithFormat:@"%zd objects", self.cache.count];
self.label2.text = nil;

entry = [[NIOverviewMemoryCacheEntry alloc] init];
Expand Down

0 comments on commit 7190df3

Please sign in to comment.