Skip to content

Commit e222068

Browse files
bnoordhuisbnoordhuis
committed
Fix deprecation warnings in test suite.
This commit was brought to you by `perl -i -pe` (well, mostly - I did some manual fixups.) PR-URL: #825 Reviewed-By: Benjamin Byholm <bbyholm@abo.fi>
1 parent 509859c commit e222068

35 files changed

Lines changed: 132 additions & 119 deletions

‎test/cpp/accessors.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ NAN_MODULE_INIT(SetterGetter::Init) {
6161
);
6262

6363
v8::Local<v8::Function> createnew =
64-
Nan::New<v8::FunctionTemplate>(CreateNew)->GetFunction();
64+
Nan::GetFunction(
65+
Nan::New<v8::FunctionTemplate>(CreateNew)).ToLocalChecked();
6566
Set(target, Nan::New<v8::String>("create").ToLocalChecked(), createnew);
6667
}
6768

@@ -70,7 +71,8 @@ v8::Local<v8::Value> SetterGetter::NewInstance () {
7071
v8::Local<v8::FunctionTemplate> constructorHandle =
7172
Nan::New(settergetter_constructor);
7273
v8::Local<v8::Object> instance =
73-
Nan::NewInstance(constructorHandle->GetFunction()).ToLocalChecked();
74+
Nan::NewInstance(
75+
Nan::GetFunction(constructorHandle).ToLocalChecked()).ToLocalChecked();
7476
return scope.Escape(instance);
7577
}
7678

‎test/cpp/accessors2.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ NAN_MODULE_INIT(SetterGetter::Init) {
4949
tpl->InstanceTemplate()->SetInternalFieldCount(1);
5050
SetPrototypeMethod(tpl, "log", SetterGetter::Log);
5151
v8::Local<v8::Function> createnew =
52-
Nan::New<v8::FunctionTemplate>(CreateNew)->GetFunction();
52+
Nan::GetFunction(Nan::New<v8::FunctionTemplate>(CreateNew))
53+
.ToLocalChecked();
5354
Set(target, Nan::New<v8::String>("create").ToLocalChecked(), createnew);
5455
}
5556

@@ -58,7 +59,8 @@ v8::Local<v8::Value> SetterGetter::NewInstance () {
5859
v8::Local<v8::FunctionTemplate> constructorHandle =
5960
Nan::New(settergetter_constructor);
6061
v8::Local<v8::Object> instance =
61-
Nan::NewInstance(constructorHandle->GetFunction()).ToLocalChecked();
62+
Nan::NewInstance(Nan::GetFunction(constructorHandle).ToLocalChecked())
63+
.ToLocalChecked();
6264
SetAccessor(
6365
instance
6466
, Nan::New("prop1").ToLocalChecked()

‎test/cpp/asyncprogressqueueworker.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ NAN_METHOD(DoProgress) {
5555
NAN_MODULE_INIT(Init) {
5656
Set(target
5757
, New<v8::String>("doProgress").ToLocalChecked()
58-
, New<v8::FunctionTemplate>(DoProgress)->GetFunction());
58+
, GetFunction(New<v8::FunctionTemplate>(DoProgress)).ToLocalChecked());
5959
}
6060

6161
NODE_MODULE(asyncprogressqueueworker, Init)

‎test/cpp/asyncprogressqueueworkerstream.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ NAN_METHOD(DoProgress) {
7474
NAN_MODULE_INIT(Init) {
7575
Set(target
7676
, New<v8::String>("doProgress").ToLocalChecked()
77-
, New<v8::FunctionTemplate>(DoProgress)->GetFunction());
77+
, GetFunction(New<v8::FunctionTemplate>(DoProgress)).ToLocalChecked());
7878
}
7979

8080
NODE_MODULE(asyncprogressqueueworkerstream, Init)

‎test/cpp/asyncprogressworker.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ NAN_METHOD(DoProgress) {
6161
NAN_MODULE_INIT(Init) {
6262
Set(target
6363
, New<v8::String>("a").ToLocalChecked()
64-
, New<v8::FunctionTemplate>(DoProgress)->GetFunction());
64+
, GetFunction(New<v8::FunctionTemplate>(DoProgress)).ToLocalChecked());
6565
}
6666

6767
NODE_MODULE(asyncprogressworker, Init)

‎test/cpp/asyncprogressworkersignal.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ NAN_METHOD(DoProgress) {
5959
NAN_MODULE_INIT(Init) {
6060
Set(target
6161
, New<v8::String>("a").ToLocalChecked()
62-
, New<v8::FunctionTemplate>(DoProgress)->GetFunction());
62+
, GetFunction(New<v8::FunctionTemplate>(DoProgress)).ToLocalChecked());
6363
}
6464

6565
NODE_MODULE(asyncprogressworkersignal, Init)

‎test/cpp/asyncprogressworkerstream.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ NAN_METHOD(DoProgress) {
8181
NAN_MODULE_INIT(Init) {
8282
Set(target
8383
, New<v8::String>("a").ToLocalChecked()
84-
, New<v8::FunctionTemplate>(DoProgress)->GetFunction());
84+
, GetFunction(New<v8::FunctionTemplate>(DoProgress)).ToLocalChecked());
8585
}
8686

8787
NODE_MODULE(asyncprogressworkerstream, Init)

‎test/cpp/asyncworker.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ NAN_METHOD(DoSleep) {
3636
NAN_MODULE_INIT(Init) {
3737
Set(target
3838
, New<v8::String>("a").ToLocalChecked()
39-
, New<v8::FunctionTemplate>(DoSleep)->GetFunction());
39+
, GetFunction(New<v8::FunctionTemplate>(DoSleep)).ToLocalChecked());
4040
}
4141

4242
NODE_MODULE(asyncworker, Init)

‎test/cpp/asyncworkererror.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ NAN_METHOD(Work) {
2929
NAN_MODULE_INIT(Init) {
3030
Set(target
3131
, New("a").ToLocalChecked()
32-
, New<v8::FunctionTemplate>(Work)->GetFunction());
32+
, GetFunction(New<v8::FunctionTemplate>(Work)).ToLocalChecked());
3333
}
3434

3535
NODE_MODULE(asyncworkererror, Init)

‎test/cpp/buffer.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,19 @@ NAN_MODULE_INIT(Init) {
5656
}
5757
Set(target
5858
, New<v8::String>("new1").ToLocalChecked()
59-
, New<v8::FunctionTemplate>(New1)->GetFunction()
59+
, GetFunction(New<v8::FunctionTemplate>(New1)).ToLocalChecked()
6060
);
6161
Set(target
6262
, New<v8::String>("new2").ToLocalChecked()
63-
, New<v8::FunctionTemplate>(New2)->GetFunction()
63+
, GetFunction(New<v8::FunctionTemplate>(New2)).ToLocalChecked()
6464
);
6565
Set(target
6666
, New<v8::String>("new3").ToLocalChecked()
67-
, New<v8::FunctionTemplate>(New3)->GetFunction()
67+
, GetFunction(New<v8::FunctionTemplate>(New3)).ToLocalChecked()
6868
);
6969
Set(target
7070
, New<v8::String>("copy").ToLocalChecked()
71-
, New<v8::FunctionTemplate>(Copy)->GetFunction()
71+
, GetFunction(New<v8::FunctionTemplate>(Copy)).ToLocalChecked()
7272
);
7373
}
7474

0 commit comments

Comments
 (0)