summaryrefslogtreecommitdiff
path: root/platform/default
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2015-04-16 16:46:12 +0200
committerKonstantin Käfer <mail@kkaefer.com>2015-04-28 10:43:13 +0200
commit2b633cc51cd44be3f0224f0b105b18f0a3d7d657 (patch)
tree35b31e4b19cd43a56409843cc6c73eb979c06731 /platform/default
parent67fdfbadb3382e895d2d0bb622520fc481ae2ee8 (diff)
downloadqtlocation-mapboxgl-2b633cc51cd44be3f0224f0b105b18f0a3d7d657.tar.gz
build on Travis' sudo: false infrastructure
Diffstat (limited to 'platform/default')
-rw-r--r--platform/default/asset_request_fs.cpp2
-rw-r--r--platform/default/asset_request_zip.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/platform/default/asset_request_fs.cpp b/platform/default/asset_request_fs.cpp
index a7d813b720..08b336ad38 100644
--- a/platform/default/asset_request_fs.cpp
+++ b/platform/default/asset_request_fs.cpp
@@ -7,9 +7,9 @@
#include <uv.h>
#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
#ifndef __clang__
#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
-#pragma GCC diagnostic ignored "-Wshadow"
#endif
#include <boost/algorithm/string.hpp>
#pragma GCC diagnostic pop
diff --git a/platform/default/asset_request_zip.cpp b/platform/default/asset_request_zip.cpp
index 22d426c762..f66ca619ba 100644
--- a/platform/default/asset_request_zip.cpp
+++ b/platform/default/asset_request_zip.cpp
@@ -8,9 +8,9 @@
#include "uv_zip.h"
#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
#ifndef __clang__
#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
-#pragma GCC diagnostic ignored "-Wshadow"
#endif
#include <boost/algorithm/string.hpp>
#pragma GCC diagnostic pop