From 6357b3736a0d549342280ef94ddd8dca9a61f5f5 Mon Sep 17 00:00:00 2001 From: Boris Verkhovskiy Date: Thu, 22 Jun 2023 19:52:55 +0100 Subject: [PATCH] Partially revert #95 --- src/conversions.cc | 7 +------ src/node.cc | 7 +------ src/util.cc | 2 +- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/conversions.cc b/src/conversions.cc index 0c749dd9..51db7be1 100644 --- a/src/conversions.cc +++ b/src/conversions.cc @@ -29,12 +29,7 @@ void InitConversions(Local exports) { point_transfer_buffer = static_cast(malloc(2 * sizeof(uint32_t))); - #if _MSC_VER && NODE_RUNTIME_ELECTRON && NODE_MODULE_VERSION >= 89 - // this is a terrible thing we have to do because of https://github.com/electron/electron/issues/29893 - v8::Local bufferView; - bufferView = node::Buffer::New(Isolate::GetCurrent(), point_transfer_buffer, 0, 2 * sizeof(uint32_t)).ToLocalChecked(); - auto js_point_transfer_buffer = node::Buffer::Data(bufferView); - #elif (V8_MAJOR_VERSION > 8 || (V8_MAJOR_VERSION == 8 && V8_MINOR_VERION > 3)) + #if (V8_MAJOR_VERSION > 8 || (V8_MAJOR_VERSION == 8 && V8_MINOR_VERSION > 3)) auto backing_store = ArrayBuffer::NewBackingStore(point_transfer_buffer, 2 * sizeof(uint32_t), BackingStore::EmptyDeleter, nullptr); auto js_point_transfer_buffer = ArrayBuffer::New(Isolate::GetCurrent(), std::move(backing_store)); #else diff --git a/src/node.cc b/src/node.cc index f855ec7c..f9ab6444 100644 --- a/src/node.cc +++ b/src/node.cc @@ -30,12 +30,7 @@ static inline void setup_transfer_buffer(uint32_t node_count) { transfer_buffer_length = new_length; transfer_buffer = static_cast(malloc(transfer_buffer_length * sizeof(uint32_t))); - #if _MSC_VER && NODE_RUNTIME_ELECTRON && NODE_MODULE_VERSION >= 89 - // this is a terrible thing we have to do because of https://github.com/electron/electron/issues/29893 - v8::Local bufferView; - bufferView = node::Buffer::New(Isolate::GetCurrent(), transfer_buffer, 0, transfer_buffer_length * sizeof(uint32_t)).ToLocalChecked(); - auto js_point_transfer_buffer = node::Buffer::Data(bufferView); - #elif (V8_MAJOR_VERSION > 8 || (V8_MAJOR_VERSION == 8 && V8_MINOR_VERION > 3)) + #if (V8_MAJOR_VERSION > 8 || (V8_MAJOR_VERSION == 8 && V8_MINOR_VERSION > 3)) auto backing_store = ArrayBuffer::NewBackingStore(transfer_buffer, transfer_buffer_length * sizeof(uint32_t), BackingStore::EmptyDeleter, nullptr); auto js_transfer_buffer = ArrayBuffer::New(Isolate::GetCurrent(), std::move(backing_store)); #else diff --git a/src/util.cc b/src/util.cc index 5ea9084f..cff335db 100644 --- a/src/util.cc +++ b/src/util.cc @@ -12,7 +12,7 @@ bool instance_of(v8::Local value, v8::Local object) { } v8::Local GetGlobal(v8::Local& callback) { - #if (V8_MAJOR_VERSION > 9 || (V8_MAJOR_VERSION == 9 && V8_MINOR_VERION > 4)) + #if (V8_MAJOR_VERSION > 9 || (V8_MAJOR_VERSION == 9 && V8_MINOR_VERSION > 4)) return callback->GetCreationContext().ToLocalChecked()->Global(); #else return callback->CreationContext()->Global();