diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-05-02 12:00:03 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-05-02 12:26:33 -0700 |
commit | fd0f9d1319408c2d33ba8571bcf66dc62f876159 (patch) | |
tree | 041a7ea90aae27575d83db91c8013c609cf14a5b | |
parent | c8c36c395c0c47d983a3a8cf782cd470800ba3bf (diff) | |
download | qtlocation-mapboxgl-fd0f9d1319408c2d33ba8571bcf66dc62f876159.tar.gz |
[core] Remove duplicate copy of utf.hpp
-rw-r--r-- | include/mbgl/util/utf.hpp | 25 | ||||
-rw-r--r-- | src/mbgl/util/utf.hpp | 4 |
2 files changed, 2 insertions, 27 deletions
diff --git a/include/mbgl/util/utf.hpp b/include/mbgl/util/utf.hpp deleted file mode 100644 index 3d61609c0d..0000000000 --- a/include/mbgl/util/utf.hpp +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef MBGL_UTIL_UTF -#define MBGL_UTIL_UTF - -#include <memory> - -#include <boost/regex/pending/unicode_iterator.hpp> - -namespace mbgl { - -namespace util { - -class utf8_to_utf32 { - public: - static std::u32string 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); - } -}; - -} // namespace util -} // namespace mbgl - -#endif diff --git a/src/mbgl/util/utf.hpp b/src/mbgl/util/utf.hpp index d6ba2a1f2f..286036c094 100644 --- a/src/mbgl/util/utf.hpp +++ b/src/mbgl/util/utf.hpp @@ -6,7 +6,6 @@ #include <boost/regex/pending/unicode_iterator.hpp> namespace mbgl { - namespace util { class utf8_to_utf32 { @@ -19,6 +18,7 @@ class utf8_to_utf32 { } }; -}} +} // namespace mbgl +} // namespace util #endif |