diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2018-11-01 14:41:44 +0200 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2018-11-01 16:29:37 +0200 |
| commit | 7ff85374a7bcfcfcf27d973f52808e6e3ff76115 (patch) | |
| tree | e899bc808e9933ea2ca72054eb35a5dab91ce82c /src | |
| parent | bcbbc7e5f3381482215531abdf005648028f6921 (diff) | |
| download | qtlocation-mapboxgl-7ff85374a7bcfcfcf27d973f52808e6e3ff76115.tar.gz | |
[build] Remove #pragma diagnostic for boost
Boost is now included as a system header and the compiler
should ignore it when issuing warnings.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mbgl/annotation/symbol_annotation_impl.hpp | 17 | ||||
| -rw-r--r-- | src/mbgl/text/language_tag.cpp | 10 | ||||
| -rw-r--r-- | src/mbgl/util/http_header.cpp | 11 |
3 files changed, 0 insertions, 38 deletions
diff --git a/src/mbgl/annotation/symbol_annotation_impl.hpp b/src/mbgl/annotation/symbol_annotation_impl.hpp index e41ff85f33..d8c85cec21 100644 --- a/src/mbgl/annotation/symbol_annotation_impl.hpp +++ b/src/mbgl/annotation/symbol_annotation_impl.hpp @@ -5,29 +5,12 @@ #include <string> -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-function" -#pragma GCC diagnostic ignored "-Wunused-parameter" -#pragma GCC diagnostic ignored "-Wunused-variable" -#pragma GCC diagnostic ignored "-Wshadow" -#ifdef __clang__ -#pragma GCC diagnostic ignored "-Wunknown-pragmas" -#endif -#pragma GCC diagnostic ignored "-Wpragmas" -#pragma GCC diagnostic ignored "-Wdeprecated-register" -#pragma GCC diagnostic ignored "-Wshorten-64-to-32" -#pragma GCC diagnostic ignored "-Wunused-local-typedefs" -#ifndef __clang__ -#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" -#pragma GCC diagnostic ignored "-Wmisleading-indentation" -#endif #include <boost/geometry.hpp> #include <boost/geometry/geometries/point.hpp> #include <boost/geometry/geometries/box.hpp> #include <boost/geometry/geometries/register/point.hpp> #include <boost/geometry/geometries/register/box.hpp> #include <boost/geometry/index/rtree.hpp> -#pragma GCC diagnostic pop namespace mbgl { diff --git a/src/mbgl/text/language_tag.cpp b/src/mbgl/text/language_tag.cpp index a2ec874010..90d2f26e16 100644 --- a/src/mbgl/text/language_tag.cpp +++ b/src/mbgl/text/language_tag.cpp @@ -1,18 +1,8 @@ #include <mbgl/text/language_tag.hpp> -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunknown-pragmas" -#pragma GCC diagnostic ignored "-Wunused-parameter" -#pragma GCC diagnostic ignored "-Wshadow" -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wshorten-64-to-32" -#pragma clang diagnostic ignored "-Wunknown-warning-option" -#pragma clang diagnostic ignored "-Wtautological-constant-compare" #include <boost/spirit/include/qi.hpp> #include <boost/spirit/include/phoenix_core.hpp> #include <boost/spirit/include/phoenix_operator.hpp> -#pragma clang diagnostic pop -#pragma GCC diagnostic pop #include <sstream> diff --git a/src/mbgl/util/http_header.cpp b/src/mbgl/util/http_header.cpp index 4d9e2bf84c..cdb4759d51 100644 --- a/src/mbgl/util/http_header.cpp +++ b/src/mbgl/util/http_header.cpp @@ -2,20 +2,9 @@ #include <mbgl/util/string.hpp> -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunknown-pragmas" -#pragma GCC diagnostic ignored "-Wunused-parameter" -#pragma GCC diagnostic ignored "-Wshadow" -#pragma clang diagnostic push - -#pragma clang diagnostic ignored "-Wshorten-64-to-32" -#pragma clang diagnostic ignored "-Wunknown-warning-option" -#pragma clang diagnostic ignored "-Wtautological-constant-compare" #include <boost/spirit/include/qi.hpp> #include <boost/spirit/include/phoenix_core.hpp> #include <boost/spirit/include/phoenix_operator.hpp> -#pragma clang diagnostic pop -#pragma GCC diagnostic pop namespace mbgl { namespace http { |