Skip to content

Commit

Permalink
async_wrap: make Initialize a static class member
Browse files Browse the repository at this point in the history
This is how it's done everywhere else in core. Make it follow suit.

PR-URL: #9753
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
  • Loading branch information
trevnorris authored and MylesBorins committed Dec 2, 2016
1 parent 3e5be7f commit 5157a5c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
11 changes: 6 additions & 5 deletions src/async-wrap.cc
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ using v8::Function;
using v8::FunctionCallbackInfo;
using v8::HandleScope;
using v8::HeapProfiler;
using v8::Int32;
using v8::Integer;
using v8::Isolate;
using v8::Local;
Expand Down Expand Up @@ -155,9 +156,9 @@ static void SetupHooks(const FunctionCallbackInfo<Value>& args) {
}


static void Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
void AsyncWrap::Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Environment* env = Environment::GetCurrent(context);
Isolate* isolate = env->isolate();
HandleScope scope(isolate);
Expand Down Expand Up @@ -195,7 +196,7 @@ AsyncWrap::AsyncWrap(Environment* env,
Local<Object> object,
ProviderType provider,
AsyncWrap* parent)
: BaseObject(env,object), bits_(static_cast<uint32_t>(provider) << 1),
: BaseObject(env, object), bits_(static_cast<uint32_t>(provider) << 1),
uid_(env->get_async_wrap_uid()) {
CHECK_NE(provider, PROVIDER_NONE);
CHECK_GE(object->InternalFieldCount(), 1);
Expand Down Expand Up @@ -361,4 +362,4 @@ Local<Value> AsyncWrap::MakeCallback(const Local<Function> cb,

} // namespace node

NODE_MODULE_CONTEXT_AWARE_BUILTIN(async_wrap, node::Initialize)
NODE_MODULE_CONTEXT_AWARE_BUILTIN(async_wrap, node::AsyncWrap::Initialize)
4 changes: 4 additions & 0 deletions src/async-wrap.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ class AsyncWrap : public BaseObject {

virtual ~AsyncWrap();

static void Initialize(v8::Local<v8::Object> target,
v8::Local<v8::Value> unused,
v8::Local<v8::Context> context);

inline ProviderType provider_type() const;

inline int64_t get_uid() const;
Expand Down

0 comments on commit 5157a5c

Please sign in to comment.