[Pkg-javascript-commits] [node-leveldown] 364/492: current 0.11.x compat

[Andrew Kelley]

This is an automated email from the git hooks/post-receive script.

andrewrk-guest pushed a commit to annotated tag rocksdb-0.10.1
in repository node-leveldown.

commit fb98a593dbc82b32dcf22646697d94f9fa828318
Author: Rod Vagg <rod at vagg.org>
Date:   Sun Jul 7 14:13:20 2013 +1000

    current 0.11.x compat
---
 src/database.cc       | 2 +-
 src/database_async.cc | 9 ++++-----
 src/iterator_async.cc | 8 ++------
 src/leveldown.h       | 3 +++
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/database.cc b/src/database.cc
index 7a83ad6..7f0bd10 100644
--- a/src/database.cc
+++ b/src/database.cc
@@ -599,7 +599,7 @@ v8::Handle<v8::Value> Database::Iterator (const v8::Arguments& args) {
 
   // register our iterator
   database->iterators[id] =
-      v8::Persistent<v8::Object>::New(
+      v8::Persistent<v8::Object>::New(LD_NODE_ISOLATE_PRE
           node::ObjectWrap::Unwrap<leveldown::Iterator>(iterator)->handle_);
 
   return scope.Close(iterator);
diff --git a/src/database_async.cc b/src/database_async.cc
index d9f83a5..bc11424 100644
--- a/src/database_async.cc
+++ b/src/database_async.cc
@@ -119,12 +119,11 @@ void ReadWorker::HandleOKCallback () {
   LD_HANDLESCOPE
 
   v8::Local<v8::Value> returnValue;
-  if (asBuffer)
-    returnValue = v8::Local<v8::Value>::New(
-      node::Buffer::New((char*)value.data(), value.size())->handle_
-    );
-  else
+  if (asBuffer) {
+    returnValue = LD_NEW_BUFFER_HANDLE((char*)value.data(), value.size());
+  } else {
     returnValue = v8::String::New((char*)value.data(), value.size());
+  }
   v8::Local<v8::Value> argv[] = {
       v8::Local<v8::Value>::New(v8::Null())
     , returnValue
diff --git a/src/iterator_async.cc b/src/iterator_async.cc
index 55740af..5f0e0c8 100644
--- a/src/iterator_async.cc
+++ b/src/iterator_async.cc
@@ -38,18 +38,14 @@ void NextWorker::HandleOKCallback () {
 
   v8::Local<v8::Value> returnKey;
   if (iterator->keyAsBuffer) {
-    returnKey = v8::Local<v8::Value>::New(
-      node::Buffer::New((char*)key.data(), key.size())->handle_
-    );
+    returnKey = LD_NEW_BUFFER_HANDLE((char*)key.data(), key.size())
   } else {
     returnKey = v8::String::New((char*)key.data(), key.size());
   }
 
   v8::Local<v8::Value> returnValue;
   if (iterator->valueAsBuffer) {
-    returnValue = v8::Local<v8::Value>::New(
-      node::Buffer::New((char*)value.data(), value.size())->handle_
-    );
+    returnValue = LD_NEW_BUFFER_HANDLE((char*)value.data(), value.size());
   } else {
     returnValue = v8::String::New((char*)value.data(), value.size());
   }
diff --git a/src/leveldown.h b/src/leveldown.h
index bb4c544..371be34 100644
--- a/src/leveldown.h
+++ b/src/leveldown.h
@@ -76,11 +76,14 @@ static inline uint32_t UInt32OptionValue(
        v8::Persistent<v8::String>::New(                                        \
           LD_NODE_ISOLATE_GET, v8::String::NewSymbol(#key));
 #  define LD_HANDLESCOPE v8::HandleScope scope(LD_NODE_ISOLATE);
+#  define LD_NEW_BUFFER_HANDLE(data, size) node::Buffer::New(data, size);
 #else
 #  define LD_SYMBOL(var, key)                                                  \
      static const v8::Persistent<v8::String> var =                             \
        v8::Persistent<v8::String>::New(v8::String::NewSymbol(#key));
 #  define LD_HANDLESCOPE v8::HandleScope scope;
+#  define LD_NEW_BUFFER_HANDLE(data, size)                                     \
+     v8::Local<v8::Value>::New(node::Buffer::New(data, size)->handle_);
 #endif
 
 #define LD_V8_METHOD(name)                                                     \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-leveldown.git