summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJustin R. Miller <incanus@codesorcery.net>2015-02-04 17:05:57 -0800
committerJustin R. Miller <incanus@codesorcery.net>2015-02-04 17:05:57 -0800
commite1a3b9ff8ea06a31e09c4e7aaad48901959af84a (patch)
treed7703659310634734cfdcfcd49d119badf8837cb /src
parent002a709b67ac1ac36d4711a913a3fc082494ff71 (diff)
downloadqtlocation-mapboxgl-e1a3b9ff8ea06a31e09c4e7aaad48901959af84a.tar.gz
fixes #782: ignore 64->32 conversion warnings for Boost
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/text/collision.hpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mbgl/text/collision.hpp b/src/mbgl/text/collision.hpp
index 3bf37a6a12..931b660cea 100644
--- a/src/mbgl/text/collision.hpp
+++ b/src/mbgl/text/collision.hpp
@@ -7,6 +7,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wshadow"
+#pragma GCC diagnostic ignored "-Wshorten-64-to-32"
#ifdef __clang__
#pragma GCC diagnostic ignored "-Wdeprecated-register"
#else