summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Morris <michael.patrick.morris@gmail.com>2014-08-20 19:43:29 -0400
committerMike Morris <michael.patrick.morris@gmail.com>2014-08-20 19:43:29 -0400
commit3466f364121b3a0a157ce62c417c94802484351a (patch)
treee736b45ab02cc892122661665cd0921923b70853 /src
parent1ff71a78e05e0c12fca26fea2c7bda14b237631a (diff)
downloadqtlocation-mapboxgl-3466f364121b3a0a157ce62c417c94802484351a.tar.gz
bump mapnik-packaging, conform to libuv 0.10 api
Diffstat (limited to 'src')
-rw-r--r--src/map/map.cpp8
-rw-r--r--src/platform/request.cpp2
-rw-r--r--src/util/uv.cpp2
3 files changed, 6 insertions, 6 deletions
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;