Fix -W flags for boost

Fixes #801

android/scripts/common.sh

@@ -7,8 +7,6 @@ NAME=$1
 export JOBS=2
 
 export CC=clang CXX=clang++
-export CXXFLAGS="-Wno-unknown-warning-option -Wno-unused-local-typedefs -Wno-unknown-pragmas ${CXXFLAGS}";
-
 export MASON_PLATFORM=android
 
 mkdir ./android/java/app/src/main/res/raw/

gyp/common.gypi

@@ -22,18 +22,13 @@
             '-Wno-variadic-macros',
             '-frtti',
             '-fexceptions',
-            '-Wno-error=unused-parameter',
           ],
           'GCC_WARN_PEDANTIC': 'YES',
           'GCC_WARN_UNINITIALIZED_AUTOS': 'YES_AGGRESSIVE',
         },
       }],
       ['OS=="linux"', {
-        'cflags_cc': [
-          '-Wno-unknown-pragmas', # We are using '#pragma mark', but it is only available on Darwin.
-          '-Wno-literal-suffix', # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61653
-          '-Wno-unknown-warning-option',
-          '-Wno-error=unused-parameter',
+        'cflags_cc': ['-Wno-unknown-pragmas', # We are using '#pragma mark', but it is only available on Darwin.
         ],
       }],
     ],

include/mbgl/platform/default/jpeg_reader.hpp

@@ -9,7 +9,13 @@ extern "C"
 #include <jpeglib.h>
 }
 
+#pragma GCC diagnostic push
+#ifndef __clang__
+#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
+#pragma GCC diagnostic ignored "-Wshadow"
+#endif
 #include <boost/iostreams/stream.hpp>
+#pragma GCC diagnostic pop
 
 namespace mbgl { namespace util {
 

include/mbgl/platform/default/png_reader.hpp

@@ -11,7 +11,13 @@ extern "C"
 #include <cstring>
 #include <memory>
 
+#pragma GCC diagnostic push
+#ifndef __clang__
+#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
+#pragma GCC diagnostic ignored "-Wshadow"
+#endif
 #include <boost/iostreams/stream.hpp>
+#pragma GCC diagnostic pop
 
 namespace mbgl { namespace util {
 

scripts/flags.sh

@@ -30,6 +30,3 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     #     fi
     # fi
 fi
-
-# turn off a few warnings
-export CXXFLAGS="-Wno-unknown-warning-option -Wno-unused-local-typedefs -Wno-unknown-pragmas ${CXXFLAGS}";