diff options
| author | Dane Springmeyer <dane@mapbox.com> | 2015-05-01 11:00:01 -0700 |
|---|---|---|
| committer | Dane Springmeyer <dane@mapbox.com> | 2015-05-01 11:00:01 -0700 |
| commit | 74604af9c5e53474ff8a8053fc43b254f1d1cf42 (patch) | |
| tree | 1da7749b27f6db0b3b1ce00581d8bdba0669da94 | |
| parent | 51c069502880e38a6dabf520c032fd6f293ee744 (diff) | |
| download | qtlocation-mapboxgl-74604af9c5e53474ff8a8053fc43b254f1d1cf42.tar.gz | |
fix compile with clang-3.6
| -rw-r--r-- | include/mbgl/platform/default/jpeg_reader.hpp | 3 | ||||
| -rw-r--r-- | include/mbgl/platform/default/png_reader.hpp | 3 | ||||
| -rw-r--r-- | include/mbgl/util/string.hpp | 3 | ||||
| -rw-r--r-- | src/mbgl/storage/default_file_source.cpp | 3 | ||||
| -rw-r--r-- | src/mbgl/style/style_parser.cpp | 3 | ||||
| -rw-r--r-- | src/mbgl/text/collision.hpp | 5 |
6 files changed, 8 insertions, 12 deletions
diff --git a/include/mbgl/platform/default/jpeg_reader.hpp b/include/mbgl/platform/default/jpeg_reader.hpp index e041c0a5db..3e64ce291b 100644 --- a/include/mbgl/platform/default/jpeg_reader.hpp +++ b/include/mbgl/platform/default/jpeg_reader.hpp @@ -10,10 +10,9 @@ extern "C" } #pragma GCC diagnostic push -#ifndef __clang__ +#pragma GCC diagnostic ignored "-Wunknown-pragmas" #pragma GCC diagnostic ignored "-Wunused-local-typedefs" #pragma GCC diagnostic ignored "-Wshadow" -#endif #include <boost/iostreams/stream.hpp> #pragma GCC diagnostic pop diff --git a/include/mbgl/platform/default/png_reader.hpp b/include/mbgl/platform/default/png_reader.hpp index 649e7a75c9..5cbbc51e77 100644 --- a/include/mbgl/platform/default/png_reader.hpp +++ b/include/mbgl/platform/default/png_reader.hpp @@ -12,10 +12,9 @@ extern "C" #include <memory> #pragma GCC diagnostic push -#ifndef __clang__ +#pragma GCC diagnostic ignored "-Wunknown-pragmas" #pragma GCC diagnostic ignored "-Wunused-local-typedefs" #pragma GCC diagnostic ignored "-Wshadow" -#endif #include <boost/iostreams/stream.hpp> #pragma GCC diagnostic pop diff --git a/include/mbgl/util/string.hpp b/include/mbgl/util/string.hpp index 690a67d471..672ead2443 100644 --- a/include/mbgl/util/string.hpp +++ b/include/mbgl/util/string.hpp @@ -4,9 +4,8 @@ #include <string> #pragma GCC diagnostic push -#ifndef __clang__ +#pragma GCC diagnostic ignored "-Wunknown-pragmas" #pragma GCC diagnostic ignored "-Wunused-local-typedefs" -#endif #include <boost/lexical_cast.hpp> #pragma GCC diagnostic pop diff --git a/src/mbgl/storage/default_file_source.cpp b/src/mbgl/storage/default_file_source.cpp index 7ddfa08d93..1063b22ecc 100644 --- a/src/mbgl/storage/default_file_source.cpp +++ b/src/mbgl/storage/default_file_source.cpp @@ -13,9 +13,8 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wshadow" -#ifndef __clang__ +#pragma GCC diagnostic ignored "-Wunknown-pragmas" #pragma GCC diagnostic ignored "-Wunused-local-typedefs" -#endif #include <boost/algorithm/string.hpp> #pragma GCC diagnostic pop diff --git a/src/mbgl/style/style_parser.cpp b/src/mbgl/style/style_parser.cpp index da6630ef03..313fe3df89 100644 --- a/src/mbgl/style/style_parser.cpp +++ b/src/mbgl/style/style_parser.cpp @@ -11,9 +11,8 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wshadow" -#ifndef __clang__ +#pragma GCC diagnostic ignored "-Wunknown-pragmas" #pragma GCC diagnostic ignored "-Wunused-local-typedefs" -#endif #include <boost/algorithm/string.hpp> #pragma GCC diagnostic pop diff --git a/src/mbgl/text/collision.hpp b/src/mbgl/text/collision.hpp index bba07b0fb1..50b8e5b218 100644 --- a/src/mbgl/text/collision.hpp +++ b/src/mbgl/text/collision.hpp @@ -9,12 +9,13 @@ #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" -#else #pragma GCC diagnostic ignored "-Wunused-local-typedefs" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" -#endif #include <boost/geometry.hpp> #include <boost/geometry/geometries/point.hpp> #include <boost/geometry/geometries/box.hpp> |