Browse Source

src: remove non-isolate PersistentToLocal(), v2

Commit 78d9094 updated src/*.cc to use the version of PersistentToLocal
that takes a v8::Isolate* as its first argument. This commit removes
the non-isolate version.
v0.11.5-release
Ben Noordhuis 12 years ago
parent
commit
350fc8064e
  1. 15
      src/node_internals.h

15
src/node_internals.h

@ -245,12 +245,6 @@ inline MUST_USE_RESULT bool ParseArrayIndex(v8::Handle<v8::Value> arg,
return true; return true;
} }
template <class TypeName>
inline v8::Local<TypeName> PersistentToLocal(
const v8::Persistent<TypeName>& persistent) {
return PersistentToLocal(node_isolate, persistent);
}
template <class TypeName> template <class TypeName>
inline v8::Local<TypeName> PersistentToLocal( inline v8::Local<TypeName> PersistentToLocal(
v8::Isolate* isolate, v8::Isolate* isolate,
@ -269,7 +263,7 @@ CachedBase<TypeName>::CachedBase() {
template <typename TypeName> template <typename TypeName>
CachedBase<TypeName>::operator v8::Handle<TypeName>() const { CachedBase<TypeName>::operator v8::Handle<TypeName>() const {
return PersistentToLocal(handle_); return PersistentToLocal(node_isolate, handle_);
} }
template <typename TypeName> template <typename TypeName>
@ -307,7 +301,7 @@ v8::Handle<v8::Value> MakeCallback(
const TypeName method, const TypeName method,
int argc, int argc,
v8::Handle<v8::Value>* argv) { v8::Handle<v8::Value>* argv) {
v8::Local<v8::Object> recv_obj = PersistentToLocal(recv); v8::Local<v8::Object> recv_obj = PersistentToLocal(node_isolate, recv);
return MakeCallback(recv_obj, method, argc, argv); return MakeCallback(recv_obj, method, argc, argv);
} }
@ -325,7 +319,7 @@ inline bool HasInstance(
const v8::Persistent<v8::FunctionTemplate>& function_template, const v8::Persistent<v8::FunctionTemplate>& function_template,
v8::Handle<v8::Value> value) { v8::Handle<v8::Value> value) {
v8::Local<v8::FunctionTemplate> function_template_handle = v8::Local<v8::FunctionTemplate> function_template_handle =
PersistentToLocal(function_template); PersistentToLocal(node_isolate, function_template);
return function_template_handle->HasInstance(value); return function_template_handle->HasInstance(value);
} }
@ -333,7 +327,8 @@ inline v8::Local<v8::Object> NewInstance(
const v8::Persistent<v8::Function>& ctor, const v8::Persistent<v8::Function>& ctor,
int argc, int argc,
v8::Handle<v8::Value>* argv) { v8::Handle<v8::Value>* argv) {
v8::Local<v8::Function> constructor_handle = PersistentToLocal(ctor); v8::Local<v8::Function> constructor_handle =
PersistentToLocal(node_isolate, ctor);
return constructor_handle->NewInstance(argc, argv); return constructor_handle->NewInstance(argc, argv);
} }

Loading…
Cancel
Save