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

22
Lib/csharp/boost_shared_ptr.i
View file

@ -33,7 +33,7 @@
// plain reference // plain reference
%typemap(in, canthrow=1) CONST TYPE & %{ %typemap(in, canthrow=1) CONST TYPE & %{
$1 = ($1_ltype)(((SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)$input) ? ((SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)$input)->get() : 0); $1 = ($1_ltype)(((SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)$input) ? ((SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)$input)->get() : 0);
if(!$1) { if (!$1) {
SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "$1_type reference is null", 0); SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "$1_type reference is null", 0);
return $null; return $null;
} %} } %}
@ -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) {
swigCMemOwnBase = false; if (swigCMemOwnBase) {
$imcall; swigCMemOwnBase = false;
$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) {
swigCMemOwnDerived = false; if (swigCMemOwnDerived) {
$imcall; swigCMemOwnDerived = false;
$imcall;
}
swigCPtr = new HandleRef(null, IntPtr.Zero);
} }
swigCPtr = new HandleRef(null, IntPtr.Zero);
GC.SuppressFinalize(this); GC.SuppressFinalize(this);
base.Dispose(); base.Dispose();
} }

22
Lib/csharp/csharp.swg
View file

@ -396,7 +396,7 @@ SWIGINTERN const char * SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
SWIG_UnpackData($input, (void *)&$1, sizeof($1)); SWIG_UnpackData($input, (void *)&$1, sizeof($1));
%} %}
%typemap(in, canthrow=1) SWIGTYPE & %{ $1 = ($1_ltype)$input; %typemap(in, canthrow=1) SWIGTYPE & %{ $1 = ($1_ltype)$input;
if(!$1) { if (!$1) {
SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "$1_type type is null", 0); SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "$1_type type is null", 0);
return $null; return $null;
} %} } %}
@ -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) {
swigCMemOwn = false; if (swigCMemOwn) {
$imcall; swigCMemOwn = false;
$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) {
swigCMemOwn = false; if (swigCMemOwn) {
$imcall; swigCMemOwn = false;
$imcall;
}
swigCPtr = new HandleRef(null, IntPtr.Zero);
} }
swigCPtr = new HandleRef(null, IntPtr.Zero);
GC.SuppressFinalize(this); GC.SuppressFinalize(this);
base.Dispose(); base.Dispose();
} }

22
Lib/java/boost_intrusive_ptr.i
View file

@ -342,7 +342,7 @@
// plain reference // plain reference
%typemap(in) CONST TYPE & %{ %typemap(in) CONST TYPE & %{
$1 = ($1_ltype)((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0); $1 = ($1_ltype)((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0);
if(!$1) { if (!$1) {
SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "$1_type reference is null"); SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "$1_type reference is null");
return $null; return $null;
} %} } %}
@ -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) {
swigCMemOwnBase = false; if (swigCMemOwnBase) {
$jnicall; swigCMemOwnBase = false;
$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) {
swigCMemOwnDerived = false; if (swigCMemOwnDerived) {
$jnicall; swigCMemOwnDerived = false;
$jnicall;
}
swigCPtr = 0;
} }
swigCPtr = 0;
super.delete(); super.delete();
} }

22
Lib/java/boost_shared_ptr.i
View file

@ -33,7 +33,7 @@
// plain reference // plain reference
%typemap(in) CONST TYPE & %{ %typemap(in) CONST TYPE & %{
$1 = ($1_ltype)((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0); $1 = ($1_ltype)((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0);
if(!$1) { if (!$1) {
SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "$1_type reference is null"); SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "$1_type reference is null");
return $null; return $null;
} %} } %}
@ -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) {
swigCMemOwnBase = false; if (swigCMemOwnBase) {
$jnicall; swigCMemOwnBase = false;
$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) {
swigCMemOwnDerived = false; if (swigCMemOwnDerived) {
$jnicall; swigCMemOwnDerived = false;
$jnicall;
}
swigCPtr = 0;
} }
swigCPtr = 0;
super.delete(); super.delete();
} }

