diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-29 09:57:21 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-29 09:57:21 -0700 |
| commit | c1ad3214858f6e8a852b2346ad69947b26e43172 (patch) | |
| tree | d5fc6a4e05d3c20d2c0d0105939951faa8d3c761 /platform/default | |
| parent | c86f558e9d608ac19ca5b26ea8f72e2dc43c07c0 (diff) | |
| download | qtlocation-mapboxgl-c1ad3214858f6e8a852b2346ad69947b26e43172.tar.gz | |
[linux] Build with GCC 5 (#4901)
* [linux] Build with GCC 5
* [build] -fabi-version=0 is the default for GCC 5
Diffstat (limited to 'platform/default')
| -rw-r--r-- | platform/default/image.cpp | 7 | ||||
| -rw-r--r-- | platform/default/sqlite3.cpp | 6 |
2 files changed, 3 insertions, 10 deletions
diff --git a/platform/default/image.cpp b/platform/default/image.cpp index 71fb5414b3..2195a999c9 100644 --- a/platform/default/image.cpp +++ b/platform/default/image.cpp @@ -4,10 +4,7 @@ #include <png.h> -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-variable" -// Check png library version. -const static bool png_version_check = []() { +const static bool png_version_check __attribute__((unused)) = []() { const png_uint_32 version = png_access_version_number(); if (version != PNG_LIBPNG_VER) { throw std::runtime_error(mbgl::util::sprintf<96>( @@ -17,7 +14,7 @@ const static bool png_version_check = []() { } return true; }(); -#pragma GCC diagnostic pop + namespace mbgl { std::string encodePNG(const PremultipliedImage& pre) { diff --git a/platform/default/sqlite3.cpp b/platform/default/sqlite3.cpp index a5d619406f..505423d1fd 100644 --- a/platform/default/sqlite3.cpp +++ b/platform/default/sqlite3.cpp @@ -7,10 +7,7 @@ #include <chrono> #include <experimental/optional> -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-variable" -// Check sqlite3 library version. -const static bool sqliteVersionCheck = []() { +const static bool sqliteVersionCheck __attribute__((unused)) = []() { if (sqlite3_libversion_number() / 1000000 != SQLITE_VERSION_NUMBER / 1000000) { char message[96]; snprintf(message, 96, @@ -21,7 +18,6 @@ const static bool sqliteVersionCheck = []() { return true; }(); -#pragma GCC diagnostic pop namespace mapbox { namespace sqlite { |