From 178d8ca62d2b6a89b1ee9bcb6f8806d4494395b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= Date: Thu, 21 Aug 2014 16:03:02 +0200 Subject: [PATCH] also use boost codecvt on linux --- include/mbgl/util/utf.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/mbgl/util/utf.hpp b/include/mbgl/util/utf.hpp index fa21df74c..503fff8b1 100644 --- a/include/mbgl/util/utf.hpp +++ b/include/mbgl/util/utf.hpp @@ -4,12 +4,13 @@ #include // 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 #pragma GCC diagnostic pop #else +// Assume that codecvt is present on clang on non-linux systems #include #include #endif