diff options
author | tatiana-yan <tatiana.kondakova@gmail.com> | 2019-04-12 15:52:08 +0300 |
---|---|---|
committer | mpimenov <mpimenov@users.noreply.github.com> | 2019-04-12 18:30:29 +0300 |
commit | a685936cae13b6a51028d1db0d023c5ab8ba09ca (patch) | |
tree | beaa4ed74e5283b4ed7362f6362279ba86f07946 /iphone | |
parent | ce150f2169b1539eda6e845230102c8eca6e4d3a (diff) |
[std] Use new include style for coding, fixes.
Diffstat (limited to 'iphone')
-rw-r--r-- | iphone/Maps/UI/Search/Filters/MWMHotelParams.h | 10 | ||||
-rw-r--r-- | iphone/Maps/UI/Search/Filters/MWMHotelParams.mm | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/iphone/Maps/UI/Search/Filters/MWMHotelParams.h b/iphone/Maps/UI/Search/Filters/MWMHotelParams.h index 21719c2d99..77ae31b2a6 100644 --- a/iphone/Maps/UI/Search/Filters/MWMHotelParams.h +++ b/iphone/Maps/UI/Search/Filters/MWMHotelParams.h @@ -1,10 +1,14 @@ #import "MWMPlacePageData.h" -#include "indexer/ftypes_matcher.hpp" #include "map/place_page_info.hpp" -#include "search/hotels_filter.hpp" #include "map/booking_filter_params.hpp" +#include "search/hotels_filter.hpp" + +#include "indexer/ftypes_matcher.hpp" + +#include <memory> + typedef enum { Any, One, @@ -22,7 +26,7 @@ typedef enum { - (instancetype)initWithPlacePageData:(MWMPlacePageData *)data; -- (shared_ptr<search::hotels_filter::Rule>)rules; +- (std::shared_ptr<search::hotels_filter::Rule>)rules; - (booking::filter::Params)availabilityParams; @end diff --git a/iphone/Maps/UI/Search/Filters/MWMHotelParams.mm b/iphone/Maps/UI/Search/Filters/MWMHotelParams.mm index e969c9123f..14e393ea0e 100644 --- a/iphone/Maps/UI/Search/Filters/MWMHotelParams.mm +++ b/iphone/Maps/UI/Search/Filters/MWMHotelParams.mm @@ -28,12 +28,12 @@ static int8_t kAgeOfChild = 5; return self; } -- (shared_ptr<search::hotels_filter::Rule>)rules +- (std::shared_ptr<search::hotels_filter::Rule>)rules { using namespace search::hotels_filter; using namespace place_page::rating; - shared_ptr<Rule> ratingRule; + std::shared_ptr<Rule> ratingRule; switch (self.rating) { case FilterRating::Any: break; @@ -42,11 +42,11 @@ static int8_t kAgeOfChild = 5; case FilterRating::Excellent: ratingRule = Ge<Rating>(9.0); break; } - shared_ptr<Rule> priceRule; + std::shared_ptr<Rule> priceRule; if (self.price != Any) priceRule = Or(priceRule, Eq<PriceRate>(self.price)); - shared_ptr<Rule> typeRule; + std::shared_ptr<Rule> typeRule; if (!self.types.empty()) typeRule = OneOf(makeMask(self.types)); @@ -75,7 +75,7 @@ unsigned makeMask(std::unordered_set<ftypes::IsHotelChecker::Type> const & items params.m_checkin = Clock::from_time_t(self.checkInDate.timeIntervalSince1970); params.m_checkout = Clock::from_time_t(self.checkOutDate.timeIntervalSince1970); } - return { make_shared<booking::AvailabilityParams>(params), {} }; + return { std::make_shared<booking::AvailabilityParams>(params), {} }; } @end |