From d51e5e2f252a753ceebcfe9c5dd83069d61e8f34 Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Tue, 26 Jan 2016 14:24:42 +0300 Subject: [PATCH] [old map downloader] Corrections after colleagues comments. --- iphone/Maps/Classes/MapViewController.mm | 2 +- storage/storage_tests/storage_tests.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index 5864b349a1..09b7fe037b 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -561,7 +561,7 @@ NSString * const kAuthorizationSegue = @"Map2AuthorizationSegue"; LocalAndRemoteSizeT sizes = layout.GetRemoteCountrySizes(idx); uint64_t sizeToDownload = sizes.first; MapOptions options = static_cast(opt); - if(HasOptions(options, MapOptions::CarRouting)) + if (HasOptions(options, MapOptions::CarRouting)) sizeToDownload += sizes.second; NSString * name = @(layout.GetCountryName(idx).c_str()); diff --git a/storage/storage_tests/storage_tests.cpp b/storage/storage_tests/storage_tests.cpp index 05b93de66c..4dcf6994c3 100644 --- a/storage/storage_tests/storage_tests.cpp +++ b/storage/storage_tests/storage_tests.cpp @@ -383,13 +383,13 @@ UNIT_TEST(StorageTest_TwoCountriesDownloading) TIndex const index1 = storage.FindIndexByFile("Yemen"); TEST(index1.IsValid(), ()); storage.DeleteCountry(index1, MapOptions::Map); - MY_SCOPE_GUARD(cleanupUruguayFiles, + MY_SCOPE_GUARD(cleanupFiles1, bind(&Storage::DeleteCountry, &storage, index1, MapOptions::Map)); TIndex const index2 = storage.FindIndexByFile("Angola"); TEST(index2.IsValid(), ()); storage.DeleteCountry(index2, MapOptions::MapWithCarRouting); - MY_SCOPE_GUARD(cleanupVenezuelaFiles, bind(&Storage::DeleteCountry, &storage, index2, + MY_SCOPE_GUARD(cleanupFiles2, bind(&Storage::DeleteCountry, &storage, index2, MapOptions::MapWithCarRouting)); unique_ptr uruguayChecker =