diff options
| author | Daniel Bevenius <daniel.bevenius@gmail.com> | 2018-11-08 07:22:13 +0100 |
|---|---|---|
| committer | Daniel Bevenius <daniel.bevenius@gmail.com> | 2018-11-11 08:02:30 +0100 |
| commit | 344d33eef110486bc094ba8d97a483379bf62752 (patch) | |
| tree | 9d929c9fc5a77665f6a5b13defc2b9e0c8c19af3 /src/node_dtrace.cc | |
| parent | 19e5e78e9c65605eba43b8c506a8069f6f6d5ff9 (diff) | |
| download | android-node-v8-344d33eef110486bc094ba8d97a483379bf62752.tar.gz android-node-v8-344d33eef110486bc094ba8d97a483379bf62752.tar.bz2 android-node-v8-344d33eef110486bc094ba8d97a483379bf62752.zip | |
src: fix v8 compiler warnings in src
This commit changes the code to use the maybe version.
PR-URL: https://github.com/nodejs/node/pull/24246
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Diffstat (limited to 'src/node_dtrace.cc')
| -rw-r--r-- | src/node_dtrace.cc | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/node_dtrace.cc b/src/node_dtrace.cc index 164a602fb6..cd3986cef5 100644 --- a/src/node_dtrace.cc +++ b/src/node_dtrace.cc @@ -65,7 +65,8 @@ using v8::Value; "expected object for " #obj " to contain string member " #member); \ } \ node::Utf8Value _##member(env->isolate(), \ - obj->Get(OneByteString(env->isolate(), #member))); \ + obj->Get(env->context(), \ + OneByteString(env->isolate(), #member)).ToLocalChecked()); \ if ((*(const char **)valp = *_##member) == nullptr) \ *(const char **)valp = "<unknown>"; @@ -75,7 +76,8 @@ using v8::Value; env, \ "expected object for " #obj " to contain integer member " #member); \ } \ - *valp = obj->Get(OneByteString(env->isolate(), #member)) \ + *valp = obj->Get(env->context(), \ + OneByteString(env->isolate(), #member)).ToLocalChecked() \ ->Int32Value(env->context()) \ .FromJust(); @@ -84,7 +86,8 @@ using v8::Value; return node::THROW_ERR_INVALID_ARG_TYPE(env, \ "expected object for " #obj " to contain object member " #member); \ } \ - *valp = Local<Object>::Cast(obj->Get(OneByteString(env->isolate(), #member))); + *valp = Local<Object>::Cast(obj->Get(env->context(), \ + OneByteString(env->isolate(), #member)).ToLocalChecked()); #define SLURP_CONNECTION(arg, conn) \ if (!(arg)->IsObject()) { \ @@ -94,7 +97,9 @@ using v8::Value; node_dtrace_connection_t conn; \ Local<Object> _##conn = Local<Object>::Cast(arg); \ Local<Value> _handle = \ - (_##conn)->Get(FIXED_ONE_BYTE_STRING(env->isolate(), "_handle")); \ + (_##conn)->Get(env->context(), \ + FIXED_ONE_BYTE_STRING(env->isolate(), "_handle")) \ + .ToLocalChecked(); \ if (_handle->IsObject()) { \ SLURP_INT(_handle.As<Object>(), fd, &conn.fd); \ } else { \ @@ -173,7 +178,8 @@ void DTRACE_HTTP_SERVER_REQUEST(const FunctionCallbackInfo<Value>& args) { "expected object for request to contain string member headers"); } - Local<Value> strfwdfor = headers->Get(env->x_forwarded_string()); + Local<Value> strfwdfor = headers->Get( + env->context(), env->x_forwarded_string()).ToLocalChecked(); node::Utf8Value fwdfor(env->isolate(), strfwdfor); if (!strfwdfor->IsString() || (req.forwardedFor = *fwdfor) == nullptr) @@ -279,7 +285,7 @@ void InitDTrace(Environment* env, Local<Object> target) { Local<Value> val = env->NewFunctionTemplate(tab[i].func) ->GetFunction(env->context()) .ToLocalChecked(); - target->Set(key, val); + target->Set(env->context(), key, val).FromJust(); } #ifdef HAVE_ETW |