From ae42da3b55b0c9d68b155c3b5435002a1c4a165d Mon Sep 17 00:00:00 2001 From: abetomo Date: Sat, 11 Jul 2020 08:53:59 +0900 Subject: [PATCH 1/2] Use 'Nan::Set' Fix the following errors. ``` ../src/main.cc:138:25: error: no matching member function for call to 'Set' misspelled_range->Set(Nan::New("end").ToLocalChecked(), Nan::New(end)); ``` --- src/main.cc | 10 +++++----- src/worker.cc | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main.cc b/src/main.cc index af0867b..df719f1 100644 --- a/src/main.cc +++ b/src/main.cc @@ -135,9 +135,9 @@ class Spellchecker : public Nan::ObjectWrap { uint32_t start = iter->start, end = iter->end; Local misspelled_range = Nan::New(); - misspelled_range->Set(context, Nan::New("start").ToLocalChecked(), Nan::New(start)); - misspelled_range->Set(context, Nan::New("end").ToLocalChecked(), Nan::New(end)); - result->Set(context, index, misspelled_range); + Nan::Set(misspelled_range, Nan::New("start").ToLocalChecked(), Nan::New(start)); + Nan::Set(misspelled_range, Nan::New("end").ToLocalChecked(), Nan::New(end)); + Nan::Set(result, index, misspelled_range); } } @@ -222,7 +222,7 @@ class Spellchecker : public Nan::ObjectWrap { Local result = Nan::New(dictionaries.size()); for (size_t i = 0; i < dictionaries.size(); ++i) { const std::string& dict = dictionaries[i]; - result->Set(context, i, Nan::New(dict.data(), dict.size()).ToLocalChecked()); + Nan::Set(result, i, Nan::New(dict.data(), dict.size()).ToLocalChecked()); } info.GetReturnValue().Set(result); @@ -249,7 +249,7 @@ class Spellchecker : public Nan::ObjectWrap { const std::string& word = corrections[i]; Nan::MaybeLocal val = Nan::New(word.data(), word.size()); - result->Set(context, i, val.ToLocalChecked()); + Nan::Set(result, i, val.ToLocalChecked()); } info.GetReturnValue().Set(result); diff --git a/src/worker.cc b/src/worker.cc index c523bcf..4004ff4 100644 --- a/src/worker.cc +++ b/src/worker.cc @@ -36,9 +36,9 @@ void CheckSpellingWorker::HandleOKCallback() { uint32_t start = iter->start, end = iter->end; Local misspelled_range = Nan::New(); - misspelled_range->Set(context, Nan::New("start").ToLocalChecked(), Nan::New(start)); - misspelled_range->Set(context, Nan::New("end").ToLocalChecked(), Nan::New(end)); - result->Set(context, index, misspelled_range); + Nan::Set(misspelled_range, Nan::New("start").ToLocalChecked(), Nan::New(start)); + Nan::Set(misspelled_range, Nan::New("end").ToLocalChecked(), Nan::New(end)); + Nan::Set(result, index, misspelled_range); } Local argv[] = { Nan::Null(), result }; From d1fcd7f596975cb2a0fd955a21b7ba37a623866d Mon Sep 17 00:00:00 2001 From: abetomo Date: Sat, 11 Jul 2020 08:56:54 +0900 Subject: [PATCH 2/2] Fix deprecated callback MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The following warning. ``` ../src/worker.cc: In member function ‘virtual void CheckSpellingWorker::HandleOKCallback()’: ../src/worker.cc:44:25: warning: ‘v8::Local Nan::Callback::Call(int, v8::Local*) const’ is deprecated [-Wdeprecated-declarations] callback->Call(2, argv); ``` --- src/worker.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/worker.cc b/src/worker.cc index 4004ff4..7702939 100644 --- a/src/worker.cc +++ b/src/worker.cc @@ -42,5 +42,6 @@ void CheckSpellingWorker::HandleOKCallback() { } Local argv[] = { Nan::Null(), result }; - callback->Call(2, argv); + Nan::AsyncResource resource("CheckSpellingWorker::HandleOKCallback"); + callback->Call(2, argv, &resource); }