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

Merge branch 'devel' of git://github.com/oliver----/swig-v8 into devel

Browse source 
Conflicts:
	Lib/javascript/v8/javascriptcode.swg
This commit is contained in:
Oliver Buchtala 2013-08-31 03:47:08 +02:00
commit 306b265af9
13 changed files with 235 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -57,7 +57,7 @@ v8::Handle<v8::Value> $jswrapper(const v8::Arguments& args) {
SWIG_exception_fail(SWIG_ERROR, "Illegal arguments for contruction of $jsmangledname");
fail:
scope.Close(v8::Undefined());
return scope.Close(v8::Undefined());
}
%}
@ -114,10 +114,12 @@ fail:
void $jswrapper(v8::Persistent< v8::Value > object, void *parameter) {
SWIGV8_Proxy* proxy = (SWIGV8_Proxy*) parameter;
if(proxy->swigCMemOwn && proxy->swigCObject) {
// std::cout << "Deleting wrapped instance: " << proxy->info->name << std::endl;
$jsfree proxy->swigCObject;
}
delete proxy;
object.Clear();
object.Dispose();
}
%}
@ -132,11 +134,13 @@ void $jswrapper(v8::Persistent< v8::Value > object, void *parameter) {
void $jswrapper(v8::Persistent< v8::Value > object, void *parameter) {
SWIGV8_Proxy* proxy = (SWIGV8_Proxy*) parameter;
if(proxy->swigCMemOwn && proxy->swigCObject) {
// std::cout << "Deleting wrapped instance: " << proxy->info->name << std::endl;
$jstype arg1 = ($jstype)proxy->swigCObject;
${destructor_action}
}
delete proxy;
object.Clear();
object.Dispose();
}
%}