* ev_ref -> uv_ref

kkaefer · kkaefer · commit 873e91e6ee55 · 2011-11-07T22:40:14.000+01:00
* remove 0.2.x Buffer compatibility
diff --git a/src/async.h b/src/async.h
@@ -30,14 +30,14 @@ template <class Item, class Parent> class Async {
         rows.swap(async->data);
         pthread_mutex_unlock(&async->mutex);
         for (unsigned int i = 0, size = rows.size(); i < size; i++) {
-            ev_unref(EV_DEFAULT_UC);
+            uv_unref(uv_default_loop());
             async->callback(async->parent, rows[i]);
         }
     }
 
     inline void add(Item* item) {
         // Make sure node runs long enough to deliver the messages.
-        ev_ref(EV_DEFAULT_UC);
+        uv_ref(uv_default_loop());
         pthread_mutex_lock(&mutex);
         data.push_back(item);
         pthread_mutex_unlock(&mutex);
diff --git a/src/database.cc b/src/database.cc
@@ -657,7 +657,7 @@ void Database::Destruct(Persistent<Value> value, void *data) {
 
     if (db->handle) {
         eio_custom(EIO_Destruct, EIO_PRI_DEFAULT, EIO_AfterDestruct, db);
-        ev_ref(EV_DEFAULT_UC);
+        uv_ref(uv_default_loop());
     }
     else {
         delete db;
@@ -673,7 +673,7 @@ void Database::EIO_Destruct(eio_req *req) {
 
 int Database::EIO_AfterDestruct(eio_req *req) {
     Database* db = static_cast<Database*>(req->data);
-    ev_unref(EV_DEFAULT_UC);
+    uv_unref(uv_default_loop());
     delete db;
     return 0;
 }
diff --git a/src/database.h b/src/database.h
@@ -38,12 +38,12 @@ class Database : public ObjectWrap {
         Baton(Database* db_, Handle<Function> cb_) :
                 db(db_), status(SQLITE_OK) {
             db->Ref();
-            ev_ref(EV_DEFAULT_UC);
+            uv_ref(uv_default_loop());
             callback = Persistent<Function>::New(cb_);
         }
         virtual ~Baton() {
             db->Unref();
-            ev_unref(EV_DEFAULT_UC);
+            uv_unref(uv_default_loop());
             callback.Dispose();
         }
     };
diff --git a/src/statement.cc b/src/statement.cc
@@ -2,7 +2,6 @@
 #include <v8.h>
 #include <node.h>
 #include <node_buffer.h>
-#include <node_version.h>
 
 #include "macros.h"
 #include "database.h"
@@ -185,13 +184,8 @@ template <class T> Values::Field*
         return new Values::Null(pos);
     }
     else if (Buffer::HasInstance(source)) {
-#if NODE_VERSION_AT_LEAST(0,3,0)
         Local<Object> buffer = source->ToObject();
         return new Values::Blob(pos, Buffer::Length(buffer), Buffer::Data(buffer));
-#else
-        Buffer* buffer = ObjectWrap::Unwrap<Buffer>(source->ToObject());
-        return new Values::Blob(pos, buffer->length(), buffer->data());
-#endif
     }
     else if (source->IsDate()) {
         return new Values::Float(pos, source->NumberValue());
@@ -774,12 +768,7 @@ Local<Object> Statement::RowToJS(Row* row) {
                 value = Local<Value>(String::New(((Values::Text*)field)->value.c_str(), ((Values::Text*)field)->value.size()));
             } break;
             case SQLITE_BLOB: {
-#if NODE_VERSION_AT_LEAST(0,3,0)
                 Buffer *buffer = Buffer::New(((Values::Blob*)field)->value, ((Values::Blob*)field)->length);
-#else
-                Buffer *buffer = Buffer::New(((Values::Blob*)field)->length);
-                memcpy(buffer->data(), ((Values::Blob*)field)->value, buffer->length());
-#endif
                 value = Local<Value>::New(buffer->handle_);
             } break;
             case SQLITE_NULL: {
diff --git a/src/statement.h b/src/statement.h
@@ -85,7 +85,7 @@ class Statement : public ObjectWrap {
 
         Baton(Statement* stmt_, Handle<Function> cb_) : stmt(stmt_) {
             stmt->Ref();
-            ev_ref(EV_DEFAULT_UC);
+            uv_ref(uv_default_loop());
             callback = Persistent<Function>::New(cb_);
         }
         virtual ~Baton() {
@@ -94,7 +94,7 @@ class Statement : public ObjectWrap {
                 DELETE_FIELD(field);
             }
             stmt->Unref();
-            ev_unref(EV_DEFAULT_UC);
+            uv_unref(uv_default_loop());
             callback.Dispose();
         }
     };

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ class Statement : public ObjectWrap {`
`85`	`85`
`86`	`86`	`Baton(Statement* stmt_, Handle<Function> cb_) : stmt(stmt_) {`
`87`	`87`	`stmt->Ref();`
`88`		`- ev_ref(EV_DEFAULT_UC);`
	`88`	`+ uv_ref(uv_default_loop());`
`89`	`89`	`callback = Persistent<Function>::New(cb_);`
`90`	`90`	`}`
`91`	`91`	`virtual ~Baton() {`
`@@ -94,7 +94,7 @@ class Statement : public ObjectWrap {`
`94`	`94`	`DELETE_FIELD(field);`
`95`	`95`	`}`
`96`	`96`	`stmt->Unref();`
`97`		`- ev_unref(EV_DEFAULT_UC);`
	`97`	`+ uv_unref(uv_default_loop());`
`98`	`98`	`callback.Dispose();`
`99`	`99`	`}`
`100`	`100`	`};`