diff options
author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2019-02-13 17:35:11 +0300 |
---|---|---|
committer | mpimenov <mpimenov@users.noreply.github.com> | 2019-02-13 19:03:37 +0300 |
commit | 5963b2c6028d3aeed62199dbe7f1500c0f0c7686 (patch) | |
tree | 801dd3a4fd1245cf89c8a5a43d69a0ef03138bd4 /storage | |
parent | 2950477a01cb89c84da3a75430a8b58b09bd3437 (diff) |
Build fix.
Diffstat (limited to 'storage')
-rw-r--r-- | storage/diff_scheme/diff_manager.hpp | 4 | ||||
-rw-r--r-- | storage/storage.cpp | 5 | ||||
-rw-r--r-- | storage/storage.hpp | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/storage/diff_scheme/diff_manager.hpp b/storage/diff_scheme/diff_manager.hpp index d383635730..407b251c35 100644 --- a/storage/diff_scheme/diff_manager.hpp +++ b/storage/diff_scheme/diff_manager.hpp @@ -44,14 +44,14 @@ public: // If the diff is available, sets |size| to its size and returns true. // Otherwise, returns false. - bool SizeFor(storage::TCountryId const & countryId, uint64_t & size) const; + bool SizeFor(storage::CountryId const & countryId, uint64_t & size) const; // Sets |size| to how many bytes are left for the diff to be downloaded for |countryId| // or 0 if there is no diff available or it has already been downloaded. // This method may overestimate because it does not account for the possibility // of resuming an old download, i.e. the return value is either 0 or the diff size. // Returns true iff the diff is available. - bool SizeToDownloadFor(storage::TCountryId const & countryId, uint64_t & size) const; + bool SizeToDownloadFor(storage::CountryId const & countryId, uint64_t & size) const; bool VersionFor(storage::CountryId const & countryId, uint64_t & version) const; bool IsPossibleToAutoupdate() const; diff --git a/storage/storage.cpp b/storage/storage.cpp index 2113387946..061515df24 100644 --- a/storage/storage.cpp +++ b/storage/storage.cpp @@ -590,6 +590,7 @@ void Storage::DeleteCustomCountryVersion(LocalCountryFile const & localFile) } } + CountryId const countryId = FindCountryIdByFile(countryFile.GetName()); if (!IsLeaf(countryId)) { LOG(LERROR, ("Removed files for an unknown country:", localFile)); @@ -1404,7 +1405,7 @@ void Storage::GetChildrenInGroups(CountryId const & parent, CountriesVec & downl // All disputed territories in subtree with root == |parent|. CountriesVec allDisputedTerritories; parentNode->ForEachChild([&](CountryTreeNode const & childNode) { - vector<pair<TCountryId, NodeStatus>> disputedTerritoriesAndStatus; + vector<pair<CountryId, NodeStatus>> disputedTerritoriesAndStatus; StatusAndError const childStatus = GetNodeStatusInfo(childNode, disputedTerritoriesAndStatus, true /* isDisputedTerritoriesCounted */); @@ -1679,7 +1680,7 @@ void Storage::OnDiffStatusReceived(diffs::Status const status) } StatusAndError Storage::GetNodeStatusInfo( - CountryTreeNode const & node, vector<pair<TCountryId, NodeStatus>> & disputedTerritories, + CountryTreeNode const & node, vector<pair<CountryId, NodeStatus>> & disputedTerritories, bool isDisputedTerritoriesCounted) const { // Leaf node status. diff --git a/storage/storage.hpp b/storage/storage.hpp index 9408440f96..32769ae202 100644 --- a/storage/storage.hpp +++ b/storage/storage.hpp @@ -205,7 +205,7 @@ private: // calls to the diff manager's ApplyDiff are coordinated from the storage thread. base::Cancellable m_diffsCancellable; - boost::optional<TCountryId> m_latestDiffRequest; + boost::optional<CountryId> m_latestDiffRequest; DownloadingPolicy m_defaultDownloadingPolicy; DownloadingPolicy * m_downloadingPolicy = &m_defaultDownloadingPolicy; |