summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-07-01 05:15:26 -0700
committerKonstantin Käfer <mail@kkaefer.com>2014-07-01 05:15:26 -0700
commitce44d8255d88ff435d11f5a7d6a20e53610f5367 (patch)
treee277eb07362e9e26ec3167dc00145c640b5c52f3 /src
parent475f0481b3afa43d9d0558d93001f362befaab95 (diff)
downloadqtlocation-mapboxgl-ce44d8255d88ff435d11f5a7d6a20e53610f5367.tar.gz
ignore boost warnings with gcc as well
Diffstat (limited to 'src')
-rw-r--r--src/text/collision.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/text/collision.cpp b/src/text/collision.cpp
index 0da50f2809..0b4c65885a 100644
--- a/src/text/collision.cpp
+++ b/src/text/collision.cpp
@@ -2,14 +2,17 @@
#include <llmr/text/rotation_range.hpp>
#include <llmr/util/math.hpp>
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-parameter"
-#pragma clang diagnostic ignored "-Wdeprecated-register"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#ifndef __clang__
+#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point.hpp>
#include <boost/geometry/geometries/box.hpp>
#include <boost/geometry/index/rtree.hpp>
-#pragma clang diagnostic pop
+#pragma GCC diagnostic pop
namespace llmr {
namespace bg = boost::geometry;