[Pkg-javascript-commits] [node-leveldown] 15/23: fixes for hyperleveldb compile

[Andrew Kelley]

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

andrewrk-guest pushed a commit to tag hyper-0.10.2
in repository node-leveldown.

commit 8c88c2c51de399f41418e31543985fab8c04a1ad
Author: Rod Vagg <rod at vagg.org>
Date:   Wed Oct 9 18:18:04 2013 +1100

    fixes for hyperleveldb compile
---
 deps/leveldb/leveldb-hyper |  2 +-
 deps/leveldb/leveldb.gyp   |  9 +++++++++
 src/database.cc            | 27 ---------------------------
 test/repair-test.js        |  4 ++--
 4 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/deps/leveldb/leveldb-hyper b/deps/leveldb/leveldb-hyper
index 9a4d0b7..f9a6eb1 160000
--- a/deps/leveldb/leveldb-hyper
+++ b/deps/leveldb/leveldb-hyper
@@ -1 +1 @@
-Subproject commit 9a4d0b783067dde3bb5fad3338d068c7cbcc1645
+Subproject commit f9a6eb1f0d8cd0f3e522ffae396a50296a68cef7
diff --git a/deps/leveldb/leveldb.gyp b/deps/leveldb/leveldb.gyp
index 0d9edfc..6e4b941 100644
--- a/deps/leveldb/leveldb.gyp
+++ b/deps/leveldb/leveldb.gyp
@@ -65,6 +65,15 @@
             'cflags': [
                 '-Wno-sign-compare'
               , '-Wno-unused-but-set-variable'
+              , '-Wno-unused-variable'
+              , '-Wno-maybe-uninitialized'
+              , '-Wno-type-limits'
+              , '-Wno-reorder'
+            ]
+        }]
+      , ['OS=="linux" or OS=="freebsd" or OS=="solaris"', {
+            'cflags_cc+': [
+                '-frtti'
             ]
         }]
       , ['OS == "linux"', {
diff --git a/src/database.cc b/src/database.cc
index fa7b0cb..c5923b8 100644
--- a/src/database.cc
+++ b/src/database.cc
@@ -548,33 +548,6 @@ NAN_METHOD(Database::GetProperty) {
   NanReturnValue(returnValue);
 }
 
-NAN_METHOD(Database::LiveBackup) {
-  NanScope();
-
-  v8::Local<v8::Value> nameV = args[0];
-  v8::Local<v8::Function> callback; // for LD_CB_ERR_IF_NULL_OR_UNDEFINED
-
-  if (!nameV->IsString()) {
-    LD_THROW_RETURN(liveBackup() requires a valid `name` argument)
-  }
-
-  LD_CB_ERR_IF_NULL_OR_UNDEFINED(nameV, name)
-
-  LD_STRING_OR_BUFFER_TO_SLICE(name, nameV, name)
-
-  leveldown::Database* database =
-      node::ObjectWrap::Unwrap<leveldown::Database>(args.This());
-
-  std::string* value = new std::string();
-  database->LiveBackup(name);
-  v8::Local<v8::String> returnValue
-      = v8::String::New(value->c_str(), value->length());
-  delete value;
-  delete[] name.data();
-
-  return returnValue;
-}
-
 NAN_METHOD(Database::Iterator) {
   NanScope();
 
diff --git a/test/repair-test.js b/test/repair-test.js
index 225a3ac..1e2dae6 100644
--- a/test/repair-test.js
+++ b/test/repair-test.js
@@ -38,11 +38,11 @@ makeTest('test repair() compacts', function (db, t, done, location) {
     t.notOk(err, 'no error')
     var files = fs.readdirSync(location)
     t.ok(files.some(function (f) { return (/\.log$/).test(f) }), 'directory contains log file(s)')
-    t.notOk(files.some(function (f) { return (/\.ldb$/).test(f) }), 'directory does not contain ldb file(s)')
+    t.notOk(files.some(function (f) { return (/\.sst$/).test(f) }), 'directory does not contain ldb file(s)')
     leveldown.repair(location, function () {
       files = fs.readdirSync(location)
       t.notOk(files.some(function (f) { return (/\.log$/).test(f) }), 'directory does not contain log file(s)')
-      t.ok(files.some(function (f) { return (/\.ldb$/).test(f) }), 'directory contains ldb file(s)')
+      t.ok(files.some(function (f) { return (/\.sst$/).test(f) }), 'directory contains ldb file(s)')
       done(false)
     })
   })

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