From 1af835bcc441abaefc4ac8167d6e0f573fdb3040 Mon Sep 17 00:00:00 2001
From: VladiMihaylenko <vxmihaylenko@gmail.com>
Date: Tue, 17 Apr 2018 19:17:38 +0300
Subject: [PATCH] Review fixes

---
 indexer/ftypes_matcher.hpp                    |  2 +-
 .../MWMSearchHotelsFilterViewController.mm    | 22 +++++++------------
 .../test_results_matching.hpp                 |  4 ++--
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/indexer/ftypes_matcher.hpp b/indexer/ftypes_matcher.hpp
index a16275d0ef..a3643fc410 100644
--- a/indexer/ftypes_matcher.hpp
+++ b/indexer/ftypes_matcher.hpp
@@ -7,7 +7,7 @@
 
 #include <algorithm>
 #include <array>
-#include <cstddef>
+#include <cstdint>
 #include <functional>
 #include <initializer_list>
 #include <string>
diff --git a/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm b/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm
index c9fc4b06f9..404dfc3788 100644
--- a/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm
+++ b/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm
@@ -20,17 +20,11 @@ static uint8_t kAdultsCount = 2;
 static int8_t kAgeOfChild = 5;
 static NSString * const kHotelTypePattern = @"search_hotel_filter_%@";
 
-
-std::array<ftypes::IsHotelChecker::Type, my::Key(ftypes::IsHotelChecker::Type::Count)> const kTypes = {{
-  ftypes::IsHotelChecker::Type::Hotel,
-  ftypes::IsHotelChecker::Type::Apartment,
-  ftypes::IsHotelChecker::Type::CampSite,
-  ftypes::IsHotelChecker::Type::Chalet,
-  ftypes::IsHotelChecker::Type::GuestHouse,
-  ftypes::IsHotelChecker::Type::Hostel,
-  ftypes::IsHotelChecker::Type::Motel,
-  ftypes::IsHotelChecker::Type::Resort
-}};
+std::array<ftypes::IsHotelChecker::Type, my::Key(ftypes::IsHotelChecker::Type::Count)> const
+    kTypes = {{ftypes::IsHotelChecker::Type::Hotel, ftypes::IsHotelChecker::Type::Apartment,
+               ftypes::IsHotelChecker::Type::CampSite, ftypes::IsHotelChecker::Type::Chalet,
+               ftypes::IsHotelChecker::Type::GuestHouse, ftypes::IsHotelChecker::Type::Hostel,
+               ftypes::IsHotelChecker::Type::Motel, ftypes::IsHotelChecker::Type::Resort}};
 
 unsigned makeMask(std::unordered_set<ftypes::IsHotelChecker::Type> const & items)
 {
@@ -482,7 +476,8 @@ void configButton(UIButton * button, NSString * primaryText, NSString * secondar
   cell.selected = selected;
   if (selected)
   {
-    [collectionView selectItemAtIndexPath:indexPath animated:NO
+    [collectionView selectItemAtIndexPath:indexPath
+                                 animated:NO
                            scrollPosition:UICollectionViewScrollPositionNone];
   }
 
@@ -519,8 +514,7 @@ void configButton(UIButton * button, NSString * primaryText, NSString * secondar
 - (void)collectionView:(UICollectionView *)collectionView didDeselectItemAtIndexPath:(NSIndexPath *)indexPath
 {
   auto const type = kTypes[indexPath.row];
-  if (m_selectedTypes.find(type) != m_selectedTypes.end())
-    m_selectedTypes.erase(type);
+  m_selectedTypes.erase(type);
 }
 
 #pragma mark - Properties
diff --git a/search/search_tests_support/test_results_matching.hpp b/search/search_tests_support/test_results_matching.hpp
index 3d7a54de0c..600430e4e2 100644
--- a/search/search_tests_support/test_results_matching.hpp
+++ b/search/search_tests_support/test_results_matching.hpp
@@ -77,9 +77,9 @@ std::shared_ptr<MatchingRule> AlternativesMatch(TArgs &&... args)
 bool MatchResults(Index const & index, std::vector<std::shared_ptr<MatchingRule>> rules,
                   std::vector<search::Result> const & actual);
 bool MatchResults(Index const & index, std::vector<std::shared_ptr<MatchingRule>> rules,
-                search::Results const & actual);
+                  search::Results const & actual);
 bool ResultMatches(Index const & index, std::shared_ptr<MatchingRule> rule,
-                 search::Result const & result);
+                   search::Result const & result);
 
 std::string DebugPrint(MatchingRule const & rule);
 }  // namespace tests_support