diff options
| author | Justin R. Miller <incanus@users.noreply.github.com> | 2015-02-04 17:53:27 -0800 |
|---|---|---|
| committer | Justin R. Miller <incanus@users.noreply.github.com> | 2015-02-04 17:53:27 -0800 |
| commit | 91760aa47eefb2e7d1e660169ee0f6d626b4162b (patch) | |
| tree | 81a2c7203bc7ddbe19a96004c1a620f9250e99fb | |
| parent | 002a709b67ac1ac36d4711a913a3fc082494ff71 (diff) | |
| parent | d093364d2906a2d39b13771875ebb3a69e8d448a (diff) | |
| download | qtlocation-mapboxgl-91760aa47eefb2e7d1e660169ee0f6d626b4162b.tar.gz | |
Merge pull request #817 from mapbox/782-fix-ios-conversion-warning
fixes #782: ignore iOS 64-bit conversion warnings for Boost
| -rw-r--r-- | src/mbgl/text/collision.hpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mbgl/text/collision.hpp b/src/mbgl/text/collision.hpp index 3bf37a6a12..b009982997 100644 --- a/src/mbgl/text/collision.hpp +++ b/src/mbgl/text/collision.hpp @@ -9,6 +9,7 @@ #pragma GCC diagnostic ignored "-Wshadow" #ifdef __clang__ #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" |