diff options
| author | Richard <richie765@gmail.com> | 2014-08-12 22:25:32 -0500 |
|---|---|---|
| committer | Richard <richie765@gmail.com> | 2014-08-28 19:46:50 -0500 |
| commit | 3d63f9113bf6bd805f763a2efbe879e7ce08f992 (patch) | |
| tree | 688fd2897f5cdd4025626c012666245425202150 /Lib/javascript/v8/javascriptrun.swg | |
| parent | 013fb3d22da50fa3594a680c3d649334b9b39661 (diff) | |
| download | swig-3d63f9113bf6bd805f763a2efbe879e7ce08f992.tar.gz | |
Fixes for v8 3.19.18 (0x031918)
Diffstat (limited to 'Lib/javascript/v8/javascriptrun.swg')
| -rw-r--r-- | Lib/javascript/v8/javascriptrun.swg | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Lib/javascript/v8/javascriptrun.swg b/Lib/javascript/v8/javascriptrun.swg index dd5c9784e..50e4c5b87 100644 --- a/Lib/javascript/v8/javascriptrun.swg +++ b/Lib/javascript/v8/javascriptrun.swg @@ -214,12 +214,18 @@ void SWIGV8_SetPrivateData(v8::Handle<v8::Object> obj, void* ptr, swig_type_info } else { cdata->handle.MakeWeak(cdata, SWIGV8_Proxy_DefaultDtor); } -#else +#elif (SWIG_V8_VERSION < 0x031918) if(cdata->swigCMemOwn && (SWIGV8_ClientData*)info->clientdata) { cdata->handle.MakeWeak(v8::Isolate::GetCurrent(), cdata, ((SWIGV8_ClientData*)info->clientdata)->dtor); } else { cdata->handle.MakeWeak(v8::Isolate::GetCurrent(), cdata, SWIGV8_Proxy_DefaultDtor); } +#else + if(cdata->swigCMemOwn && (SWIGV8_ClientData*)info->clientdata) { + cdata->handle.MakeWeak(cdata, ((SWIGV8_ClientData*)info->clientdata)->dtor); + } else { + cdata->handle.MakeWeak(cdata, SWIGV8_Proxy_DefaultDtor); + } #endif #if (SWIG_V8_VERSION < 0x031710) @@ -463,8 +469,10 @@ v8::Handle<v8::Value> SWIGV8_NewPackedObj(void *data, size_t size, swig_type_inf #if (SWIG_V8_VERSION < 0x031710) cdata->handle.MakeWeak(cdata, _wrap_SwigV8PackedData_delete); -#else +#elif (SWIG_V8_VERSION < 0x031918) cdata->handle.MakeWeak(v8::Isolate::GetCurrent(), cdata, _wrap_SwigV8PackedData_delete); +#else + cdata->handle.MakeWeak(cdata, _wrap_SwigV8PackedData_delete); #endif #if (SWIG_V8_VERSION < 0x031710) |