diff options
-rw-r--r-- | include/mbgl/map/map.hpp | 8 | ||||
-rw-r--r-- | include/mbgl/platform/request.hpp | 2 | ||||
-rwxr-xr-x | setup-libraries.sh | 2 | ||||
-rw-r--r-- | src/map/map.cpp | 8 | ||||
-rw-r--r-- | src/platform/request.cpp | 2 | ||||
-rw-r--r-- | src/util/uv.cpp | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index fba38879ed..4c5952a2c1 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -129,10 +129,10 @@ public: private: // uv async callbacks - static void render(uv_async_t *async); - static void terminate(uv_async_t *async); - static void cleanup(uv_async_t *async); - static void delete_async(uv_handle_t *handle); + static void render(uv_async_t *async, int status); + static void terminate(uv_async_t *async, int status); + static void cleanup(uv_async_t *async, int status); + static void delete_async(uv_handle_t *handle, int status); // Setup void setup(); diff --git a/include/mbgl/platform/request.hpp b/include/mbgl/platform/request.hpp index 0cbacf645d..2a231769c1 100644 --- a/include/mbgl/platform/request.hpp +++ b/include/mbgl/platform/request.hpp @@ -24,7 +24,7 @@ public: void complete(); private: - static void complete(uv_async_t *async); + static void complete(uv_async_t *async, int status); public: const std::string url; diff --git a/setup-libraries.sh b/setup-libraries.sh index 5ad69fb14d..bcf318ae81 100755 --- a/setup-libraries.sh +++ b/setup-libraries.sh @@ -51,7 +51,7 @@ set -u NODE=$(which node) NPM=$(which npm) -MP_HASH="9d134bf" +MP_HASH="c07b197" if [ ! -d 'mapnik-packaging/' ]; then git clone https://github.com/mapnik/mapnik-packaging.git fi diff --git a/src/map/map.cpp b/src/map/map.cpp index 6aa9071a4f..8caea4c797 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -98,7 +98,7 @@ void Map::stop() { async = false; } -void Map::delete_async(uv_handle_t *handle) { +void Map::delete_async(uv_handle_t *handle, int status) { delete (uv_async_t *)handle; } @@ -143,14 +143,14 @@ void Map::cleanup() { } } -void Map::cleanup(uv_async_t *async) { +void Map::cleanup(uv_async_t *async, int status) { Map *map = static_cast<Map *>(async->data); map->view.make_active(); map->painter.cleanup(); } -void Map::render(uv_async_t *async) { +void Map::render(uv_async_t *async, int status) { Map *map = static_cast<Map *>(async->data); @@ -170,7 +170,7 @@ void Map::render(uv_async_t *async) { } } -void Map::terminate(uv_async_t *async) { +void Map::terminate(uv_async_t *async, int status) { // Closes all open handles on the loop. This means that the loop will automatically terminate. uv_loop_t *loop = static_cast<uv_loop_t *>(async->data); uv_walk(loop, [](uv_handle_t *handle, void */*arg*/) { diff --git a/src/platform/request.cpp b/src/platform/request.cpp index efd17895db..b028d83227 100644 --- a/src/platform/request.cpp +++ b/src/platform/request.cpp @@ -41,7 +41,7 @@ void Request::complete() { } } -void Request::complete(uv_async_t *async) { +void Request::complete(uv_async_t *async, int status) { Response *res = static_cast<std::unique_ptr<Response> *>(async->data)->get(); res->callback(res); diff --git a/src/util/uv.cpp b/src/util/uv.cpp index 65c790b9c0..94f074bfa1 100644 --- a/src/util/uv.cpp +++ b/src/util/uv.cpp @@ -10,7 +10,7 @@ std::string cwd() { do { max += 256; dir.resize(max); - uv_cwd(const_cast<char *>(dir.data()), &max); + uv_cwd(const_cast<char *>(dir.data()), max); } while (max == dir.size()); dir.resize(max - 1); return dir; |