From 08951a13074841de9a0325bc13ea1636221575e3 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Thu, 20 Apr 2017 12:15:36 +0200 Subject: [PATCH] src: replace IsConstructCalls with lambda I've added a deprecation notice as the functions are public, but not sure if this is correct or the format of the deprecation notice. PR-URL: https://github.com/nodejs/node/pull/12533 Reviewed-By: Ben Noordhuis Reviewed-By: Colin Ihrig Reviewed-By: Benjamin Gruenbaum Reviewed-By: James M Snell Reviewed-By: Anna Henningsen --- src/stream_base.h | 8 -------- src/stream_wrap.cc | 8 ++++++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/stream_base.h b/src/stream_base.h index 35929750bfbc54..e2ef8d8d396b87 100644 --- a/src/stream_base.h +++ b/src/stream_base.h @@ -53,10 +53,6 @@ class ShutdownWrap : public ReqWrap, Wrap(req_wrap_obj, this); } - static void NewShutdownWrap(const v8::FunctionCallbackInfo& args) { - CHECK(args.IsConstructCall()); - } - static ShutdownWrap* from_req(uv_shutdown_t* req) { return ContainerOf(&ShutdownWrap::req_, req); } @@ -83,10 +79,6 @@ class WriteWrap: public ReqWrap, size_t self_size() const override { return storage_size_; } - static void NewWriteWrap(const v8::FunctionCallbackInfo& args) { - CHECK(args.IsConstructCall()); - } - static WriteWrap* from_req(uv_write_t* req) { return ContainerOf(&WriteWrap::req_, req); } diff --git a/src/stream_wrap.cc b/src/stream_wrap.cc index ac656505503b22..08c7aae8c46f34 100644 --- a/src/stream_wrap.cc +++ b/src/stream_wrap.cc @@ -38,15 +38,19 @@ void StreamWrap::Initialize(Local target, Local context) { Environment* env = Environment::GetCurrent(context); + auto is_construct_call_callback = + [](const FunctionCallbackInfo& args) { + CHECK(args.IsConstructCall()); + }; Local sw = - FunctionTemplate::New(env->isolate(), ShutdownWrap::NewShutdownWrap); + FunctionTemplate::New(env->isolate(), is_construct_call_callback); sw->InstanceTemplate()->SetInternalFieldCount(1); sw->SetClassName(FIXED_ONE_BYTE_STRING(env->isolate(), "ShutdownWrap")); target->Set(FIXED_ONE_BYTE_STRING(env->isolate(), "ShutdownWrap"), sw->GetFunction()); Local ww = - FunctionTemplate::New(env->isolate(), WriteWrap::NewWriteWrap); + FunctionTemplate::New(env->isolate(), is_construct_call_callback); ww->InstanceTemplate()->SetInternalFieldCount(1); ww->SetClassName(FIXED_ONE_BYTE_STRING(env->isolate(), "WriteWrap")); target->Set(FIXED_ONE_BYTE_STRING(env->isolate(), "WriteWrap"),