diff options
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | include/mbgl/text/collision.hpp | 1 | ||||
| -rw-r--r-- | include/mbgl/util/uv-worker.h | 3 | ||||
| -rw-r--r-- | src/storage/file_request_baton.cpp | 6 |
4 files changed, 5 insertions, 7 deletions
@@ -81,7 +81,7 @@ CONFIG="# Do not edit. Generated by the configure script. 'python': '${PYTHON}', " -if [ ! -z ${LIBCURL_VERSION} ]; then +if [ ! -z ${BOOST_VERSION} ]; then mason install boost ${BOOST_VERSION} CONFIG+=" 'boost_root': '$(mason prefix boost ${BOOST_VERSION})',"$LN fi diff --git a/include/mbgl/text/collision.hpp b/include/mbgl/text/collision.hpp index 8eec30f216..b7ee6b4520 100644 --- a/include/mbgl/text/collision.hpp +++ b/include/mbgl/text/collision.hpp @@ -5,6 +5,7 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" #ifdef __clang__ #pragma GCC diagnostic ignored "-Wdeprecated-register" #else diff --git a/include/mbgl/util/uv-worker.h b/include/mbgl/util/uv-worker.h index 451b6fb04d..cb2075d1c3 100644 --- a/include/mbgl/util/uv-worker.h +++ b/include/mbgl/util/uv-worker.h @@ -5,8 +5,7 @@ extern "C" { #endif -typedef struct uv_messenger_s uv_messenger_t; - +#include <mbgl/util/uv-messenger.h> #include <mbgl/util/uv-channel.h> #include <stdlib.h> diff --git a/src/storage/file_request_baton.cpp b/src/storage/file_request_baton.cpp index d4c135fd71..64c6c13b12 100644 --- a/src/storage/file_request_baton.cpp +++ b/src/storage/file_request_baton.cpp @@ -58,8 +58,7 @@ void FileRequestBaton::file_opened(uv_fs_t *req) { uv_fs_close(req->loop, req, fd, file_closed); } else { ptr->fd = fd; - const int r = uv_fs_fstat(req->loop, req, fd, file_stated); - assert(r == 0); + uv_fs_fstat(req->loop, req, fd, file_stated); } } } @@ -135,8 +134,7 @@ void FileRequestBaton::file_read(uv_fs_t *req) { } void FileRequestBaton::file_closed(uv_fs_t *req) { - FileRequestBaton *ptr = (FileRequestBaton *)req->data; - assert(ptr->thread_id == uv_thread_self()); + assert(((FileRequestBaton *)req->data)->thread_id == uv_thread_self()); if (req->result < 0) { // Closing the file failed. But there isn't anything we can do. |