summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/mbgl/util/expected.hpp3
-rw-r--r--platform/default/png_writer.cpp3
-rw-r--r--platform/default/utf.cpp9
-rw-r--r--src/mbgl/annotation/symbol_annotation_impl.hpp17
-rw-r--r--src/mbgl/text/language_tag.cpp10
-rw-r--r--src/mbgl/util/http_header.cpp11
6 files changed, 0 insertions, 53 deletions
diff --git a/include/mbgl/util/expected.hpp b/include/mbgl/util/expected.hpp
index a45f071065..135de3cf9b 100644
--- a/include/mbgl/util/expected.hpp
+++ b/include/mbgl/util/expected.hpp
@@ -1,9 +1,6 @@
#pragma once
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow"
#include <expected.hpp>
-#pragma GCC diagnostic pop
namespace mbgl {
diff --git a/platform/default/png_writer.cpp b/platform/default/png_writer.cpp
index 9ef9052158..b89e253f85 100644
--- a/platform/default/png_writer.cpp
+++ b/platform/default/png_writer.cpp
@@ -2,10 +2,7 @@
#include <mbgl/util/image.hpp>
#include <mbgl/util/premultiply.hpp>
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/crc.hpp>
-#pragma GCC diagnostic pop
#include <cassert>
#include <cstring>
diff --git a/platform/default/utf.cpp b/platform/default/utf.cpp
index fdcff344b9..f0f9d3e67a 100644
--- a/platform/default/utf.cpp
+++ b/platform/default/utf.cpp
@@ -1,16 +1,7 @@
#include <mbgl/util/utf.hpp>
-#if defined(__GNUC__) && __GNUC__ >= 7
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
-#endif // defined(__GNUC__) && __GNUC__ >= 7
-
#include <boost/locale/encoding_utf.hpp>
-#if defined(__GNUC__) && __GNUC__ >= 7
-#pragma GCC diagnostic pop
-#endif // defined(__GNUC__) && __GNUC__ >= 7
-
namespace mbgl {
namespace util {
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 {