summaryrefslogtreecommitdiff
path: root/include/mbgl/util/utf.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'include/mbgl/util/utf.hpp')
-rw-r--r--include/mbgl/util/utf.hpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/mbgl/util/utf.hpp b/include/mbgl/util/utf.hpp
index 5dfc4ad2d1..bb63179123 100644
--- a/include/mbgl/util/utf.hpp
+++ b/include/mbgl/util/utf.hpp
@@ -4,14 +4,13 @@
#include <memory>
// g++/libstdc++ is missing c++11 codecvt support
-#ifdef __linux__
+#if ! defined(__clang__) || defined(__linux__)
#pragma GCC diagnostic push
-#ifndef __clang__
#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
-#endif
#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
@@ -20,7 +19,7 @@ namespace mbgl {
namespace util {
-#ifdef __linux__
+#if ! defined(__clang__) || defined(__linux__)
class utf8_to_utf32 {
public: