1 files changed, 8 insertions, 7 deletions
diff --git a/src/mbgl/util/utf.hpp b/src/mbgl/util/utf.hpp
index 560ca3ba7f..386e56bef8 100644
--- a/src/mbgl/util/utf.hpp
+++ b/src/mbgl/util/utf.hpp
@@ -2,19 +2,20 @@
 
 #include <memory>
 
-#include <boost/regex/pending/unicode_iterator.hpp>
+#include <locale>
+#include <codecvt>
 
 namespace mbgl {
 namespace util {
 
-class utf8_to_utf32 {
- public:
-    static std::u32string convert(std::string const& utf8)
+class utf8_to_utf16 {
+public:
+    static std::u16string convert(std::string const& utf8)
     {
-        boost::u8_to_u32_iterator<std::string::const_iterator> begin(utf8.begin());
-        boost::u8_to_u32_iterator<std::string::const_iterator> end(utf8.end());
-        return std::u32string(begin,end);
+        std::wstring_convert<std::codecvt_utf8_utf16<char16_t>,char16_t> converter;
+        return converter.from_bytes( utf8 );
     }
+    
 };
 
 } // namespace util