From: Daniel Poelzleithner <poelzi@poelzi.org>
Date: Thu, 18 Apr 2013 23:18:47 +0000 (+0200)
Subject: fix compatibility with node 0.10
X-Git-Tag: v1.2.12~351^2^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bff8e954a06ec7f4087a7457244f49729a0af422;p=platform%2Fupstream%2Fejdb.git

fix compatibility with node 0.10
---

diff --git a/node/ejdb_native.cc b/node/ejdb_native.cc
index 5c58503..8ca0558 100644
--- a/node/ejdb_native.cc
+++ b/node/ejdb_native.cc
@@ -659,7 +659,7 @@ namespace ejdb {
             if (args[2]->IsFunction()) {
                 cb = Local<Function>::Cast(args[2]);
                 BSONCmdTask *task = new BSONCmdTask(cb, njb, cmdLoad, cmdata, BSONCmdTask::delete_val);
-                uv_queue_work(uv_default_loop(), &task->uv_work, s_exec_cmd_eio, s_exec_cmd_eio_after);
+                uv_queue_work(uv_default_loop(), &task->uv_work, s_exec_cmd_eio, (uv_after_work_cb)s_exec_cmd_eio_after);
                 return scope.Close(Undefined());
             } else {
                 BSONCmdTask task(cb, njb, cmdLoad, cmdata, BSONCmdTask::delete_val);
@@ -686,7 +686,7 @@ namespace ejdb {
             if (args[2]->IsFunction()) {
                 cb = Local<Function>::Cast(args[2]);
                 BSONCmdTask *task = new BSONCmdTask(cb, njb, cmdRemove, cmdata, BSONCmdTask::delete_val);
-                uv_queue_work(uv_default_loop(), &task->uv_work, s_exec_cmd_eio, s_exec_cmd_eio_after);
+                uv_queue_work(uv_default_loop(), &task->uv_work, s_exec_cmd_eio, (uv_after_work_cb)s_exec_cmd_eio_after);
                 return scope.Close(Undefined());
             } else {
                 BSONCmdTask task(cb, njb, cmdRemove, cmdata, BSONCmdTask::delete_val);
@@ -731,7 +731,7 @@ namespace ejdb {
             if (args[3]->IsFunction()) { //callback provided
                 cb = Local<Function>::Cast(args[3]);
                 BSONCmdTask *task = new BSONCmdTask(cb, njb, cmdSave, cmdata, BSONCmdTask::delete_val);
-                uv_queue_work(uv_default_loop(), &task->uv_work, s_exec_cmd_eio, s_exec_cmd_eio_after);
+                uv_queue_work(uv_default_loop(), &task->uv_work, s_exec_cmd_eio, (uv_after_work_cb)s_exec_cmd_eio_after);
                 return scope.Close(Undefined());
             } else {
                 BSONCmdTask task(cb, njb, cmdSave, cmdata, BSONCmdTask::delete_val);
@@ -790,7 +790,7 @@ namespace ejdb {
             if (args[3]->IsFunction()) { //callback provided
                 cb = Local<Function>::Cast(args[3]);
                 BSONQCmdTask *task = new BSONQCmdTask(cb, njb, cmdQuery, cmdata, BSONQCmdTask::delete_val);
-                uv_queue_work(uv_default_loop(), &task->uv_work, s_exec_cmd_eio, s_exec_cmd_eio_after);
+                uv_queue_work(uv_default_loop(), &task->uv_work, s_exec_cmd_eio, (uv_after_work_cb)s_exec_cmd_eio_after);
                 return scope.Close(Undefined());
             } else {
                 BSONQCmdTask task(cb, njb, cmdQuery, cmdata, BSONQCmdTask::delete_val);
@@ -813,7 +813,7 @@ namespace ejdb {
             if (args[3]->IsFunction()) {
                 cb = Local<Function>::Cast(args[3]);
                 SetIndexCmdTask *task = new SetIndexCmdTask(cb, njb, cmdSetIndex, cmdata, SetIndexCmdTask::delete_val);
-                uv_queue_work(uv_default_loop(), &task->uv_work, s_exec_cmd_eio, s_exec_cmd_eio_after);
+                uv_queue_work(uv_default_loop(), &task->uv_work, s_exec_cmd_eio, (uv_after_work_cb)s_exec_cmd_eio_after);
             } else {
                 SetIndexCmdTask task(cb, njb, cmdSetIndex, cmdata, SetIndexCmdTask::delete_val);
                 njb->set_index(&task);
@@ -832,7 +832,7 @@ namespace ejdb {
             if (args[0]->IsFunction()) {
                 cb = Local<Function>::Cast(args[0]);
                 EJBTask *task = new EJBTask(cb, njb, cmdSync, NULL, NULL);
-                uv_queue_work(uv_default_loop(), &task->uv_work, s_exec_cmd_eio, s_exec_cmd_eio_after);
+                uv_queue_work(uv_default_loop(), &task->uv_work, s_exec_cmd_eio, (uv_after_work_cb)s_exec_cmd_eio_after);
             } else {
                 EJBTask task(cb, njb, cmdSync, NULL, NULL);
                 njb->sync(&task);
@@ -938,7 +938,7 @@ namespace ejdb {
             if (args[2]->IsFunction()) {
                 cb = Local<Function>::Cast(args[2]);
                 TxCmdTask *task = new TxCmdTask(cb, njb, op, cmdata, TxCmdTask::delete_val);
-                uv_queue_work(uv_default_loop(), &task->uv_work, s_exec_cmd_eio, s_exec_cmd_eio_after);
+                uv_queue_work(uv_default_loop(), &task->uv_work, s_exec_cmd_eio, (uv_after_work_cb)s_exec_cmd_eio_after);
                 return scope.Close(Undefined());
             } else {
                 TxCmdTask task(cb, njb, op, cmdata, NULL);
@@ -988,7 +988,7 @@ namespace ejdb {
             }
             RMCollCmdData *cmdata = new RMCollCmdData(*cname, prune->BooleanValue());
             RMCollCmdTask *task = new RMCollCmdTask(cb, njb, cmdRemoveColl, cmdata, RMCollCmdTask::delete_val);
-            uv_queue_work(uv_default_loop(), &task->uv_work, s_exec_cmd_eio, s_exec_cmd_eio_after);
+            uv_queue_work(uv_default_loop(), &task->uv_work, s_exec_cmd_eio, (uv_after_work_cb)s_exec_cmd_eio_after);
             return scope.Close(Undefined());
         }
 
diff --git a/package.json b/package.json
index e3d80e9..c16c481 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
         "sunos"
     ],
     "engines" : {
-        "node" : "0.8.x"
+        "node" : "0.8.x || 0.10.x"
     },
     "dependencies" : {
         "nodeunit" : ">=0.7.0"