bump mapnik-packaging, conform to libuv 0.10 api

This commit is contained in:
Mike Morris
2014-08-20 19:43:29 -04:00
parent 1ff71a78e0
commit 3466f36412
6 changed files with 12 additions and 12 deletions

View File

@@ -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();

View File

@@ -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;

View File

@@ -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

View File

@@ -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*/) {

View File

@@ -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);

View File

@@ -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;