summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-04-29 09:57:21 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-04-29 09:57:21 -0700
commitc1ad3214858f6e8a852b2346ad69947b26e43172 (patch)
treed5fc6a4e05d3c20d2c0d0105939951faa8d3c761 /src
parentc86f558e9d608ac19ca5b26ea8f72e2dc43c07c0 (diff)
downloadqtlocation-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 'src')
-rw-r--r--src/mbgl/util/compression.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/mbgl/util/compression.cpp b/src/mbgl/util/compression.cpp
index 5dc3f1127c..e189991b55 100644
--- a/src/mbgl/util/compression.cpp
+++ b/src/mbgl/util/compression.cpp
@@ -6,11 +6,8 @@
#include <cstring>
#include <stdexcept>
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-variable"
-
// Check zlib library version.
-const static bool zlibVersionCheck = []() {
+const static bool zlibVersionCheck __attribute__((unused)) = []() {
const char *const version = zlibVersion();
if (version[0] != ZLIB_VERSION[0]) {
char message[96];
@@ -22,8 +19,6 @@ const static bool zlibVersionCheck = []() {
return true;
}();
-#pragma GCC diagnostic pop
-
namespace mbgl {
namespace util {