From 0c8c632d9b367fe93b6660be28a4e564545273ae Mon Sep 17 00:00:00 2001
From: Yuri Gorshenin <y@maps.me>
Date: Wed, 16 Nov 2016 14:42:07 +0300
Subject: [PATCH] Review fixes.

---
 search/categories_cache.cpp     | 2 +-
 search/feature_offset_match.hpp | 7 ++++---
 search/geocoder.cpp             | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/search/categories_cache.cpp b/search/categories_cache.cpp
index 0111f6aa8a..a0e6b6e21b 100644
--- a/search/categories_cache.cpp
+++ b/search/categories_cache.cpp
@@ -40,7 +40,7 @@ CBV CategoriesCache::Load(MwmContext const & context)
 
   SearchTrieRequest<strings::LevenshteinDFA> request;
 
-  m_categories.ForEach([&](uint32_t const type) {
+  m_categories.ForEach([&request, &c](uint32_t const type) {
     request.m_categories.emplace_back(FeatureTypeToString(c.GetIndexForType(type)));
   });
 
diff --git a/search/feature_offset_match.hpp b/search/feature_offset_match.hpp
index 9f98b45366..1eb7409462 100644
--- a/search/feature_offset_match.hpp
+++ b/search/feature_offset_match.hpp
@@ -288,9 +288,10 @@ void MatchFeaturesInTrie(SearchTrieRequest<DFA> const & request,
 
   impl::OffsetIntersector<Filter, Value> intersector(filter);
 
-  ForEachLangPrefix(request, trieRoot, [&](TrieRootPrefix<Value> & langRoot, int8_t lang) {
-    MatchInTrie(request.m_names, langRoot, intersector);
-  });
+  ForEachLangPrefix(request, trieRoot,
+                    [&request, &intersector](TrieRootPrefix<Value> & langRoot, int8_t /* lang */) {
+                      MatchInTrie(request.m_names, langRoot, intersector);
+                    });
 
   if (categoriesMatched)
     categoriesHolder.ForEachValue(intersector);
diff --git a/search/geocoder.cpp b/search/geocoder.cpp
index 4d69374d26..f4cf69aa88 100644
--- a/search/geocoder.cpp
+++ b/search/geocoder.cpp
@@ -337,7 +337,7 @@ size_t OrderCountries(m2::RectD const & pivot, vector<shared_ptr<MwmInfo>> & inf
 
 size_t GetMaxErrorsForToken(UniString const & token)
 {
-  bool const digitsOnly = all_of(token.begin(), token.end(), [](UniChar c) { return isdigit(c); });
+  bool const digitsOnly = all_of(token.begin(), token.end(), isdigit);
   if (digitsOnly)
     return 0;
   if (token.size() < 4)