Skip to content

Commit

Permalink
support node v12
Browse files Browse the repository at this point in the history
- upgrade nan to v2.14
- use  Nan::Utf8String rather than v8::String::Utf8Value

Fixes #206
  • Loading branch information
nickdesaulniers committed Jun 30, 2019
1 parent 60de923 commit b8fba45
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"main": "lib/index.js",
"dependencies": {
"bindings": "1.2.1",
"nan": "2.8"
"nan": "2.14.0"
},
"devDependencies": {
"buffer-equals-polyfill": "1.0.0",
Expand Down
8 changes: 4 additions & 4 deletions src/node_nanomsg.cc
Original file line number Diff line number Diff line change
Expand Up @@ -64,22 +64,22 @@ NAN_METHOD(Chan) {
int s = Nan::To<int>(info[0]).FromJust();
int level = NN_SUB;
int option = Nan::To<int>(info[1]).FromJust();
String::Utf8Value str(info[2]);
Nan::Utf8String str(info[2]);

info.GetReturnValue().Set(
Nan::New<Number>(nn_setsockopt(s, level, option, *str, str.length())));
}

NAN_METHOD(Bind) {
int s = Nan::To<int>(info[0]).FromJust();
String::Utf8Value addr(info[1]);
Nan::Utf8String addr(info[1]);

info.GetReturnValue().Set(Nan::New<Number>(nn_bind(s, *addr)));
}

NAN_METHOD(Connect) {
int s = Nan::To<int>(info[0]).FromJust();
String::Utf8Value addr(info[1]);
Nan::Utf8String addr(info[1]);

info.GetReturnValue().Set(Nan::New<Number>(nn_connect(s, *addr)));
}
Expand All @@ -99,7 +99,7 @@ NAN_METHOD(Send) {
info.GetReturnValue().Set(Nan::New<Number>(nn_send(
s, node::Buffer::Data(info[1]), node::Buffer::Length(info[1]), flags)));
} else {
String::Utf8Value str(info[1]);
Nan::Utf8String str(info[1]);
info.GetReturnValue().Set(
Nan::New<Number>(nn_send(s, *str, str.length(), flags)));
}
Expand Down

0 comments on commit b8fba45

Please sign in to comment.