diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-08-21 16:03:02 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-08-21 16:03:02 +0200 |
| commit | 178d8ca62d2b6a89b1ee9bcb6f8806d4494395b1 (patch) | |
| tree | 0df6fe429f4f0d1f4a73f62c69932b8bee0d1263 /include/mbgl/util/utf.hpp | |
| parent | 6730beec0e7d515339a82e80263b9323c665f77b (diff) | |
| download | qtlocation-mapboxgl-178d8ca62d2b6a89b1ee9bcb6f8806d4494395b1.tar.gz | |
also use boost codecvt on linux
Diffstat (limited to 'include/mbgl/util/utf.hpp')
| -rw-r--r-- | include/mbgl/util/utf.hpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/mbgl/util/utf.hpp b/include/mbgl/util/utf.hpp index fa21df74c0..503fff8b1e 100644 --- a/include/mbgl/util/utf.hpp +++ b/include/mbgl/util/utf.hpp @@ -4,12 +4,13 @@ #include <memory> // g++/libstdc++ is missing c++11 codecvt support -#ifndef __clang__ +#if ! defined(__clang__) || defined(__linux__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-local-typedefs" #include <boost/locale.hpp> #pragma GCC diagnostic pop #else +// Assume that codecvt is present on clang on non-linux systems #include <codecvt> #include <locale> #endif |