cleanup after 195560090/#309/#530

include/mbgl/util/utf.hpp

@@ -3,25 +3,12 @@
 
 #include <memory>
 
-// g++/libstdc++ is missing c++11 codecvt support
-#if 1//! defined(__clang__) || defined(__linux__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
-//#include <boost/locale.hpp>
 #include <boost/regex/pending/unicode_iterator.hpp>
-#pragma GCC diagnostic pop
-#else
-// Assume that codecvt is present on clang on non-linux systems
-#include <codecvt>
-#include <locale>
-#endif
 
 namespace mbgl {
 
 namespace util {
 
-#if 1 //! defined(__clang__) || defined(__linux__)
-
 class utf8_to_utf32 {
  public:
     explicit utf8_to_utf32() {}
@@ -33,21 +20,6 @@ class utf8_to_utf32 {
     }
 };
 
-#else
-
-class utf8_to_utf32 {
- public:
-    explicit utf8_to_utf32()
-        : utf32conv_() {}
-    std::u32string convert(std::string const& utf8) {
-        return utf32conv_.from_bytes(utf8);
-    }
- private:
-    std::wstring_convert<std::codecvt_utf8<char32_t>, char32_t> utf32conv_;
-};
-
-#endif
-
 }}
 
 #endif