diff options
author | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-09-23 15:42:06 +0300 |
---|---|---|
committer | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-09-26 10:55:47 +0300 |
commit | 9c8295c6a64b6f5b2c9b67fd01633a156481a3c8 (patch) | |
tree | 27cbdbff1757d0e4aa88c3616f17233a143270e2 /platform/darwin | |
parent | 30ffbe9b8d49d8d8a2820f7b452ebc1d1531f298 (diff) | |
download | qtlocation-mapboxgl-9c8295c6a64b6f5b2c9b67fd01633a156481a3c8.tar.gz |
[core][android][darwin] Move platform specific Collator impls from expression
Platform specific Collator implementations should not be part of an expression APIs.
Diffstat (limited to 'platform/darwin')
-rw-r--r-- | platform/darwin/src/collator.mm | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/platform/darwin/src/collator.mm b/platform/darwin/src/collator.mm index fe2b46ffa7..0f010c1df8 100644 --- a/platform/darwin/src/collator.mm +++ b/platform/darwin/src/collator.mm @@ -1,12 +1,11 @@ -#include <mbgl/style/expression/collator.hpp> +#include <mbgl/i18n/collator.hpp> #include <sstream> #import <Foundation/Foundation.h> namespace mbgl { -namespace style { -namespace expression { +namespace platform { class Collator::Impl { public: @@ -48,7 +47,6 @@ private: NSLocale* locale; }; - Collator::Collator(bool caseSensitive, bool diacriticSensitive, optional<std::string> locale_) : impl(std::make_shared<Impl>(caseSensitive, diacriticSensitive, std::move(locale_))) {} @@ -65,6 +63,5 @@ std::string Collator::resolvedLocale() const { return impl->resolvedLocale(); } -} // namespace expression -} // namespace style +} // namespace platform } // namespace mbgl |