diff options
author | Dane Springmeyer <dane@mapbox.com> | 2014-11-03 09:12:23 -0500 |
---|---|---|
committer | Dane Springmeyer <dane@mapbox.com> | 2014-11-03 09:12:23 -0500 |
commit | 4084e41e7fed91d056f7501c5ca33bb8c93d2345 (patch) | |
tree | 279403995678c8b5bf8ea3f80aadf64004c824e2 /include/mbgl/util/utf.hpp | |
parent | 403cc268014d5a60162b8047a0deec1c4e31e89e (diff) | |
download | qtlocation-mapboxgl-4084e41e7fed91d056f7501c5ca33bb8c93d2345.tar.gz |
cleanup after 195560090/#309/#530
Diffstat (limited to 'include/mbgl/util/utf.hpp')
-rw-r--r-- | include/mbgl/util/utf.hpp | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/include/mbgl/util/utf.hpp b/include/mbgl/util/utf.hpp index ddf0ff3069..d36cfae7e4 100644 --- a/include/mbgl/util/utf.hpp +++ b/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 |