summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2018-10-24 11:23:40 +0300
committerBruno de Oliveira Abinader <bruno@mapbox.com>2018-10-24 17:12:17 +0300
commit91dd5ec84dd8970a1b38a497a8df53cc53173bd3 (patch)
tree8892bf19c9f4915def27ff40f1ab65fa3598752d
parentc8434b2e44a06da30189f037f35bc0990d82a375 (diff)
downloadqtlocation-mapboxgl-upstream/renderer-state-has-image-layer-source.tar.gz
[build] GCC 7+ complains about -Wimplicit-fallthrough in utf.cppupstream/renderer-state-has-image-layer-source
-rw-r--r--platform/default/utf.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/platform/default/utf.cpp b/platform/default/utf.cpp
index f0f9d3e67a..fdcff344b9 100644
--- a/platform/default/utf.cpp
+++ b/platform/default/utf.cpp
@@ -1,7 +1,16 @@
#include <mbgl/util/utf.hpp>
+#if defined(__GNUC__) && __GNUC__ >= 7
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+#endif // defined(__GNUC__) && __GNUC__ >= 7
+
#include <boost/locale/encoding_utf.hpp>
+#if defined(__GNUC__) && __GNUC__ >= 7
+#pragma GCC diagnostic pop
+#endif // defined(__GNUC__) && __GNUC__ >= 7
+
namespace mbgl {
namespace util {