diff options
| author | vng <viktor.govako@gmail.com> | 2016-01-29 13:10:59 +0300 |
|---|---|---|
| committer | Sergey Yershov <yershov@corp.mail.ru> | 2016-03-23 16:16:56 +0300 |
| commit | 436d63fa6bf9e7060b740b63d6eba59986552405 (patch) | |
| tree | db420ef93659fa73bc2dbca23133ca16c4a78851 | |
| parent | c887f88f536ff75b99e1509f570ea2289fce09a4 (diff) | |
Review fixes.
| -rw-r--r-- | indexer/ftypes_matcher.cpp | 2 | ||||
| -rw-r--r-- | search/reverse_geocoder.cpp | 2 | ||||
| -rw-r--r-- | search/reverse_geocoder.hpp | 2 | ||||
| -rw-r--r-- | search/v2/mwm_context.cpp | 1 | ||||
| -rw-r--r-- | search/v2/mwm_context.hpp | 3 |
5 files changed, 5 insertions, 5 deletions
diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp index 2880d6ec43..c80dfc08eb 100644 --- a/indexer/ftypes_matcher.cpp +++ b/indexer/ftypes_matcher.cpp @@ -149,7 +149,7 @@ IsStreetChecker const & IsStreetChecker::Instance() IsAddressObjectChecker::IsAddressObjectChecker() : BaseChecker(1 /* level */) { - auto paths = { "building", "amenity", "shop", "tourism", "historic", "office", "craft" }; + auto const paths = { "building", "amenity", "shop", "tourism", "historic", "office", "craft" }; Classificator const & c = classif(); for (auto const & p : paths) diff --git a/search/reverse_geocoder.cpp b/search/reverse_geocoder.cpp index cd31ef4dbf..d011c1bfe2 100644 --- a/search/reverse_geocoder.cpp +++ b/search/reverse_geocoder.cpp @@ -27,7 +27,7 @@ double const ReverseGeocoder::kLookupRadiusM = 500.0; ReverseGeocoder::ReverseGeocoder(Index const & index) : m_index(index) {} -void ReverseGeocoder::GetNearbyStreets(MwmSet::MwmId id, m2::PointD const & center, +void ReverseGeocoder::GetNearbyStreets(MwmSet::MwmId const & id, m2::PointD const & center, vector<Street> & streets) const { m2::RectD const rect = GetLookupRect(center, kLookupRadiusM); diff --git a/search/reverse_geocoder.hpp b/search/reverse_geocoder.hpp index 18229f62c9..1a7ce0dde1 100644 --- a/search/reverse_geocoder.hpp +++ b/search/reverse_geocoder.hpp @@ -68,7 +68,7 @@ public: /// @return Sorted by distance streets vector for the specified MwmId. //@{ - void GetNearbyStreets(MwmSet::MwmId id, m2::PointD const & center, + void GetNearbyStreets(MwmSet::MwmId const & id, m2::PointD const & center, vector<Street> & streets) const; void GetNearbyStreets(FeatureType & ft, vector<Street> & streets) const; //@} diff --git a/search/v2/mwm_context.cpp b/search/v2/mwm_context.cpp index b6b6a053c6..b4b490cfe6 100644 --- a/search/v2/mwm_context.cpp +++ b/search/v2/mwm_context.cpp @@ -13,6 +13,5 @@ MwmContext::MwmContext(MwmSet::MwmHandle handle) { } -shared_ptr<MwmInfo> const & MwmContext::GetInfo() const { return GetId().GetInfo(); } } // namespace v2 } // namespace search diff --git a/search/v2/mwm_context.hpp b/search/v2/mwm_context.hpp index d06128a67f..04ca54d308 100644 --- a/search/v2/mwm_context.hpp +++ b/search/v2/mwm_context.hpp @@ -23,7 +23,7 @@ struct MwmContext inline MwmSet::MwmId const & GetId() const { return m_handle.GetId(); } inline string const & GetName() const { return GetInfo()->GetCountryName(); } - shared_ptr<MwmInfo> const & GetInfo() const; + inline shared_ptr<MwmInfo> const & GetInfo() const { return GetId().GetInfo(); } template <class TFn> void ForEachFeature(m2::RectD const & rect, TFn && fn) { @@ -56,5 +56,6 @@ struct MwmContext DISALLOW_COPY_AND_MOVE(MwmContext); }; + } // namespace v2 } // namespace search |