summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/node.cc2
-rw-r--r--src/node_crypto.cc4
-rw-r--r--src/node_internals.h2
-rw-r--r--src/node_object_wrap.h2
-rw-r--r--src/req_wrap.h2
-rw-r--r--src/tcp_wrap.cc2
6 files changed, 7 insertions, 7 deletions
diff --git a/src/node.cc b/src/node.cc
index 6f91946165..f82e75e285 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -3143,7 +3143,7 @@ int Start(int argc, char *argv[]) {
V8::Initialize();
{
Locker locker(node_isolate);
- HandleScope handle_scope;
+ HandleScope handle_scope(node_isolate);
// Create the one and only Context.
Persistent<Context> context = Context::New();
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index 77dd1a3db9..b826a123e7 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -638,7 +638,7 @@ Handle<Value> SecureContext::SetSessionIdContext(const Arguments& args) {
}
Handle<Value> SecureContext::SetSessionTimeout(const Arguments& args) {
- HandleScope scope;
+ HandleScope scope(node_isolate);
SecureContext *sc = ObjectWrap::Unwrap<SecureContext>(args.Holder());
@@ -3567,7 +3567,7 @@ static void array_push_back(const TypeName* md,
Handle<Value> GetCiphers(const Arguments& args) {
- HandleScope scope;
+ HandleScope scope(node_isolate);
Local<Array> arr = Array::New();
EVP_CIPHER_do_all_sorted(array_push_back<EVP_CIPHER>, &arr);
return scope.Close(arr);
diff --git a/src/node_internals.h b/src/node_internals.h
index 794770874e..cf257ab7aa 100644
--- a/src/node_internals.h
+++ b/src/node_internals.h
@@ -78,7 +78,7 @@ inline static int snprintf(char* buf, unsigned int len, const char* fmt, ...) {
// sometimes fails to resolve it...
#define THROW_ERROR(fun) \
do { \
- v8::HandleScope scope; \
+ v8::HandleScope scope(node_isolate); \
return v8::ThrowException(fun(v8::String::New(errmsg))); \
} \
while (0)
diff --git a/src/node_object_wrap.h b/src/node_object_wrap.h
index 4f86da3f3a..1dae7e3f09 100644
--- a/src/node_object_wrap.h
+++ b/src/node_object_wrap.h
@@ -116,7 +116,7 @@ class NODE_EXTERN ObjectWrap {
static void WeakCallback(v8::Isolate* env,
v8::Persistent<v8::Value> value,
void* data) {
- v8::HandleScope scope;
+ v8::HandleScope scope(node_isolate);
ObjectWrap *obj = static_cast<ObjectWrap*>(data);
assert(value == obj->handle_);
diff --git a/src/req_wrap.h b/src/req_wrap.h
index 1251cea6db..36e0fe56ce 100644
--- a/src/req_wrap.h
+++ b/src/req_wrap.h
@@ -35,7 +35,7 @@ template <typename T>
class ReqWrap {
public:
ReqWrap() {
- v8::HandleScope scope;
+ v8::HandleScope scope(node_isolate);
object_ = v8::Persistent<v8::Object>::New(node_isolate, v8::Object::New());
v8::Local<v8::Value> domain = v8::Context::GetCurrent()
diff --git a/src/tcp_wrap.cc b/src/tcp_wrap.cc
index 4d60c8f691..3b9a9b9251 100644
--- a/src/tcp_wrap.cc
+++ b/src/tcp_wrap.cc
@@ -258,7 +258,7 @@ Handle<Value> TCPWrap::SetSimultaneousAccepts(const Arguments& args) {
Handle<Value> TCPWrap::Open(const Arguments& args) {
- HandleScope scope;
+ HandleScope scope(node_isolate);
UNWRAP(TCPWrap)
int fd = args[0]->IntegerValue();
uv_tcp_open(&wrap->handle_, fd);