Skip to content
Closed
Prev Previous commit
Merge branch 'master' into node14-zos
  • Loading branch information
gabylb authored Mar 12, 2021
commit 7ecb4d1c538bc28a9ed8ca57f0bd44eb545800c1
22 changes: 12 additions & 10 deletions src/utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -481,16 +481,18 @@ jvalueType javaGetArrayComponentType(JNIEnv *env, jobjectArray array) {
return arrayComponentType;
}

#if (NODE_VERSION_AT_LEAST(4, 0, 0))
v8::Local<v8::ArrayBuffer> newArrayBuffer(void* elems, size_t length) {
v8::Local<v8::ArrayBuffer> ab = v8::ArrayBuffer::New(v8::Isolate::GetCurrent(), length);
#if (V8_MAJOR_VERSION >= 8)
memcpy(ab->GetBackingStore()->Data(), elems, length);
#else
memcpy(ab->GetContents().Data(), elems, length);
#endif
return ab;
}
#if NODE_VERSION_AT_LEAST(13, 0, 0)
v8::Local<v8::ArrayBuffer> newArrayBuffer(void* elems, size_t length) {
v8::Local<v8::ArrayBuffer> ab = v8::ArrayBuffer::New(v8::Isolate::GetCurrent(), length);
memcpy(ab->GetBackingStore()->Data(), elems, length);
return ab;
}
#elif NODE_VERSION_AT_LEAST(4, 0, 0)
v8::Local<v8::ArrayBuffer> newArrayBuffer(void* elems, size_t length) {
v8::Local<v8::ArrayBuffer> ab = v8::ArrayBuffer::New(v8::Isolate::GetCurrent(), length);
memcpy(ab->GetContents().Data(), elems, length);
return ab;
}
#endif

v8::Local<v8::String> javaCharToV8String(jchar c) {
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.