[Pkg-javascript-commits] [node-leveldown] 377/492: Merge branch 'master' into node_0.11_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 0a202418f7e21016ea309f71176c2d9002a6d2cf
Merge: 4112961 2569c39
Author: David Björklund <david.bjorklund at gmail.com>
Date:   Sun Aug 11 00:00:21 2013 +0200

    Merge branch 'master' into node_0.11_compat
    
    Conflicts:
    	src/database.cc

 src/database.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc src/database.cc
index 7ce8bba,fa976c3..5db3109
--- a/src/database.cc
+++ b/src/database.cc
@@@ -106,8 -104,8 +106,8 @@@ void Database::ReleaseIterator (uint32_
    // if there is a pending CloseWorker it means that we're waiting for
    // iterators to end before we can close them
    iterators.erase(id);
-   if (iterators.size() == 0 && pendingCloseWorker != NULL) {
+   if (iterators.empty() && pendingCloseWorker != NULL) {
 -    AsyncQueueWorker((AsyncWorker*)pendingCloseWorker);
 +    NanAsyncQueueWorker((AsyncWorker*)pendingCloseWorker);
      pendingCloseWorker = NULL;
    }
  }
@@@ -244,10 -273,10 +244,10 @@@ NAN_METHOD(Database::Close) 
  
    CloseWorker* worker = new CloseWorker(
        database
 -    , v8::Persistent<v8::Function>::New(LD_NODE_ISOLATE_PRE callback)
 +    , new NanCallback(callback)
    );
  
-   if (database->iterators.size() > 0) {
+   if (!database->iterators.empty()) {
      // yikes, we still have iterators open! naughty naughty.
      // we have to queue up a CloseWorker and manually close each of them.
      // the CloseWorker will be invoked once they are all cleaned up

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