tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix compile with clang-3.6

Browse Source
This commit is contained in:
Dane Springmeyer
2015-05-01 11:00:01 -07:00
parent 51c0695028
commit 74604af9c5
6 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/mbgl/platform/default/jpeg_reader.hpp
View File

@@ -10,10 +10,9 @@ extern "C"
} }
#pragma GCC diagnostic push #pragma GCC diagnostic push
#ifndef __clang__ #pragma GCC diagnostic ignored "-Wunknown-pragmas"
#pragma GCC diagnostic ignored "-Wunused-local-typedefs" #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
#pragma GCC diagnostic ignored "-Wshadow" #pragma GCC diagnostic ignored "-Wshadow"
#endif
#include <boost/iostreams/stream.hpp> #include <boost/iostreams/stream.hpp>
#pragma GCC diagnostic pop #pragma GCC diagnostic pop

3
include/mbgl/platform/default/png_reader.hpp
View File

@@ -12,10 +12,9 @@ extern "C"
#include <memory> #include <memory>
#pragma GCC diagnostic push #pragma GCC diagnostic push
#ifndef __clang__ #pragma GCC diagnostic ignored "-Wunknown-pragmas"
#pragma GCC diagnostic ignored "-Wunused-local-typedefs" #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
#pragma GCC diagnostic ignored "-Wshadow" #pragma GCC diagnostic ignored "-Wshadow"
#endif
#include <boost/iostreams/stream.hpp> #include <boost/iostreams/stream.hpp>
#pragma GCC diagnostic pop #pragma GCC diagnostic pop

3
include/mbgl/util/string.hpp
View File

@@ -4,9 +4,8 @@
#include <string> #include <string>
#pragma GCC diagnostic push #pragma GCC diagnostic push
#ifndef __clang__ #pragma GCC diagnostic ignored "-Wunknown-pragmas"
#pragma GCC diagnostic ignored "-Wunused-local-typedefs" #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
#endif
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#pragma GCC diagnostic pop #pragma GCC diagnostic pop

3
src/mbgl/storage/default_file_source.cpp
View File

@@ -13,9 +13,8 @@
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow" #pragma GCC diagnostic ignored "-Wshadow"
#ifndef __clang__ #pragma GCC diagnostic ignored "-Wunknown-pragmas"
#pragma GCC diagnostic ignored "-Wunused-local-typedefs" #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
#endif
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#pragma GCC diagnostic pop #pragma GCC diagnostic pop

3
src/mbgl/style/style_parser.cpp
View File

@@ -11,9 +11,8 @@
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow" #pragma GCC diagnostic ignored "-Wshadow"
#ifndef __clang__ #pragma GCC diagnostic ignored "-Wunknown-pragmas"
#pragma GCC diagnostic ignored "-Wunused-local-typedefs" #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
#endif
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#pragma GCC diagnostic pop #pragma GCC diagnostic pop

5
src/mbgl/text/collision.hpp
View File

@@ -9,12 +9,13 @@
#pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wshadow" #pragma GCC diagnostic ignored "-Wshadow"
#ifdef __clang__ #ifdef __clang__
#pragma GCC diagnostic ignored "-Wunknown-pragmas"
#endif
#pragma GCC diagnostic ignored "-Wpragmas"
#pragma GCC diagnostic ignored "-Wdeprecated-register" #pragma GCC diagnostic ignored "-Wdeprecated-register"
#pragma GCC diagnostic ignored "-Wshorten-64-to-32" #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
#else
#pragma GCC diagnostic ignored "-Wunused-local-typedefs" #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif
#include <boost/geometry.hpp> #include <boost/geometry.hpp>
#include <boost/geometry/geometries/point.hpp> #include <boost/geometry/geometries/point.hpp>
#include <boost/geometry/geometries/box.hpp> #include <boost/geometry/geometries/box.hpp>