diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2015-09-28 13:17:17 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-09-28 13:34:00 -0700 |
| commit | aec145ded3b9c0b4f928fb7cb1d92faac4e0e89a (patch) | |
| tree | e53b32212e601905854b829836e62c1e54d4148f | |
| parent | 92b0ddec267f209172a10e5b5c08563f1b186966 (diff) | |
| download | qtlocation-mapboxgl-aec145ded3b9c0b4f928fb7cb1d92faac4e0e89a.tar.gz | |
[osx] Fix build on Xcode 6.4
| -rw-r--r-- | bin/render.cpp | 7 | ||||
| -rw-r--r-- | macosx/main.mm | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/bin/render.cpp b/bin/render.cpp index 2248d86035..b89ca256e4 100644 --- a/bin/render.cpp +++ b/bin/render.cpp @@ -9,17 +9,12 @@ #include <mbgl/storage/default_file_source.hpp> #include <mbgl/storage/sqlite_cache.hpp> -#pragma clang diagnostic push #pragma GCC diagnostic push -#ifdef __clang__ -#pragma clang diagnostic ignored "-Wunused-local-typedefs" -#else +#pragma GCC diagnostic ignored "-Wunknown-pragmas" #pragma GCC diagnostic ignored "-Wunused-local-typedefs" #pragma GCC diagnostic ignored "-Wshadow" -#endif #include <boost/program_options.hpp> #pragma GCC diagnostic pop -#pragma clang diagnostic pop namespace po = boost::program_options; diff --git a/macosx/main.mm b/macosx/main.mm index 7698773e75..34cd7872b5 100644 --- a/macosx/main.mm +++ b/macosx/main.mm @@ -12,17 +12,12 @@ #import <Foundation/Foundation.h> -#pragma clang diagnostic push #pragma GCC diagnostic push -#ifdef __clang__ -#pragma clang diagnostic ignored "-Wunused-local-typedefs" -#else +#pragma GCC diagnostic ignored "-Wunknown-pragmas" #pragma GCC diagnostic ignored "-Wunused-local-typedefs" #pragma GCC diagnostic ignored "-Wshadow" -#endif #include <boost/program_options.hpp> #pragma GCC diagnostic pop -#pragma clang diagnostic pop #include <iostream> |