From e1a3b9ff8ea06a31e09c4e7aaad48901959af84a Mon Sep 17 00:00:00 2001 From: "Justin R. Miller" Date: Wed, 4 Feb 2015 17:05:57 -0800 Subject: [PATCH 1/2] fixes #782: ignore 64->32 conversion warnings for Boost --- src/mbgl/text/collision.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mbgl/text/collision.hpp b/src/mbgl/text/collision.hpp index 3bf37a6a1..931b660ce 100644 --- a/src/mbgl/text/collision.hpp +++ b/src/mbgl/text/collision.hpp @@ -7,6 +7,7 @@ #pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wshorten-64-to-32" #ifdef __clang__ #pragma GCC diagnostic ignored "-Wdeprecated-register" #else From d093364d2906a2d39b13771875ebb3a69e8d448a Mon Sep 17 00:00:00 2001 From: "Justin R. Miller" Date: Wed, 4 Feb 2015 17:13:09 -0800 Subject: [PATCH 2/2] only ignore warning on Clang --- src/mbgl/text/collision.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mbgl/text/collision.hpp b/src/mbgl/text/collision.hpp index 931b660ce..b00998299 100644 --- a/src/mbgl/text/collision.hpp +++ b/src/mbgl/text/collision.hpp @@ -7,9 +7,9 @@ #pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wshadow" -#pragma GCC diagnostic ignored "-Wshorten-64-to-32" #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"