diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2015-02-03 17:06:32 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2015-02-04 11:54:01 +0100 |
| commit | 3da75dd70605117ce90586371c199041c44e9c05 (patch) | |
| tree | f1b9c52855b61e2bb9b904a652a0507eced99b18 /platform | |
| parent | b35857e4a93bc72bf8ed0f7b7c596697a78cdddc (diff) | |
| download | qtlocation-mapboxgl-3da75dd70605117ce90586371c199041c44e9c05.tar.gz | |
guard boost include with pragma ignores
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/default/asset_request_fs.cpp | 7 | ||||
| -rw-r--r-- | platform/default/asset_request_zip.cpp | 6 |
2 files changed, 13 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> |