summaryrefslogtreecommitdiff
path: root/src/node_dtrace.cc
diff options
context:
space:
mode:
authorTrevor Norris <trev.norris@gmail.com>2015-01-07 14:13:35 -0800
committerTrevor Norris <trev.norris@gmail.com>2015-01-07 14:21:02 -0800
commitcbf76c1f2f0e36a707e70cf9c6a8a251b6ac3f26 (patch)
tree5f7d34980bae628553d0ef83b786f8b5166201e4 /src/node_dtrace.cc
parentd55338662329ac37386783ef1aa88f099eff86b2 (diff)
downloadnode-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/node_dtrace.cc')
-rw-r--r--src/node_dtrace.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/node_dtrace.cc b/src/node_dtrace.cc
index 8feedb600f..a695b076d7 100644
--- a/src/node_dtrace.cc
+++ b/src/node_dtrace.cc
@@ -76,8 +76,8 @@ using v8::Value;
return env->ThrowError( \
"expected object for " #obj " to contain string member " #member); \
} \
- node::Utf8Value _##member(obj->Get(OneByteString(env->isolate(), \
- #member))); \
+ node::Utf8Value _##member(env->isolate(), \
+ obj->Get(OneByteString(env->isolate(), #member))); \
if ((*(const char **)valp = *_##member) == nullptr) \
*(const char **)valp = "<unknown>";
@@ -215,7 +215,7 @@ void DTRACE_HTTP_SERVER_REQUEST(const FunctionCallbackInfo<Value>& args) {
}
Local<Value> strfwdfor = headers->Get(env->x_forwarded_string());
- node::Utf8Value fwdfor(strfwdfor);
+ node::Utf8Value fwdfor(env->isolate(), strfwdfor);
if (!strfwdfor->IsString() || (req.forwardedFor = *fwdfor) == nullptr)
req.forwardedFor = const_cast<char*>("");