Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add support for node master #831

Merged
merged 1 commit into from Dec 18, 2018
Merged

add support for node master #831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 20 additions & 2 deletions nan_converters_43_inl.h
View file
Open in desktop
Expand Up @@ -19,13 +19,22 @@ imp::ToFactory<v8::TYPE>::convert(v8::Local<v8::Value> val) { \
.FromMaybe(v8::Local<v8::TYPE>())); \
}

X(Boolean)
X(Number)
X(String)
X(Object)
X(Integer)
X(Uint32)
X(Int32)
#if NODE_MODULE_VERSION <= NODE_11_0_MODULE_VERSION
X(Boolean)
#else
imp::ToFactory<v8::Boolean>::return_t \
imp::ToFactory<v8::Boolean>::convert(v8::Local<v8::Value> val) { \
v8::Isolate *isolate = v8::Isolate::GetCurrent(); \
v8::EscapableHandleScope scope(isolate); \
return scope.Escape(val->ToBoolean(isolate)); \
}
#endif

#undef X

Expand All @@ -37,11 +46,20 @@ imp::ToFactory<TYPE>::convert(v8::Local<v8::Value> val) { \
return val->NAME ## Value(isolate->GetCurrentContext()); \
}

X(bool, Boolean)
X(double, Number)
X(int64_t, Integer)
X(uint32_t, Uint32)
X(int32_t, Int32)
#if NODE_MODULE_VERSION <= NODE_11_0_MODULE_VERSION
X(bool, Boolean)
#else
imp::ToFactory<bool>::return_t \
imp::ToFactory<bool>::convert(v8::Local<v8::Value> val) { \
v8::Isolate *isolate = v8::Isolate::GetCurrent(); \
v8::HandleScope scope(isolate); \
return Just<bool>(val->BooleanValue(isolate)); \
}
#endif

#undef X

Expand Down
4 changes: 4 additions & 0 deletions nan_implementation_12_inl.h
View file
Open in desktop
Expand Up @@ -345,6 +345,9 @@ Factory<v8::String>::New(ExternalOneByteStringResource * value) {
// TODO(bnoordhuis) Use isolate-based version in Node.js v12.
Factory<v8::StringObject>::return_t
Factory<v8::StringObject>::New(v8::Local<v8::String> value) {
#if NODE_MODULE_VERSION > NODE_11_0_MODULE_VERSION
return v8::StringObject::New(v8::Isolate::GetCurrent(), value).As<v8::StringObject>();
#else
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4996)
Expand All @@ -360,6 +363,7 @@ Factory<v8::StringObject>::New(v8::Local<v8::String> value) {
#ifdef _MSC_VER
#pragma warning(pop)
#endif
#endif
}

//=== Unbound Script ===========================================================
Expand Down