Skip to content

Commit

Permalink
Updates for node v0.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
David Swift committed Mar 15, 2013
1 parent fa01728 commit 992282e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions binding.cc
Expand Up @@ -107,7 +107,7 @@ v8::Handle<v8::Value> node_db::Binding::Connect(const v8::Arguments& args) {
void node_db::Binding::connect(connect_request_t* request) {
try {
request->binding->connection->open();
} catch(const node_db::Exception& exception) {
} catch(node_db::Exception const& exception) {
request->error = exception.what();
}
}
Expand Down Expand Up @@ -153,7 +153,7 @@ void node_db::Binding::uvConnect(uv_work_t* uvRequest) {
connect(request);
}

void node_db::Binding::uvConnectFinished(uv_work_t* uvRequest) {
void node_db::Binding::uvConnectFinished(uv_work_t* uvRequest, int status) {
v8::HandleScope scope;

connect_request_t* request = static_cast<connect_request_t*>(uvRequest->data);
Expand Down Expand Up @@ -204,7 +204,7 @@ v8::Handle<v8::Value> node_db::Binding::Escape(const v8::Arguments& args) {
v8::String::Utf8Value string(args[0]->ToString());
std::string unescaped(*string);
escaped = binding->connection->escape(unescaped);
} catch(const node_db::Exception& exception) {
} catch(node_db::Exception const& exception) {
THROW_EXCEPTION(exception.what())
}

Expand All @@ -225,7 +225,7 @@ v8::Handle<v8::Value> node_db::Binding::Name(const v8::Arguments& args) {
v8::String::Utf8Value string(args[0]->ToString());
std::string unescaped(*string);
escaped << binding->connection->escapeName(unescaped);
} catch(const node_db::Exception& exception) {
} catch(node_db::Exception const& exception) {
THROW_EXCEPTION(exception.what())
}

Expand Down
2 changes: 1 addition & 1 deletion binding.h
Expand Up @@ -37,7 +37,7 @@ class Binding : public EventEmitter {
static v8::Handle<v8::Value> Query(const v8::Arguments& args);
static uv_async_t g_async;
static void uvConnect(uv_work_t* uvRequest);
static void uvConnectFinished(uv_work_t* uvRequest);
static void uvConnectFinished(uv_work_t* uvRequest, int status);
static void connect(connect_request_t* request);
static void connectFinished(connect_request_t* request);
virtual v8::Handle<v8::Value> set(const v8::Local<v8::Object> options) = 0;
Expand Down
2 changes: 1 addition & 1 deletion query.cc
Expand Up @@ -735,7 +735,7 @@ void node_db::Query::uvExecute(uv_work_t* uvRequest) {
}
}

void node_db::Query::uvExecuteFinished(uv_work_t* uvRequest) {
void node_db::Query::uvExecuteFinished(uv_work_t* uvRequest, int status) {
v8::HandleScope scope;

execute_request_t *request = static_cast<execute_request_t *>(uvRequest->data);
Expand Down
2 changes: 1 addition & 1 deletion query.h
Expand Up @@ -69,7 +69,7 @@ class Query : public EventEmitter {
static v8::Handle<v8::Value> Execute(const v8::Arguments& args);
static uv_async_t g_async;
static void uvExecute(uv_work_t* uvRequest);
static void uvExecuteFinished(uv_work_t* uvRequest);
static void uvExecuteFinished(uv_work_t* uvRequest, int status);
void executeAsync(execute_request_t* request);
static void freeRequest(execute_request_t* request, bool freeAll = true);
std::string fieldName(v8::Local<v8::Value> value) const throw(Exception&);
Expand Down

0 comments on commit 992282e

Please sign in to comment.