jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace old style v8 version switches.

Browse source
This commit is contained in:
Oliver Buchtala 2013-09-03 14:41:35 +02:00
commit cef82c720f
1 changed files with 11 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Lib/javascript/v8/javascriptruntime.swg
View file

@ -94,19 +94,14 @@ public:
}; };
~SWIGV8_Proxy() { ~SWIGV8_Proxy() {
#if defined(BUILDING_NODE_EXTENSION) || defined(V8_3_14) #if (SWIG_V8_VERSION < 0x031900)
handle.ClearWeak(); handle.ClearWeak();
#else
handle.ClearWeak(v8::Isolate::GetCurrent());
#endif
//handle->SetInternalField(0, v8::Undefined());
#if defined(BUILDING_NODE_EXTENSION) || defined(V8_3_14)
handle.Dispose(); handle.Dispose();
#else #else
handle.ClearWeak(v8::Isolate::GetCurrent());
handle.Dispose(v8::Isolate::GetCurrent()); handle.Dispose(v8::Isolate::GetCurrent());
#endif #endif
handle.Clear(); handle.Clear();
v8::V8::AdjustAmountOfExternalAllocatedMemory(-SWIGV8_AVG_OBJ_SIZE); v8::V8::AdjustAmountOfExternalAllocatedMemory(-SWIGV8_AVG_OBJ_SIZE);
} }
@ -121,7 +116,7 @@ class SWIGV8_ClientData {
public: public:
v8::Persistent<v8::FunctionTemplate> class_templ; v8::Persistent<v8::FunctionTemplate> class_templ;
#if defined(BUILDING_NODE_EXTENSION) || defined(V8_3_14) #if (SWIG_V8_VERSION < 0x031900)
void (*dtor) (v8::Persistent< v8::Value> object, void *parameter); void (*dtor) (v8::Persistent< v8::Value> object, void *parameter);
#else #else
void (*dtor) (v8::Isolate *isolate, v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy); void (*dtor) (v8::Isolate *isolate, v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy);
@ -135,7 +130,7 @@ int SWIG_V8_ConvertInstancePtr(v8::Handle<v8::Object> objRef, void** ptr, swig_t
if(objRef->InternalFieldCount() < 1) return SWIG_ERROR; if(objRef->InternalFieldCount() < 1) return SWIG_ERROR;
#if defined(BUILDING_NODE_EXTENSION) || defined(V8_3_14) #if (SWIG_V8_VERSION < 0x031900)
v8::Handle<v8::Value> cdataRef = objRef->GetInternalField(0); v8::Handle<v8::Value> cdataRef = objRef->GetInternalField(0);
SWIGV8_Proxy *cdata = static_cast<SWIGV8_Proxy *>(v8::External::Unwrap(cdataRef)); SWIGV8_Proxy *cdata = static_cast<SWIGV8_Proxy *>(v8::External::Unwrap(cdataRef));
#else #else
@ -162,13 +157,13 @@ int SWIG_V8_ConvertInstancePtr(v8::Handle<v8::Object> objRef, void** ptr, swig_t
return SWIG_OK; return SWIG_OK;
} }
#if defined(BUILDING_NODE_EXTENSION) || defined(V8_3_14) #if (SWIG_V8_VERSION < 0x031900)
void SWIGV8_Proxy_DefaultDtor(v8::Persistent< v8::Value > object, void *parameter) void SWIGV8_Proxy_DefaultDtor(v8::Persistent< v8::Value > object, void *parameter)
#else #else
void SWIGV8_Proxy_DefaultDtor(v8::Isolate *, v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy) void SWIGV8_Proxy_DefaultDtor(v8::Isolate *, v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy)
#endif #endif
{ {
#if defined(BUILDING_NODE_EXTENSION) || defined(V8_3_14) #if (SWIG_V8_VERSION < 0x031900)
SWIGV8_Proxy *proxy = static_cast<SWIGV8_Proxy *>(parameter); SWIGV8_Proxy *proxy = static_cast<SWIGV8_Proxy *>(parameter);
#endif #endif
@ -183,7 +178,7 @@ int SWIG_V8_GetInstancePtr(v8::Handle<v8::Value> valRef, void** ptr) {
if(objRef->InternalFieldCount() < 1) return SWIG_ERROR; if(objRef->InternalFieldCount() < 1) return SWIG_ERROR;
#if defined(BUILDING_NODE_EXTENSION) || defined(V8_3_14) #if (SWIG_V8_VERSION < 0x031900)
v8::Handle<v8::Value> cdataRef = objRef->GetInternalField(0); v8::Handle<v8::Value> cdataRef = objRef->GetInternalField(0);
SWIGV8_Proxy *cdata = static_cast<SWIGV8_Proxy *>(v8::External::Unwrap(cdataRef)); SWIGV8_Proxy *cdata = static_cast<SWIGV8_Proxy *>(v8::External::Unwrap(cdataRef));
#else #else
@ -205,7 +200,7 @@ void SWIGV8_SetPrivateData(v8::Handle<v8::Object> obj, void* ptr, swig_type_info
cdata->swigCMemOwn = (flags & SWIG_POINTER_OWN) ? 1 : 0; cdata->swigCMemOwn = (flags & SWIG_POINTER_OWN) ? 1 : 0;
cdata->info = info; cdata->info = info;
#if defined(BUILDING_NODE_EXTENSION) || defined(V8_3_14) #if (SWIG_V8_VERSION < 0x031900)
obj->SetPointerInInternalField(0, cdata); obj->SetPointerInInternalField(0, cdata);
cdata->handle = v8::Persistent<v8::Object>::New(obj); cdata->handle = v8::Persistent<v8::Object>::New(obj);
#else #else
@ -213,7 +208,7 @@ void SWIGV8_SetPrivateData(v8::Handle<v8::Object> obj, void* ptr, swig_type_info
cdata->handle.Reset(v8::Isolate::GetCurrent(), obj); cdata->handle.Reset(v8::Isolate::GetCurrent(), obj);
#endif #endif
#if defined(BUILDING_NODE_EXTENSION) || defined(V8_3_14) #if (SWIG_V8_VERSION < 0x031900)
// clientdata must be set for owned data as we need to register the dtor // clientdata must be set for owned data as we need to register the dtor
if(cdata->swigCMemOwn && (SWIGV8_ClientData*)info->clientdata) { if(cdata->swigCMemOwn && (SWIGV8_ClientData*)info->clientdata) {
cdata->handle.MakeWeak(cdata, ((SWIGV8_ClientData*)info->clientdata)->dtor); cdata->handle.MakeWeak(cdata, ((SWIGV8_ClientData*)info->clientdata)->dtor);
@ -246,7 +241,7 @@ v8::Handle<v8::Object> SWIG_V8_NewPointerObj(void *ptr, swig_type_info *info, in
v8::Handle<v8::FunctionTemplate> class_templ; v8::Handle<v8::FunctionTemplate> class_templ;
#if defined(BUILDING_NODE_EXTENSION) || defined(V8_3_14) #if (SWIG_V8_VERSION < 0x031900)
if(info->clientdata != 0) { if(info->clientdata != 0) {
class_templ = ((SWIGV8_ClientData*) info->clientdata)->class_templ; class_templ = ((SWIGV8_ClientData*) info->clientdata)->class_templ;
} else { } else {
@ -329,4 +324,3 @@ fail:
return scope.Close(v8::Undefined()); return scope.Close(v8::Undefined());
} }
%} %}