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 /include/mbgl/platform | |
| parent | 51c069502880e38a6dabf520c032fd6f293ee744 (diff) | |
| download | qtlocation-mapboxgl-74604af9c5e53474ff8a8053fc43b254f1d1cf42.tar.gz | |
fix compile with clang-3.6
Diffstat (limited to 'include/mbgl/platform')
| -rw-r--r-- | include/mbgl/platform/default/jpeg_reader.hpp | 3 | ||||
| -rw-r--r-- | include/mbgl/platform/default/png_reader.hpp | 3 |
2 files changed, 2 insertions, 4 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 |