summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-08-18 15:43:06 +0200
committerKonstantin Käfer <mail@kkaefer.com>2014-08-18 15:43:06 +0200
commitde72cf45afe6386bc9c798fb776fbdb708a62131 (patch)
treed31185a30b460a92ed47d905e98155612d949245 /include
parent2076d3d97bf7cf33aa93285debdfd8181a9c2f33 (diff)
parentc1d1237e97e18c90212e870ff075f4fa07624c60 (diff)
downloadqtlocation-mapboxgl-de72cf45afe6386bc9c798fb776fbdb708a62131.tar.gz
Merge pull request #430 from mapbox/fix-build-warnings
Fix build warnings
Diffstat (limited to 'include')
-rw-r--r--include/mbgl/text/collision.hpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/mbgl/text/collision.hpp b/include/mbgl/text/collision.hpp
index e2e2414ba7..7e65e979da 100644
--- a/include/mbgl/text/collision.hpp
+++ b/include/mbgl/text/collision.hpp
@@ -5,6 +5,7 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wdeprecated-register"
#ifndef __clang__
#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"