Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #50 from my8bird/dev/update_0.10

[in progress] Update 0.10
  • Loading branch information...
commit 7f4fda5e88120b2addb6cc7aa86441fe26b980ce 2 parents fcd6f72 + 6b3c504
@my8bird authored
View
5 .travis.yml
@@ -2,3 +2,8 @@ language: node_js
node_js:
- 0.6
- 0.8
+ - 0.10
+
+before_script:
+ - make clean build
+
View
1  package.json
@@ -25,6 +25,7 @@
"url": "https://github.com/my8bird/node-leveldb/issues"
},
"dependencies": {
+ "node-gyp": "~0.9.5"
},
"devDependencies": {
"coffee-script": "~1.3.0",
View
4 src/cpp/handle.cc
@@ -74,7 +74,7 @@ class JHandle::OpAsync {
}
template <class T> static Handle<Value> AsyncEnqueue(T* op) {
- return AsyncQueue(op, AsyncWorker<T>, AsyncCallback<T>);
+ return AsyncQueue(op, AsyncWorker<T>, (uv_after_work_cb)AsyncCallback<T>);
}
template <class T> static void AsyncWorker(uv_work_t* req) {
@@ -82,7 +82,7 @@ class JHandle::OpAsync {
op->Run();
}
- template <class T> static void AsyncCallback(uv_work_t* req) {
+ template <class T> static void AsyncCallback(uv_work_t* req, int status = 0) {
HandleScope scope;
T* op = static_cast<T*>(req->data);
assert(!op->callback_.IsEmpty());
View
4 src/cpp/iterator.cc
@@ -88,10 +88,10 @@ Handle<Value> JIterator::Async(const uv_work_cb fn, const Local<Value>& callback
busy_ = true;
Ref();
- return AsyncQueue(this, fn, AfterAsync);
+ return AsyncQueue(this, fn, (uv_after_work_cb)AfterAsync);
}
-void JIterator::AfterAsync(uv_work_t* req) {
+void JIterator::AfterAsync(uv_work_t* req, int status = 0) {
HandleScope scope;
JIterator* self = static_cast<JIterator*>(req->data);
View
2  src/cpp/iterator.h
@@ -38,7 +38,7 @@ class JIterator : ObjectWrap {
static Handle<Value> Seek(const uv_work_cb fn, const Arguments& args);
Handle<Value> Async(const uv_work_cb fn, const Local<Value>& callback);
- static void AfterAsync(uv_work_t* req);
+ static void AfterAsync(uv_work_t* req, int status);
void BeforeSeek();
void AfterSeek();
Please sign in to comment.
Something went wrong with that request. Please try again.