From 07e06e1781cb4ab64d34ed3471a4b67ac927a4ad Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 17 Jun 2015 12:33:48 -0700 Subject: [PATCH] tame a few more boost -Wsign-conversion warnings --- src/image_options.cpp | 8 ++++++++ src/mapped_memory_cache.cpp | 1 + src/text/font_feature_settings.cpp | 1 + 3 files changed, 10 insertions(+) diff --git a/src/image_options.cpp b/src/image_options.cpp index 0c102aeb1..3b1b1fe07 100644 --- a/src/image_options.cpp +++ b/src/image_options.cpp @@ -21,8 +21,16 @@ *****************************************************************************/ #include + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-local-typedef" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wsign-conversion" +#pragma GCC diagnostic ignored "-Wconversion" #include #include +#pragma GCC diagnostic pop namespace mapnik { namespace detail { diff --git a/src/mapped_memory_cache.cpp b/src/mapped_memory_cache.cpp index 318c81c7c..abe08d1b9 100644 --- a/src/mapped_memory_cache.cpp +++ b/src/mapped_memory_cache.cpp @@ -31,6 +31,7 @@ #include #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wsign-conversion" #include #include #pragma GCC diagnostic pop diff --git a/src/text/font_feature_settings.cpp b/src/text/font_feature_settings.cpp index ac46e4f9b..581c08501 100644 --- a/src/text/font_feature_settings.cpp +++ b/src/text/font_feature_settings.cpp @@ -29,6 +29,7 @@ #pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wunused-local-typedef" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" +#pragma GCC diagnostic ignored "-Wsign-conversion" #include #include #pragma GCC diagnostic pop