summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Muir Hamilton <aaron@correspondwith.me>2017-06-14 22:07:36 +0000
committerJohn Firebaugh <john.firebaugh@gmail.com>2017-06-16 13:12:31 -0700
commitafabd2795c95bd11273a370c8045b07296b7a346 (patch)
tree724ebebd98095d91f189846bb65da36b63979cee
parente361bcf66823daa9ae6cae571193a5ba9613c3de (diff)
downloadqtlocation-mapboxgl-afabd2795c95bd11273a370c8045b07296b7a346.tar.gz
Disable misleading indentation warnings where boost is included.
-rw-r--r--src/mbgl/annotation/symbol_annotation_impl.hpp1
-rw-r--r--src/mbgl/text/collision_tile.hpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/mbgl/annotation/symbol_annotation_impl.hpp b/src/mbgl/annotation/symbol_annotation_impl.hpp
index b5be4e9ed9..9270acb857 100644
--- a/src/mbgl/annotation/symbol_annotation_impl.hpp
+++ b/src/mbgl/annotation/symbol_annotation_impl.hpp
@@ -18,6 +18,7 @@
#pragma GCC diagnostic ignored "-Wshorten-64-to-32"
#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#pragma GCC diagnostic ignored "-Wmisleading-indentation"
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point.hpp>
#include <boost/geometry/geometries/box.hpp>
diff --git a/src/mbgl/text/collision_tile.hpp b/src/mbgl/text/collision_tile.hpp
index 653ea74489..bdacbb7437 100644
--- a/src/mbgl/text/collision_tile.hpp
+++ b/src/mbgl/text/collision_tile.hpp
@@ -17,6 +17,7 @@
#pragma GCC diagnostic ignored "-Wshorten-64-to-32"
#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#pragma GCC diagnostic ignored "-Wmisleading-indentation"
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point.hpp>
#include <boost/geometry/geometries/box.hpp>