[Pkg-javascript-commits] [node-leveldown] 213/492: complete resync with levelup src

[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 e565205075ff2bced0173102330a9d12a50315f8
Author: Rod Vagg <rod at vagg.org>
Date:   Sat Feb 16 11:36:02 2013 +1100

    complete resync with levelup src
---
 src/database.cc  | 10 +++++-----
 src/leveldown.cc |  6 +++---
 src/leveldown.h  | 14 +++++++-------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/database.cc b/src/database.cc
index 26680d1..41d54e7 100644
--- a/src/database.cc
+++ b/src/database.cc
@@ -95,7 +95,7 @@ void Database::CloseDatabase () {
 
 v8::Persistent<v8::Function> Database::constructor;
 
-v8::Handle<v8::Value> CreateDatabase (const v8::Arguments& args) {
+v8::Handle<v8::Value> LevelDOWN (const v8::Arguments& args) {
   v8::HandleScope scope;
   return scope.Close(Database::NewInstance(args));
 }
@@ -146,7 +146,7 @@ v8::Handle<v8::Value> Database::New (const v8::Arguments& args) {
     THROW_RETURN("leveldown() requires a location string argument")
   }
 
-  FROM_V8_STRING(location, Handle<String>::Cast(args[0]))
+  FROM_V8_STRING(location, v8::Handle<v8::String>::Cast(args[0]))
 
   Database* obj = new Database(location);
   obj->Wrap(args.This());
@@ -264,9 +264,9 @@ v8::Handle<v8::Value> Database::Get (const v8::Arguments& args) {
 v8::Handle<v8::Value> Database::Delete (const v8::Arguments& args) {
   v8::HandleScope scope;
 
-  Database* database = ObjectWrap::Unwrap<Database>(args.This());
-  Persistent<Function> callback =
-      Persistent<Function>::New(Local<Function>::Cast(args[2]));
+  Database* database = node::ObjectWrap::Unwrap<Database>(args.This());
+  v8::Persistent<v8::Function> callback =
+      v8::Persistent<v8::Function>::New(v8::Local<v8::Function>::Cast(args[2]));
 
   CB_ERR_IF_NULL_OR_UNDEFINED(0, "Key")
 
diff --git a/src/leveldown.cc b/src/leveldown.cc
index b17e385..f219352 100644
--- a/src/leveldown.cc
+++ b/src/leveldown.cc
@@ -9,9 +9,9 @@
 #include "database.h"
 #include "iterator.h"
 
-namespace levelup {
+namespace leveldown {
 
-void Init (Handle<Object> target) {
+void Init (v8::Handle<v8::Object> target) {
   Database::Init();
   leveldown::Iterator::Init();
 
@@ -23,4 +23,4 @@ void Init (Handle<Object> target) {
 
 NODE_MODULE(leveldown, Init)
 
-} // namespace levelup
+} // namespace leveldown
diff --git a/src/leveldown.h b/src/leveldown.h
index 4b0375e..8f2b46c 100644
--- a/src/leveldown.h
+++ b/src/leveldown.h
@@ -25,7 +25,7 @@
       ) \
     }; \
     RUN_CALLBACK(callback, argv, 1); \
-    return Undefined(); \
+    return v8::Undefined(); \
   }
 
 #define FROM_V8_STRING(to, from) \
@@ -48,7 +48,7 @@
     to ## Ch_ = new char[to ## Sz_]; \
     to ## Str->WriteUtf8(to ## Ch_, -1, NULL, v8::String::NO_NULL_TERMINATION); \
   } \
-  Slice to(to ## Ch_, to ## Sz_);
+  leveldb::Slice to(to ## Ch_, to ## Sz_);
 
 #define BOOLEAN_OPTION_VALUE(optionsObj, opt) \
   bool opt = !optionsObj.IsEmpty() \
@@ -64,7 +64,7 @@
   uint32_t opt = !optionsObj.IsEmpty() \
     && optionsObj->Has(option_ ## opt) \
     && optionsObj->Get(option_ ## opt)->IsUint32() \
-      ? optionsObj->Get(option_ ## opt)->Uint32v8::Value() \
+      ? optionsObj->Get(option_ ## opt)->Uint32Value() \
       : default;
 
 #define RUN_CALLBACK(callback, argv, length) \
@@ -76,11 +76,11 @@
 
 #define THROW_RETURN(msg) \
   v8::ThrowException(v8::Exception::Error(v8::String::New(#msg))); \
-  return Undefined();
+  return v8::Undefined();
 
 /* METHOD_SETUP_COMMON setup the following objects:
  *  - Database* database
- *  - v8::Local<Object> optionsObj (may be empty)
+ *  - v8::Local<v8::Object> optionsObj (may be empty)
  *  - v8::Persistent<v8::Function> callback (won't be empty)
  * Will THROW_RETURN if there isn't a callback in arg 0 or 1
  */
@@ -89,7 +89,7 @@
     THROW_RETURN(name() requires a callback argument 2) \
   } \
   Database* database = ObjectWrap::Unwrap<Database>(args.This()); \
-  v8::Local<Object> optionsObj; \
+  v8::Local<v8::Object> optionsObj; \
   v8::Persistent<v8::Function> callback; \
   if (optionPos == -1) { \
     callback = v8::Persistent<v8::Function>::New( \
@@ -100,7 +100,7 @@
       v8::Local<v8::Function>::Cast(args[callbackPos - 1]) \
     ); \
   } else if (args[optionPos]->IsObject()) { \
-    optionsObj = v8::Local<Object>::Cast(args[optionPos]); \
+    optionsObj = v8::Local<v8::Object>::Cast(args[optionPos]); \
     callback = v8::Persistent<v8::Function>::New( \
       v8::Local<v8::Function>::Cast(args[callbackPos]) \
     ); \

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