map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Build fix.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2019-02-13 17:35:11 +03:00 • committed by mpimenov
parent 2950477a01
commit 5963b2c602
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
storage/diff_scheme/diff_manager.hpp
View file

@ -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;

5
storage/storage.cpp
View file

@ -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.

2
storage/storage.hpp
View file

@ -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;