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

Merge pull request #19 from whoozle/devel

Browse source 
fixed deprecation warnings for v8-3.21
This commit is contained in:
Oliver Buchtala 2013-09-06 19:50:51 -07:00
commit 8408e9b193
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/javascript/v8/javascriptcode.swg
View file

@ -141,8 +141,10 @@ void $jswrapper(v8::Isolate *isolate, v8::Persistent< v8::Object > * object, SWI
object.Clear();
#if (SWIG_V8_VERSION < 0x031900)
object.Dispose();
#else
#elif (SWIG_V8_VERSION < 0x032100)
object->Dispose(isolate);
#else
object->Dispose();
#endif
}
%}
@ -171,8 +173,10 @@ void $jswrapper(v8::Isolate *isolate, v8::Persistent< v8::Object > * object, SWI
#if (SWIG_V8_VERSION < 0x031900)
object.Dispose();
#else
#elif (SWIG_V8_VERSION < 0x032100)
object->Dispose(isolate);
#else
object->Dispose();
#endif
}
%}

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

@ -110,7 +110,7 @@ public:
};
~SWIGV8_Proxy() {
#if (SWIG_V8_VERSION < 0x031900)
#if (SWIG_V8_VERSION < 0x031900 || SWIG_V8_VERSION >= 0x032100)
handle.ClearWeak();
handle.Dispose();
#else
@ -238,7 +238,13 @@ void SWIGV8_SetPrivateData(v8::Handle<v8::Object> obj, void* ptr, swig_type_info
} else {
cdata->handle.MakeWeak(v8::Isolate::GetCurrent(), cdata, SWIGV8_Proxy_DefaultDtor);
}
cdata->handle.MarkIndependent(v8::Isolate::GetCurrent());
# if (SWIG_V8_VERSION < 0x032100)
cdata->handle.MarkIndependent(v8::Isolate::GetCurrent());
# else
cdata->handle.MarkIndependent();
# endif
#endif
}