diff --git a/geocoder/geocoder.cpp b/geocoder/geocoder.cpp index 7049ac7a7e..96c6b808bf 100644 --- a/geocoder/geocoder.cpp +++ b/geocoder/geocoder.cpp @@ -133,9 +133,9 @@ bool Geocoder::Context::IsTokenUsed(size_t id) const bool Geocoder::Context::AllTokensUsed() const { return m_numUsedTokens == m_tokens.size(); } void Geocoder::Context::AddResult(base::GeoObjectId const & osmId, double certainty, Type type, - vector && allTypes, bool allTokensUsed) + vector const & allTypes, bool allTokensUsed) { - m_beam.Add(BeamKey(osmId, type, move(allTypes), allTokensUsed), certainty); + m_beam.Add(BeamKey(osmId, type, allTypes, allTokensUsed), certainty); } void Geocoder::Context::FillResults(vector & results) const @@ -271,10 +271,7 @@ void Geocoder::Go(Context & ctx, Type type) const } for (auto const & docId : curLayer.m_entries) - { - ctx.AddResult(m_index.GetDoc(docId).m_osmId, certainty, type, move(allTypes), - ctx.AllTokensUsed()); - } + ctx.AddResult(m_index.GetDoc(docId).m_osmId, certainty, type, allTypes, ctx.AllTokensUsed()); ctx.GetLayers().emplace_back(move(curLayer)); SCOPE_GUARD(pop, [&] { ctx.GetLayers().pop_back(); }); diff --git a/geocoder/geocoder.hpp b/geocoder/geocoder.hpp index f987de5f11..42fe749050 100644 --- a/geocoder/geocoder.hpp +++ b/geocoder/geocoder.hpp @@ -52,7 +52,7 @@ public: public: struct BeamKey { - BeamKey(base::GeoObjectId osmId, Type type, std::vector && allTypes, bool allTokensUsed) + BeamKey(base::GeoObjectId osmId, Type type, std::vector const & allTypes, bool allTokensUsed) : m_osmId(osmId) , m_type(type) , m_allTypes(std::move(allTypes)) @@ -88,7 +88,7 @@ public: bool AllTokensUsed() const; void AddResult(base::GeoObjectId const & osmId, double certainty, Type type, - std::vector && allTypes, bool allTokensUsed); + std::vector const & allTypes, bool allTokensUsed); void FillResults(std::vector & results) const;