mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Fix compilation error with node 0.10.

Browse source
This commit is contained in:
Cheng Zhao 2014-08-10 11:20:41 +08:00
parent 3d713baa4c
commit 9145a08395
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
native_mate/compat.h
View file

@ -38,6 +38,7 @@
v8::Integer::NewFromUnsigned(isolate, data) v8::Integer::NewFromUnsigned(isolate, data)
#define MATE_EXTERNAL_NEW(isolate, data) v8::External::New(isolate, data) #define MATE_EXTERNAL_NEW(isolate, data) v8::External::New(isolate, data)
#define MATE_BOOLEAN_NEW(isolate, data) v8::Boolean::New(isolate, data) #define MATE_BOOLEAN_NEW(isolate, data) v8::Boolean::New(isolate, data)
#define MATE_OBJECT_NEW(isolate) v8::Object::New(isolate)
#define MATE_SET_INTERNAL_FIELD_POINTER(object, index, value) \ #define MATE_SET_INTERNAL_FIELD_POINTER(object, index, value) \
object->SetAlignedPointerInInternalField(index, value) object->SetAlignedPointerInInternalField(index, value)
@ -95,6 +96,7 @@
v8::Integer::NewFromUnsigned(data) v8::Integer::NewFromUnsigned(data)
#define MATE_EXTERNAL_NEW(isolate, data) v8::External::New(data) #define MATE_EXTERNAL_NEW(isolate, data) v8::External::New(data)
#define MATE_BOOLEAN_NEW(isolate, data) v8::Boolean::New(data) #define MATE_BOOLEAN_NEW(isolate, data) v8::Boolean::New(data)
#define MATE_OBJECT_NEW(isolate) v8::Object::New()
#define MATE_SET_INTERNAL_FIELD_POINTER(object, index, value) \ #define MATE_SET_INTERNAL_FIELD_POINTER(object, index, value) \
object->SetPointerInInternalField(index, value) object->SetPointerInInternalField(index, value)

4
native_mate/dictionary.cc
View file

@ -8,7 +8,7 @@ namespace mate {
Dictionary::Dictionary(v8::Isolate* isolate) Dictionary::Dictionary(v8::Isolate* isolate)
: isolate_(isolate), : isolate_(isolate),
object_(v8::Object::New(isolate)) { object_(MATE_OBJECT_NEW(isolate)) {
} }
Dictionary::Dictionary(v8::Isolate* isolate, Dictionary::Dictionary(v8::Isolate* isolate,
@ -22,7 +22,7 @@ Dictionary::~Dictionary() {
Dictionary Dictionary::CreateEmpty(v8::Isolate* isolate) { Dictionary Dictionary::CreateEmpty(v8::Isolate* isolate) {
Dictionary dictionary(isolate); Dictionary dictionary(isolate);
dictionary.object_ = v8::Object::New(isolate); dictionary.object_ = MATE_OBJECT_NEW(isolate);
return dictionary; return dictionary;
} }

2
native_mate/wrappable.cc
View file

@ -44,7 +44,7 @@ ObjectTemplateBuilder Wrappable::GetObjectTemplateBuilder(
// static // static
MATE_WEAK_CALLBACK(Wrappable::WeakCallback, v8::Object, Wrappable) { MATE_WEAK_CALLBACK(Wrappable::WeakCallback, v8::Object, Wrappable) {
MATE_WEAK_CALLBACK_INIT(Wrappable); MATE_WEAK_CALLBACK_INIT(Wrappable);
self->wrapper_.Reset(); MATE_PERSISTENT_RESET(self->wrapper_);
delete self; delete self;
} }