From e6473281c89fba7ec6911066ae19273822bc5424 Mon Sep 17 00:00:00 2001 From: Timo Glastra Date: Sun, 29 Nov 2020 16:01:56 +0100 Subject: [PATCH] support node v14 and v15 in nodejs wrapper Signed-off-by: Timo Glastra --- wrappers/nodejs/src/indy.cc | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/wrappers/nodejs/src/indy.cc b/wrappers/nodejs/src/indy.cc index f399f82065..c40688d404 100644 --- a/wrappers/nodejs/src/indy.cc +++ b/wrappers/nodejs/src/indy.cc @@ -213,6 +213,8 @@ class IndyCallback : public Nan::AsyncResource { IndyCallback* icb = static_cast(async->data); icbmap.erase(icb->handle); + v8::Local context = Nan::GetCurrentContext(); + v8::Local tuple; v8::Local argv[2]; argv[0] = Nan::New(icb->err); @@ -231,8 +233,8 @@ class IndyCallback : public Nan::AsyncResource { break; case CB_HANDLE_U32: tuple = Nan::New(); - tuple->Set(0, Nan::New(icb->handle0)); - tuple->Set(1, Nan::New(icb->u32int0)); + (void)tuple->Set(context, 0, Nan::New(icb->handle0)); + (void)tuple->Set(context, 1, Nan::New(icb->u32int0)); argv[1] = tuple; break; case CB_I32: @@ -240,8 +242,8 @@ class IndyCallback : public Nan::AsyncResource { break; case CB_STRING_I64: tuple = Nan::New(); - tuple->Set(0, toJSString(icb->str0)); - tuple->Set(1, Nan::New(icb->i64int0)); + (void)tuple->Set(context, 0, toJSString(icb->str0)); + (void)tuple->Set(context, 1, Nan::New(icb->i64int0)); argv[1] = tuple; break; case CB_BUFFER: @@ -249,28 +251,28 @@ class IndyCallback : public Nan::AsyncResource { break; case CB_STRING_BUFFER: tuple = Nan::New(); - tuple->Set(0, toJSString(icb->str0)); - tuple->Set(1, Nan::NewBuffer(icb->buffer0data, icb->buffer0len).ToLocalChecked()); + (void)tuple->Set(context, 0, toJSString(icb->str0)); + (void)tuple->Set(context, 1, Nan::NewBuffer(icb->buffer0data, icb->buffer0len).ToLocalChecked()); argv[1] = tuple; break; case CB_STRING_STRING: tuple = Nan::New(); - tuple->Set(0, toJSString(icb->str0)); - tuple->Set(1, toJSString(icb->str1)); + (void)tuple->Set(context, 0, toJSString(icb->str0)); + (void)tuple->Set(context, 1, toJSString(icb->str1)); argv[1] = tuple; break; case CB_STRING_STRING_TIMESTAMP: tuple = Nan::New(); - tuple->Set(0, toJSString(icb->str0)); - tuple->Set(1, toJSString(icb->str1)); - tuple->Set(2, Nan::New(icb->timestamp0)); + (void)tuple->Set(context, 0, toJSString(icb->str0)); + (void)tuple->Set(context, 1, toJSString(icb->str1)); + (void)tuple->Set(context, 2, Nan::New(icb->timestamp0)); argv[1] = tuple; break; case CB_STRING_STRING_STRING: tuple = Nan::New(); - tuple->Set(0, toJSString(icb->str0)); - tuple->Set(1, toJSString(icb->str1)); - tuple->Set(2, toJSString(icb->str2)); + (void)tuple->Set(context, 0, toJSString(icb->str0)); + (void)tuple->Set(context, 1, toJSString(icb->str1)); + (void)tuple->Set(context, 2, toJSString(icb->str2)); argv[1] = tuple; break; }