diff options
| author | Brad Leege <bleege@gmail.com> | 2015-05-04 17:04:46 -0500 |
|---|---|---|
| committer | Brad Leege <bleege@gmail.com> | 2015-05-04 17:04:46 -0500 |
| commit | 4ce4e979ff85f8fc135fccf675c6a5e8939cdd66 (patch) | |
| tree | dd49fd5b095445d9ef2ff28ec64157bacbbe2dd5 /src/mbgl/text/collision.hpp | |
| parent | 7f6cc6cc6d462952c02fbc50bd90f4f765a55809 (diff) | |
| parent | c2858dd45f735d99b1bc46043cff0b2a6b176c63 (diff) | |
| download | qtlocation-mapboxgl-4ce4e979ff85f8fc135fccf675c6a5e8939cdd66.tar.gz | |
Updating from master
Diffstat (limited to 'src/mbgl/text/collision.hpp')
| -rw-r--r-- | src/mbgl/text/collision.hpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mbgl/text/collision.hpp b/src/mbgl/text/collision.hpp index bba07b0fb1..50b8e5b218 100644 --- a/src/mbgl/text/collision.hpp +++ b/src/mbgl/text/collision.hpp @@ -9,12 +9,13 @@ #pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wshadow" #ifdef __clang__ +#pragma GCC diagnostic ignored "-Wunknown-pragmas" +#endif +#pragma GCC diagnostic ignored "-Wpragmas" #pragma GCC diagnostic ignored "-Wdeprecated-register" #pragma GCC diagnostic ignored "-Wshorten-64-to-32" -#else #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> |