diff options
Diffstat (limited to 'search/street_vicinity_loader.hpp')
| -rw-r--r-- | search/street_vicinity_loader.hpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/search/street_vicinity_loader.hpp b/search/street_vicinity_loader.hpp index 3f3598054d..0f8c4ae19f 100644 --- a/search/street_vicinity_loader.hpp +++ b/search/street_vicinity_loader.hpp @@ -11,7 +11,11 @@ #include "base/macros.hpp" -#include "std/unordered_map.hpp" +#include <algorithm> +#include <cstdint> +#include <memory> +#include <unordered_map> +#include <vector> namespace search { @@ -30,9 +34,9 @@ public: inline bool IsEmpty() const { return !m_calculator || m_rect.IsEmptyInterior(); } - vector<uint32_t> m_features; + std::vector<uint32_t> m_features; m2::RectD m_rect; - unique_ptr<ProjectionOnStreetCalculator> m_calculator; + std::unique_ptr<ProjectionOnStreetCalculator> m_calculator; /// @todo Cache GetProjection results for features here, because /// feature::GetCenter and ProjectionOnStreetCalculator::GetProjection are not so fast. @@ -46,7 +50,7 @@ public: // Calls |fn| on each index in |sortedIds| where sortedIds[index] // belongs to the street's vicinity. template <typename TFn> - void ForEachInVicinity(uint32_t streetId, vector<uint32_t> const & sortedIds, double offsetMeters, + void ForEachInVicinity(uint32_t streetId, std::vector<uint32_t> const & sortedIds, double offsetMeters, TFn const & fn) { // Passed offset param should be less than the cached one, or the cache is invalid otherwise. @@ -61,7 +65,7 @@ public: for (uint32_t id : street.m_features) { // Load center and check projection only when |id| is in |sortedIds|. - if (!binary_search(sortedIds.begin(), sortedIds.end(), id)) + if (!std::binary_search(sortedIds.begin(), sortedIds.end(), id)) continue; FeatureType ft; @@ -91,5 +95,4 @@ private: DISALLOW_COPY_AND_MOVE(StreetVicinityLoader); }; - } // namespace search |