diff options
| author | Arsentiy Milchakov <milcars@mapswithme.com> | 2017-03-21 12:35:00 +0300 |
|---|---|---|
| committer | Arsentiy Milchakov <milcars@mapswithme.com> | 2017-03-22 15:48:06 +0300 |
| commit | 431299e98329b863b2518ed863c918bc0501256d (patch) | |
| tree | c36c2e412182daa911c4ed17cf81c3b8b416129d /indexer/index.hpp | |
| parent | 655b6f0a2833dc39a8c08199ecde85b5c739088b (diff) | |
warnings fix
Diffstat (limited to 'indexer/index.hpp')
| -rw-r--r-- | indexer/index.hpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/indexer/index.hpp b/indexer/index.hpp index 077dc5bdf9..26feef5128 100644 --- a/indexer/index.hpp +++ b/indexer/index.hpp @@ -95,7 +95,7 @@ private: m_f(feature); } - void operator()(MwmHandle const & handle, covering::CoveringGetter & cov, uint32_t scale) const + void operator()(MwmHandle const & handle, covering::CoveringGetter & cov, int scale) const { MwmValue const * pValue = handle.GetValue<MwmValue>(); if (pValue) @@ -103,7 +103,7 @@ private: feature::DataHeader const & header = pValue->GetHeader(); // Prepare needed covering. - uint32_t const lastScale = header.GetLastScale(); + int const lastScale = header.GetLastScale(); // In case of WorldCoasts we should pass correct scale in ForEachInIntervalAndScale. if (scale > lastScale) @@ -167,7 +167,7 @@ private: m_f(fid); } - void operator()(MwmHandle const & handle, covering::CoveringGetter & cov, uint32_t scale) const + void operator()(MwmHandle const & handle, covering::CoveringGetter & cov, int scale) const { MwmValue const * pValue = handle.GetValue<MwmValue>(); if (pValue) @@ -208,21 +208,21 @@ private: public: template <typename F> - void ForEachInRect(F && f, m2::RectD const & rect, uint32_t scale) const + void ForEachInRect(F && f, m2::RectD const & rect, int scale) const { ReadMWMFunctor<F> implFunctor(f); ForEachInIntervals(implFunctor, covering::ViewportWithLowLevels, rect, scale); } template <typename F> - void ForEachFeatureIDInRect(F && f, m2::RectD const & rect, uint32_t scale) const + void ForEachFeatureIDInRect(F && f, m2::RectD const & rect, int scale) const { ReadFeatureIndexFunctor<F> implFunctor(f); ForEachInIntervals(implFunctor, covering::LowLevelsOnly, rect, scale); } template <typename F> - void ForEachInScale(F && f, uint32_t scale) const + void ForEachInScale(F && f, int scale) const { ReadMWMFunctor<F> implFunctor(f); ForEachInIntervals(implFunctor, covering::FullCover, m2::RectD::GetInfiniteRect(), scale); @@ -297,7 +297,7 @@ public: }; template <typename F> - void ForEachInRectForMWM(F && f, m2::RectD const & rect, uint32_t scale, MwmId const & id) const + void ForEachInRectForMWM(F && f, m2::RectD const & rect, int scale, MwmId const & id) const { MwmHandle const handle = GetMwmHandleById(id); if (handle.IsAlive()) @@ -312,7 +312,7 @@ private: template <typename F> void ForEachInIntervals(F && f, covering::CoveringMode mode, m2::RectD const & rect, - uint32_t scale) const + int scale) const { vector<shared_ptr<MwmInfo>> mwms; GetMwmsInfo(mwms); |