28
Lib/java/java.swg
View file

@ -364,7 +364,7 @@
} }
%typemap(freearg, noblock=1) char * { if ($1) JCALL2(ReleaseStringUTFChars, jenv, $input, (const char *)$1); } %typemap(freearg, noblock=1) char * { if ($1) JCALL2(ReleaseStringUTFChars, jenv, $input, (const char *)$1); }
%typemap(out, noblock=1) char * { if($1) $result = JCALL1(NewStringUTF, jenv, (const char *)$1); } %typemap(out, noblock=1) char * { if ($1) $result = JCALL1(NewStringUTF, jenv, (const char *)$1); }
%typemap(javadirectorin) char * "$jniinput" %typemap(javadirectorin) char * "$jniinput"
%typemap(javadirectorout) char * "$javacall" %typemap(javadirectorout) char * "$javacall"
@ -378,7 +378,7 @@
$1 = &temp; $1 = &temp;
} }
%typemap(freearg, noblock=1) char *& { if ($1 && *$1) JCALL2(ReleaseStringUTFChars, jenv, $input, (const char *)*$1); } %typemap(freearg, noblock=1) char *& { if ($1 && *$1) JCALL2(ReleaseStringUTFChars, jenv, $input, (const char *)*$1); }
%typemap(out, noblock=1) char *& { if(*$1) $result = JCALL1(NewStringUTF, jenv, (const char *)*$1); } %typemap(out, noblock=1) char *& { if (*$1) $result = JCALL1(NewStringUTF, jenv, (const char *)*$1); }
%typemap(out) void "" %typemap(out) void ""
%typemap(javadirectorin) void "$jniinput" %typemap(javadirectorin) void "$jniinput"
@ -597,7 +597,7 @@
/* Generic pointers and references */ /* Generic pointers and references */
%typemap(in) SWIGTYPE *, SWIGTYPE (CLASS::*) %{ $1 = *($&1_ltype)&$input; %} %typemap(in) SWIGTYPE *, SWIGTYPE (CLASS::*) %{ $1 = *($&1_ltype)&$input; %}
%typemap(in) SWIGTYPE & %{ $1 = *($&1_ltype)&$input; %typemap(in) SWIGTYPE & %{ $1 = *($&1_ltype)&$input;
if(!$1) { if (!$1) {
SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "$1_type reference is null"); SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "$1_type reference is null");
return $null; return $null;
} %} } %}
@ -656,7 +656,7 @@
%typemap(argout) char[ANY], char[] "" %typemap(argout) char[ANY], char[] ""
%typemap(freearg, noblock=1) char[ANY], char[] { if ($1) JCALL2(ReleaseStringUTFChars, jenv, $input, (const char *)$1); } %typemap(freearg, noblock=1) char[ANY], char[] { if ($1) JCALL2(ReleaseStringUTFChars, jenv, $input, (const char *)$1); }
%typemap(out, noblock=1) char[ANY], char[] { if($1) $result = JCALL1(NewStringUTF, jenv, (const char *)$1); } %typemap(out, noblock=1) char[ANY], char[] { if ($1) $result = JCALL1(NewStringUTF, jenv, (const char *)$1); }
%typemap(javadirectorin) char[ANY], char[] "$jniinput" %typemap(javadirectorin) char[ANY], char[] "$jniinput"
%typemap(javadirectorout) char[ANY], char[] "$javacall" %typemap(javadirectorout) char[ANY], char[] "$javacall"
@ -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) {
swigCMemOwn = false; if (swigCMemOwn) {
$jnicall; swigCMemOwn = false;
$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) {
swigCMemOwn = false; if (swigCMemOwn) {
$jnicall; swigCMemOwn = false;
$jnicall;
}
swigCPtr = 0;
} }
swigCPtr = 0;
super.delete(); super.delete();
} }