diff options
| author | tatiana-yan <tatiana.kondakova@gmail.com> | 2019-04-10 19:24:04 +0300 |
|---|---|---|
| committer | mpimenov <mpimenov@users.noreply.github.com> | 2019-04-12 12:56:38 +0300 |
| commit | c198137d69f40c5fe17a399c06e2d2934109d8b1 (patch) | |
| tree | 360a96ced514727f05d49c7783155aae37a387fd /search | |
| parent | 1eb7a1d11626f1598dbd3c3bcab841e7a6cc4c40 (diff) | |
[std] Use new include style for coding, fixes.
Diffstat (limited to 'search')
| -rw-r--r-- | search/feature_offset_match.hpp | 2 | ||||
| -rw-r--r-- | search/house_detector.hpp | 2 | ||||
| -rw-r--r-- | search/mwm_context.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/search/feature_offset_match.hpp b/search/feature_offset_match.hpp index 3bfc9653f6..ec2b236b55 100644 --- a/search/feature_offset_match.hpp +++ b/search/feature_offset_match.hpp @@ -304,7 +304,7 @@ void MatchFeaturesInTrie(SearchTrieRequest<DFA> const & request, categoriesHolder.ForEachValue(intersector); intersector.NextStep(); - intersector.ForEachResult(forward<ToDo>(toDo)); + intersector.ForEachResult(std::forward<ToDo>(toDo)); } template <typename ValueList, typename Filter, typename ToDo> diff --git a/search/house_detector.hpp b/search/house_detector.hpp index ad03f86502..91a6415049 100644 --- a/search/house_detector.hpp +++ b/search/house_detector.hpp @@ -245,7 +245,7 @@ private: StreetMap m_id2st; HouseMap m_id2house; - std::vector<pair<m2::PointD, Street *>> m_end2st; + std::vector<std::pair<m2::PointD, Street *>> m_end2st; std::vector<MergedStreet> m_streets; double m_metersToMercator; diff --git a/search/mwm_context.cpp b/search/mwm_context.cpp index 7594565927..3c499bab34 100644 --- a/search/mwm_context.cpp +++ b/search/mwm_context.cpp @@ -14,7 +14,7 @@ void CoverRect(m2::RectD const & rect, int scale, covering::Intervals & result) } MwmContext::MwmContext(MwmSet::MwmHandle handle) - : m_handle(move(handle)) + : m_handle(std::move(handle)) , m_value(*m_handle.GetValue<MwmValue>()) , m_vector(m_value.m_cont, m_value.GetHeader(), m_value.m_table.get()) , m_index(m_value.m_cont.GetReader(INDEX_FILE_TAG), m_value.m_factory) |