Review fixes.

2 files changed, 7 insertions, 6 deletions

diff --git a/search/features_layer_matcher.hpp b/search/features_layer_matcher.hpp
index a584d6ddf1..d247d81671 100644
--- a/search/features_layer_matcher.hpp
+++ b/search/features_layer_matcher.hpp
@@ -123,10 +123,11 @@ private:
 
     for (size_t i = 0; i < pois.size(); ++i)
     {
-      auto poiFt = GetByIndex(pois[i]);
-      if (poiFt)
+      if (auto poiFt = GetByIndex(pois[i]))
+      {
         poiCenters.emplace_back(feature::GetCenter(*poiFt, FeatureType::WORST_GEOMETRY),
                                 i /* id */);
+      }
     }
 
     std::vector<PointRectMatcher::RectIdPair> buildingRects;
@@ -204,10 +205,11 @@ private:
 
     for (size_t i = 0; i < pois.size(); ++i)
     {
-      auto poiFt = GetByIndex(pois[i]);
-      if (poiFt)
+      if (auto poiFt = GetByIndex(pois[i]))
+      {
         poiCenters.emplace_back(feature::GetCenter(*poiFt, FeatureType::WORST_GEOMETRY),
                                 i /* id */);
+      }
     }
 
     std::vector<PointRectMatcher::RectIdPair> streetRects;
diff --git a/search/hotels_filter.cpp b/search/hotels_filter.cpp
index b0c35698e7..3e400a44ad 100644
--- a/search/hotels_filter.cpp
+++ b/search/hotels_filter.cpp
@@ -118,8 +118,7 @@ HotelsFilter::Descriptions const & HotelsFilter::GetDescriptions(MwmContext cons
     auto const id = base::asserted_cast<uint32_t>(bit);
 
     Description description;
-    auto ft = context.GetFeature(id);
-    if (ft)
+    if (auto ft = context.GetFeature(id))
       description.FromFeature(*ft);
     descriptions.emplace_back(id, description);
   });