diff options
author | Trevor Norris <trev.norris@gmail.com> | 2015-01-07 14:13:35 -0800 |
---|---|---|
committer | Trevor Norris <trev.norris@gmail.com> | 2015-01-07 14:21:02 -0800 |
commit | cbf76c1f2f0e36a707e70cf9c6a8a251b6ac3f26 (patch) | |
tree | 5f7d34980bae628553d0ef83b786f8b5166201e4 /src/cares_wrap.cc | |
parent | d55338662329ac37386783ef1aa88f099eff86b2 (diff) | |
download | node-new-cbf76c1f2f0e36a707e70cf9c6a8a251b6ac3f26.tar.gz |
src: pass Isolate to node::Utf8Value constructor
Initial attempt to remove all uses of Isolate::GetCurrent(). Still
exists a few locations, but this works out a heavy usage.
PR-URL: https://github.com/iojs/io.js/pull/244
Reviewed-by: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'src/cares_wrap.cc')
-rw-r--r-- | src/cares_wrap.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc index e59d2a87f9..256dff76d6 100644 --- a/src/cares_wrap.cc +++ b/src/cares_wrap.cc @@ -884,7 +884,7 @@ static void Query(const FunctionCallbackInfo<Value>& args) { Local<String> string = args[1].As<String>(); Wrap* wrap = new Wrap(env, req_wrap_obj); - node::Utf8Value name(string); + node::Utf8Value name(env->isolate(), string); int err = wrap->Send(*name); if (err) delete wrap; @@ -1023,7 +1023,7 @@ void AfterGetNameInfo(uv_getnameinfo_t* req, static void IsIP(const FunctionCallbackInfo<Value>& args) { - node::Utf8Value ip(args[0]); + node::Utf8Value ip(args.GetIsolate(), args[0]); char address_buffer[sizeof(struct in6_addr)]; int rc = 0; @@ -1043,7 +1043,7 @@ static void GetAddrInfo(const FunctionCallbackInfo<Value>& args) { CHECK(args[1]->IsString()); CHECK(args[2]->IsInt32()); Local<Object> req_wrap_obj = args[0].As<Object>(); - node::Utf8Value hostname(args[1]); + node::Utf8Value hostname(env->isolate(), args[1]); int32_t flags = (args[3]->IsInt32()) ? args[3]->Int32Value() : 0; int family; @@ -1092,7 +1092,7 @@ static void GetNameInfo(const FunctionCallbackInfo<Value>& args) { CHECK(args[1]->IsString()); CHECK(args[2]->IsUint32()); Local<Object> req_wrap_obj = args[0].As<Object>(); - node::Utf8Value ip(args[1]); + node::Utf8Value ip(env->isolate(), args[1]); const unsigned port = args[2]->Uint32Value(); struct sockaddr_storage addr; @@ -1171,7 +1171,7 @@ static void SetServers(const FunctionCallbackInfo<Value>& args) { CHECK(elm->Get(1)->IsString()); int fam = elm->Get(0)->Int32Value(); - node::Utf8Value ip(elm->Get(1)); + node::Utf8Value ip(env->isolate(), elm->Get(1)); ares_addr_node* cur = &servers[i]; |