summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--platform/default/asset_request_fs.cpp7
-rw-r--r--platform/default/asset_request_zip.cpp6
-rw-r--r--src/mbgl/storage/default_file_source.cpp6
3 files changed, 19 insertions, 0 deletions
diff --git a/platform/default/asset_request_fs.cpp b/platform/default/asset_request_fs.cpp
index e3875a08e8..24856e520b 100644
--- a/platform/default/asset_request_fs.cpp
+++ b/platform/default/asset_request_fs.cpp
@@ -6,7 +6,14 @@
#include <mbgl/platform/platform.hpp>
#include <uv.h>
+
+#pragma GCC diagnostic push
+#ifndef __clang__
+#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
+#pragma GCC diagnostic ignored "-Wshadow"
+#endif
#include <boost/algorithm/string.hpp>
+#pragma GCC diagnostic pop
#include <cassert>
diff --git a/platform/default/asset_request_zip.cpp b/platform/default/asset_request_zip.cpp
index 9c1093c5ed..9a5f598bb6 100644
--- a/platform/default/asset_request_zip.cpp
+++ b/platform/default/asset_request_zip.cpp
@@ -7,7 +7,13 @@
#include "uv_zip.h"
+#pragma GCC diagnostic push
+#ifndef __clang__
+#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
+#pragma GCC diagnostic ignored "-Wshadow"
+#endif
#include <boost/algorithm/string.hpp>
+#pragma GCC diagnostic pop
#include <forward_list>
diff --git a/src/mbgl/storage/default_file_source.cpp b/src/mbgl/storage/default_file_source.cpp
index 18e21aee95..e40aaff649 100644
--- a/src/mbgl/storage/default_file_source.cpp
+++ b/src/mbgl/storage/default_file_source.cpp
@@ -10,7 +10,13 @@
#include <mbgl/util/variant.hpp>
+#pragma GCC diagnostic push
+#ifndef __clang__
+#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
+#pragma GCC diagnostic ignored "-Wshadow"
+#endif
#include <boost/algorithm/string.hpp>
+#pragma GCC diagnostic pop
#include <thread>
#include <algorithm>