diff options
| author | tatiana-yan <tatiana.kondakova@gmail.com> | 2019-04-09 15:11:54 +0300 |
|---|---|---|
| committer | mpimenov <mpimenov@users.noreply.github.com> | 2019-04-09 18:02:17 +0300 |
| commit | c246c21ac21225165cf2a1018a30e272d1273b8e (patch) | |
| tree | 3ea4ced943e2a9e35a16feb3d64902f8bf734f85 /iphone | |
| parent | d3c01acd1948d59924b3735add4c593b5cb55b59 (diff) | |
[std] Remove std/array.hpp
Diffstat (limited to 'iphone')
| -rw-r--r-- | iphone/Maps/UI/EditBookmark/MWMBookmarkColorViewController.mm | 4 | ||||
| -rw-r--r-- | iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHoursLayoutHelper.mm | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/iphone/Maps/UI/EditBookmark/MWMBookmarkColorViewController.mm b/iphone/Maps/UI/EditBookmark/MWMBookmarkColorViewController.mm index ca13a41375..ac9377b153 100644 --- a/iphone/Maps/UI/EditBookmark/MWMBookmarkColorViewController.mm +++ b/iphone/Maps/UI/EditBookmark/MWMBookmarkColorViewController.mm @@ -3,11 +3,11 @@ #import "SwiftBridge.h" #import "UIViewController+Navigation.h" -#include "std/array.hpp" +#include <array> namespace { -array<kml::PredefinedColor, 8> const kBookmarkColorsVariant +std::array<kml::PredefinedColor, 8> const kBookmarkColorsVariant {{ kml::PredefinedColor::Red, kml::PredefinedColor::Yellow, diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHoursLayoutHelper.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHoursLayoutHelper.mm index ae58c2d610..b375adcc77 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHoursLayoutHelper.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHoursLayoutHelper.mm @@ -5,11 +5,12 @@ #import "MWMTableViewCell.h" #import "SwiftBridge.h" -#include "std/array.hpp" +#include <array> +#include <vector> @interface MWMPlacePageData() -- (vector<place_page::MetainfoRows> &)mutableMetainfoRows; +- (std::vector<place_page::MetainfoRows> &)mutableMetainfoRows; @end @@ -59,7 +60,7 @@ namespace { -array<Class, 2> const kCells = {{[_MWMOHHeaderCell class], [_MWMOHSubCell class]}}; +std::array<Class, 2> const kCells = {{[_MWMOHHeaderCell class], [_MWMOHSubCell class]}}; NSAttributedString * richStringFromDay(osmoh::Day const & day, BOOL isClosedNow) { @@ -102,7 +103,7 @@ NSAttributedString * richStringFromDay(osmoh::Day const & day, BOOL isClosedNow) @interface MWMOpeningHoursLayoutHelper() { - vector<osmoh::Day> m_days; + std::vector<osmoh::Day> m_days; } @property(weak, nonatomic) UITableView * tableView; |