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

don't unnecessarily set swigCPtr to zero again if Dispose/delete called multiple times

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11179 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2009-03-31 12:23:47 +00:00
commit be73d28ad7
5 changed files with 68 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/csharp/boost_shared_ptr.i
View file

@ -199,22 +199,26 @@
%typemap(csdestruct, methodname="Dispose", methodmodifiers="public") TYPE { %typemap(csdestruct, methodname="Dispose", methodmodifiers="public") TYPE {
lock(this) { lock(this) {
if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwnBase) { if (swigCPtr.Handle != IntPtr.Zero) {
if (swigCMemOwnBase) {
swigCMemOwnBase = false; swigCMemOwnBase = false;
$imcall; $imcall;
} }
swigCPtr = new HandleRef(null, IntPtr.Zero); swigCPtr = new HandleRef(null, IntPtr.Zero);
}
GC.SuppressFinalize(this); GC.SuppressFinalize(this);
} }
} }
%typemap(csdestruct_derived, methodname="Dispose", methodmodifiers="public") TYPE { %typemap(csdestruct_derived, methodname="Dispose", methodmodifiers="public") TYPE {
lock(this) { lock(this) {
if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwnDerived) { if (swigCPtr.Handle != IntPtr.Zero) {
if (swigCMemOwnDerived) {
swigCMemOwnDerived = false; swigCMemOwnDerived = false;
$imcall; $imcall;
} }
swigCPtr = new HandleRef(null, IntPtr.Zero); swigCPtr = new HandleRef(null, IntPtr.Zero);
}
GC.SuppressFinalize(this); GC.SuppressFinalize(this);
base.Dispose(); base.Dispose();
} }

8
Lib/csharp/csharp.swg
View file

@ -885,22 +885,26 @@ SWIGINTERN const char * SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
%typemap(csdestruct, methodname="Dispose", methodmodifiers="public") SWIGTYPE { %typemap(csdestruct, methodname="Dispose", methodmodifiers="public") SWIGTYPE {
lock(this) { lock(this) {
if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) { if (swigCPtr.Handle != IntPtr.Zero) {
if (swigCMemOwn) {
swigCMemOwn = false; swigCMemOwn = false;
$imcall; $imcall;
} }
swigCPtr = new HandleRef(null, IntPtr.Zero); swigCPtr = new HandleRef(null, IntPtr.Zero);
}
GC.SuppressFinalize(this); GC.SuppressFinalize(this);
} }
} }
%typemap(csdestruct_derived, methodname="Dispose", methodmodifiers="public") SWIGTYPE { %typemap(csdestruct_derived, methodname="Dispose", methodmodifiers="public") SWIGTYPE {
lock(this) { lock(this) {
if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) { if (swigCPtr.Handle != IntPtr.Zero) {
if (swigCMemOwn) {
swigCMemOwn = false; swigCMemOwn = false;
$imcall; $imcall;
} }
swigCPtr = new HandleRef(null, IntPtr.Zero); swigCPtr = new HandleRef(null, IntPtr.Zero);
}
GC.SuppressFinalize(this); GC.SuppressFinalize(this);
base.Dispose(); base.Dispose();
} }

8
Lib/java/boost_intrusive_ptr.i
View file

@ -430,19 +430,23 @@
%} %}
%typemap(javadestruct, methodname="delete", methodmodifiers="public synchronized") TYPE { %typemap(javadestruct, methodname="delete", methodmodifiers="public synchronized") TYPE {
if(swigCPtr != 0 && swigCMemOwnBase) { if (swigCPtr != 0) {
if (swigCMemOwnBase) {
swigCMemOwnBase = false; swigCMemOwnBase = false;
$jnicall; $jnicall;
} }
swigCPtr = 0; swigCPtr = 0;
} }
}
%typemap(javadestruct_derived, methodname="delete", methodmodifiers="public synchronized") TYPE { %typemap(javadestruct_derived, methodname="delete", methodmodifiers="public synchronized") TYPE {
if(swigCPtr != 0 && swigCMemOwnDerived) { if (swigCPtr != 0) {
if (swigCMemOwnDerived) {
swigCMemOwnDerived = false; swigCMemOwnDerived = false;
$jnicall; $jnicall;
} }
swigCPtr = 0; swigCPtr = 0;
}
super.delete(); super.delete();
} }

8
Lib/java/boost_shared_ptr.i
View file

@ -166,19 +166,23 @@
%} %}
%typemap(javadestruct, methodname="delete", methodmodifiers="public synchronized") TYPE { %typemap(javadestruct, methodname="delete", methodmodifiers="public synchronized") TYPE {
if(swigCPtr != 0 && swigCMemOwnBase) { if (swigCPtr != 0) {
if (swigCMemOwnBase) {
swigCMemOwnBase = false; swigCMemOwnBase = false;
$jnicall; $jnicall;
} }
swigCPtr = 0; swigCPtr = 0;
} }
}
%typemap(javadestruct_derived, methodname="delete", methodmodifiers="public synchronized") TYPE { %typemap(javadestruct_derived, methodname="delete", methodmodifiers="public synchronized") TYPE {
if(swigCPtr != 0 && swigCMemOwnDerived) { if (swigCPtr != 0) {
if (swigCMemOwnDerived) {
swigCMemOwnDerived = false; swigCMemOwnDerived = false;
$jnicall; $jnicall;
} }
swigCPtr = 0; swigCPtr = 0;
}
super.delete(); super.delete();
} }

8
Lib/java/java.swg
View file

@ -1148,19 +1148,23 @@ SWIG_PROXY_CONSTRUCTOR(true, false, TYPENAME)
SWIG_PROXY_CONSTRUCTOR(true, true, SWIGTYPE) SWIG_PROXY_CONSTRUCTOR(true, true, SWIGTYPE)
%typemap(javadestruct, methodname="delete", methodmodifiers="public synchronized") SWIGTYPE { %typemap(javadestruct, methodname="delete", methodmodifiers="public synchronized") SWIGTYPE {
if(swigCPtr != 0 && swigCMemOwn) { if (swigCPtr != 0) {
if (swigCMemOwn) {
swigCMemOwn = false; swigCMemOwn = false;
$jnicall; $jnicall;
} }
swigCPtr = 0; swigCPtr = 0;
} }
}
%typemap(javadestruct_derived, methodname="delete", methodmodifiers="public synchronized") SWIGTYPE { %typemap(javadestruct_derived, methodname="delete", methodmodifiers="public synchronized") SWIGTYPE {
if(swigCPtr != 0 && swigCMemOwn) { if (swigCPtr != 0) {
if (swigCMemOwn) {
swigCMemOwn = false; swigCMemOwn = false;
$jnicall; $jnicall;
} }
swigCPtr = 0; swigCPtr = 0;
}
super.delete(); super.delete();
} }