From c03d63431592661e4a8f26a929b413331dbfd3a9 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Sun, 1 Mar 2015 15:22:25 -0500 Subject: [PATCH 1/2] Upgrade to nan 1.7.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eb5ea2d6a..2af20f46c 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "jshint": "^2.6.0", "lodash": "^3.1.0", "mocha": "~2.1.0", - "nan": "^1.6.2", + "nan": "^1.7.0", "node-gyp": "~1.0.2", "nw-gyp": "^0.12.4", "request": "^2.53.0", From c73435eefc929a2123669d1da3f668cfd01d7231 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Sun, 1 Mar 2015 17:03:45 -0500 Subject: [PATCH 2/2] Explicit typecast of the callback to uv_async_cb --- generate/templates/partials/callback_helpers.cc | 4 ++-- generate/templates/partials/field_accessors.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/generate/templates/partials/callback_helpers.cc b/generate/templates/partials/callback_helpers.cc index 9fddbc29a..f5bc67f71 100644 --- a/generate/templates/partials/callback_helpers.cc +++ b/generate/templates/partials/callback_helpers.cc @@ -16,7 +16,7 @@ baton->req.data = baton; baton->done = false; - uv_async_init(uv_default_loop(), &baton->req, {{ cppFunctionName }}_{{ cbFunction.name }}_async); + uv_async_init(uv_default_loop(), &baton->req, (uv_async_cb) {{ cppFunctionName }}_{{ cbFunction.name }}_async); uv_async_send(&baton->req); while(!baton->done) { @@ -80,7 +80,7 @@ void {{ cppClassName }}::{{ cppFunctionName }}_{{ cbFunction.name }}_async(uv_as NanAssignPersistent(baton->promise, promise); - uv_async_init(uv_default_loop(), &baton->req, {{ cppFunctionName }}_{{ cbFunction.name }}_asyncPromisePolling); + uv_async_init(uv_default_loop(), &baton->req, (uv_async_cb) {{ cppFunctionName }}_{{ cbFunction.name }}_asyncPromisePolling); uv_async_send(&baton->req); return; } diff --git a/generate/templates/partials/field_accessors.cc b/generate/templates/partials/field_accessors.cc index bca05db4c..235a8888a 100644 --- a/generate/templates/partials/field_accessors.cc +++ b/generate/templates/partials/field_accessors.cc @@ -96,7 +96,7 @@ baton->req.data = baton; baton->done = false; - uv_async_init(uv_default_loop(), &baton->req, {{ field.name }}_async); + uv_async_init(uv_default_loop(), &baton->req, (uv_async_cb) {{ field.name }}_async); uv_async_send(&baton->req); while(!baton->done) { @@ -173,7 +173,7 @@ NanAssignPersistent(baton->promise, promise); - uv_async_init(uv_default_loop(), &baton->req, {{ field.name }}_asyncPromisePolling); + uv_async_init(uv_default_loop(), &baton->req, (uv_async_cb) {{ field.name }}_asyncPromisePolling); uv_async_send(&baton->req); return; }