diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2017-07-10 13:48:43 +0200 |
|---|---|---|
| committer | Jason Wray <jason@mapbox.com> | 2017-08-25 15:36:30 -0400 |
| commit | fb07beebb4d7284047ecba1af31b82b22be5e67a (patch) | |
| tree | 0d0375f200908b308461609f8a80bb53173efcb3 | |
| parent | b2fd7b680c0bdcb5918424487aba9f083149c123 (diff) | |
| download | qtlocation-mapboxgl-fb07beebb4d7284047ecba1af31b82b22be5e67a.tar.gz | |
[build] Don't use maybe-uninitialized and misleading-indentation in Clang, since they're not implemented there
Cherry-pick of d03fd0dce2efc101021b4cf351945680afaa4349.
| -rw-r--r-- | src/mbgl/annotation/symbol_annotation_impl.hpp | 3 | ||||
| -rw-r--r-- | src/mbgl/text/collision_tile.hpp | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/mbgl/annotation/symbol_annotation_impl.hpp b/src/mbgl/annotation/symbol_annotation_impl.hpp index c9a99ffb8d..2c263ab41e 100644 --- a/src/mbgl/annotation/symbol_annotation_impl.hpp +++ b/src/mbgl/annotation/symbol_annotation_impl.hpp @@ -17,7 +17,10 @@ #pragma GCC diagnostic ignored "-Wdeprecated-register" #pragma GCC diagnostic ignored "-Wshorten-64-to-32" #pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#ifndef __clang__ #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmisleading-indentation" +#endif #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 ea4324edaf..4508e13a4b 100644 --- a/src/mbgl/text/collision_tile.hpp +++ b/src/mbgl/text/collision_tile.hpp @@ -16,7 +16,10 @@ #pragma GCC diagnostic ignored "-Wdeprecated-register" #pragma GCC diagnostic ignored "-Wshorten-64-to-32" #pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#ifndef __clang__ #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmisleading-indentation" +#endif #include <boost/geometry.hpp> #include <boost/geometry/geometries/point.hpp> #include <boost/geometry/geometries/box.hpp> |