Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/async-wrap-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ inline AsyncWrap::AsyncWrap(Environment* env,
v8::Handle<v8::Object> object,
ProviderType provider,
AsyncWrap* parent)
: BaseObject(env, object, provider),
bits_(static_cast<uint32_t>(provider) << 1) {
: BaseObject(env, object), bits_(static_cast<uint32_t>(provider) << 1) {
// Check user controlled flag to see if the init callback should run.
if (!env->using_asyncwrap())
return;
Expand Down
7 changes: 1 addition & 6 deletions src/base-object-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,10 @@

namespace node {

inline BaseObject::BaseObject(Environment* env,
v8::Local<v8::Object> handle,
const uint16_t class_id)
inline BaseObject::BaseObject(Environment* env, v8::Local<v8::Object> handle)
: handle_(env->isolate(), handle),
env_(env) {
CHECK_EQ(false, handle.IsEmpty());
// Shift value 8 bits over to try avoiding conflict with anything else.
if (class_id != 0)
handle_.SetWrapperClassId(class_id << 8);
}


Expand Down
4 changes: 1 addition & 3 deletions src/base-object.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ class Environment;

class BaseObject {
public:
BaseObject(Environment* env,
v8::Local<v8::Object> handle,
const uint16_t class_id = 0);
BaseObject(Environment* env, v8::Local<v8::Object> handle);
virtual ~BaseObject();

// Returns the wrapped object. Returns an empty handle when
Expand Down