pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios] Fixed some 64-bit issues.

Browse source 
TODO: Carefully fix all warnings due to precision lost for arm64.
This commit is contained in:
Alex Zolotarev 2015-04-12 06:01:16 +03:00
parent 954e8c6972
commit 7201bc348c
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/Common/DiskFreeSpace.h
View file

@ -13,7 +13,7 @@ uint64_t FreeDiskSpaceInBytes()
}
else
{
NSLog(@"Error Obtaining Free File System Info: Domain = %@, Code = %d", [error domain], [error code]);
NSLog(@"Error Obtaining Free File System Info: Domain = %@, Code = %ld", [error domain], (long)[error code]);
return 0;
}
}

2
iphone/Maps/Classes/BottomMenu.mm
View file

@ -139,7 +139,7 @@
self.imageDownloaders[itemId] = downloader;
NSDictionary * links = item[@"IconURLs"];
NSString * key = [NSString stringWithFormat:@"%ix", (NSInteger)[UIScreen mainScreen].scale];
NSString * key = [NSString stringWithFormat:@"%lix", (long)[UIScreen mainScreen].scale];
NSString * link = links[key];
[downloader startDownloadingWithURL:[NSURL URLWithString:link]];
}

2
iphone/Maps/Classes/MapCell.mm
View file

@ -101,7 +101,7 @@
- (void)setDownloadProgress:(double)downloadProgress animated:(BOOL)animated
{
self.downloadProgress = downloadProgress;
self.statusLabel.text = [NSString stringWithFormat:@"%i%%", NSInteger(downloadProgress * 100)];
self.statusLabel.text = [NSString stringWithFormat:@"%li%%", long(downloadProgress * 100)];
[self.progressView setProgress:downloadProgress animated:animated];
if (!self.progressMode)
[self setProgressMode:YES withAnimatedLayout:animated];

2
iphone/Maps/Platform/LocationManager.mm
View file

@ -194,7 +194,7 @@
- (void)locationManager:(CLLocationManager *)manager didFailWithError:(NSError *)error
{
NSLog(@"locationManager failed with error: %d, %@", error.code, error.description);
NSLog(@"locationManager failed with error: %ld, %@", (long)error.code, error.description);
if (error.code == kCLErrorDenied)
{
for (id observer in m_observers)