Merge pull request nodegit#446 from nodegit/ol-upgrade-nan

orderedlist · orderedlist · commit f0b29f587316 · 2015-03-01T17:12:43.000-05:00
Upgrade to nan 1.7.0
diff --git 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
@@ -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;
           }
diff --git 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",
