From d918f8d7c2e9eb4e3514078da6621c159e67069c Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Tue, 11 Jul 2017 17:42:50 +0300 Subject: [PATCH] [core] GCC 4.9 does not provide --- platform/default/utf.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/platform/default/utf.cpp b/platform/default/utf.cpp index ba9678c91..8fc44a9ed 100644 --- a/platform/default/utf.cpp +++ b/platform/default/utf.cpp @@ -2,14 +2,24 @@ #include #include + +// GCC 4.9 compatibility +#if !defined(__GNUC__) || __GNUC__ >= 5 #include +#else +#include +#endif namespace mbgl { namespace util { std::u16string utf8_to_utf16::convert(std::string const& utf8) { +#if !defined(__GNUC__) || __GNUC__ >= 5 std::wstring_convert, char16_t> converter; return converter.from_bytes(utf8); +#else + return boost::locale::conv::utf_to_utf(utf8.c_str(), utf8.c_str() + utf8.size()); +#endif } } // namespace util