diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-11-06 14:18:52 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-11-06 14:18:52 +0100 |
| commit | 618a4a5785e07b9663111d8d7f4b33c0f6be0c55 (patch) | |
| tree | e272af080d977c61e16058e5cd680fb00b430dcf | |
| parent | d7cfc05cea2b28111c6100b30555b84ad4751873 (diff) | |
| download | qtlocation-mapboxgl-618a4a5785e07b9663111d8d7f4b33c0f6be0c55.tar.gz | |
add -Werror to os x as well
| -rw-r--r-- | gyp/common.gypi | 2 | ||||
| -rw-r--r-- | src/storage/response.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gyp/common.gypi b/gyp/common.gypi index b21e8b50d7..df055b199f 100644 --- a/gyp/common.gypi +++ b/gyp/common.gypi @@ -14,7 +14,7 @@ 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES', 'GCC_ENABLE_CPP_RTTI':'YES', - 'OTHER_CPLUSPLUSFLAGS': [ '-Wall', '-Wextra', '-Wshadow', '-Wno-variadic-macros', '-frtti', '-fexceptions' ], + 'OTHER_CPLUSPLUSFLAGS': [ '-Werror', '-Wall', '-Wextra', '-Wshadow', '-Wno-variadic-macros', '-frtti', '-fexceptions' ], 'GCC_WARN_PEDANTIC': 'YES', 'GCC_WARN_UNINITIALIZED_AUTOS': 'YES_AGGRESSIVE', }, diff --git a/src/storage/response.cpp b/src/storage/response.cpp index f1e1c35874..a08a6d31ce 100644 --- a/src/storage/response.cpp +++ b/src/storage/response.cpp @@ -6,10 +6,10 @@ namespace mbgl { int64_t Response::parseCacheControl(const char *value) { if (value) { - uint64_t seconds = 0; + unsigned long long seconds = 0; // TODO: cache-control may contain other information as well: // http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9 - if (std::sscanf(value, "max-age=%lu", &seconds) == 1) { + if (std::sscanf(value, "max-age=%llu", &seconds) == 1) { return std::chrono::duration_cast<std::chrono::seconds>( std::chrono::system_clock::now().time_since_epoch()).count() + seconds; |