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

new $imclassname to fix bugs changing the intermediary classname

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@8027 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2005-12-21 22:51:25 +00:00
commit 36b0436a48
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
SWIG/Lib/csharp/csharp.swg
View file

@ -340,8 +340,8 @@ $1 = &temp; %}
* method can throw any exceptions from unmanaged code, otherwise replaced by nothing. */ * method can throw any exceptions from unmanaged code, otherwise replaced by nothing. */
// Macro used by the $excode special variable // Macro used by the $excode special variable
%define SWIGEXCODE "\n if ($modulePINVOKE.SWIGPendingException.Pending) throw $modulePINVOKE.SWIGPendingException.Retrieve();" %enddef %define SWIGEXCODE "\n if ($imclassname.SWIGPendingException.Pending) throw $imclassname.SWIGPendingException.Retrieve();" %enddef
%define SWIGEXCODE2 "\n if ($modulePINVOKE.SWIGPendingException.Pending) throw $modulePINVOKE.SWIGPendingException.Retrieve();" %enddef %define SWIGEXCODE2 "\n if ($imclassname.SWIGPendingException.Pending) throw $imclassname.SWIGPendingException.Retrieve();" %enddef
%typemap(csout, excode=SWIGEXCODE) bool, const bool & { %typemap(csout, excode=SWIGEXCODE) bool, const bool & {
bool ret = $imcall;$excode bool ret = $imcall;$excode
@ -558,7 +558,7 @@ $1 = &temp; %}
%typemap(csbody_derived) SWIGTYPE %{ %typemap(csbody_derived) SWIGTYPE %{
private HandleRef swigCPtr; private HandleRef swigCPtr;
internal $csclassname(IntPtr cPtr, bool cMemoryOwn) : base($modulePINVOKE.$csclassnameUpcast(cPtr), cMemoryOwn) { internal $csclassname(IntPtr cPtr, bool cMemoryOwn) : base($imclassname.$csclassnameUpcast(cPtr), cMemoryOwn) {
swigCPtr = new HandleRef(this, cPtr); swigCPtr = new HandleRef(this, cPtr);
} }
@ -662,7 +662,7 @@ using System.Runtime.InteropServices;
%typemap(imtype, out="IntPtr") char *, char[ANY], char[] "HandleRef" %typemap(imtype, out="IntPtr") char *, char[ANY], char[] "HandleRef"
%typemap(out) char *, char[ANY], char[] %{ $result = $1; %} %typemap(out) char *, char[ANY], char[] %{ $result = $1; %}
%typemap(csin) char *, char[ANY], char[] "new $modulePINVOKE.SWIGStringMarshal($csinput).swigCPtr" %typemap(csin) char *, char[ANY], char[] "new $imclassname.SWIGStringMarshal($csinput).swigCPtr"
%typemap(csout, excode=SWIGEXCODE) char *, char[ANY], char[] { %typemap(csout, excode=SWIGEXCODE) char *, char[ANY], char[] {
string ret = System.Runtime.InteropServices.Marshal.PtrToStringAnsi($imcall);$excode string ret = System.Runtime.InteropServices.Marshal.PtrToStringAnsi($imcall);$excode
return ret; return ret;

4
SWIG/Lib/java/java.swg
View file

@ -1066,7 +1066,7 @@
private long swigCPtr; private long swigCPtr;
PTRCTOR_VISIBILITY $javaclassname(long cPtr, boolean cMemoryOwn) { PTRCTOR_VISIBILITY $javaclassname(long cPtr, boolean cMemoryOwn) {
super($moduleJNI.SWIG$javaclassnameUpcast(cPtr), cMemoryOwn); super($imclassname.SWIG$javaclassnameUpcast(cPtr), cMemoryOwn);
swigCPtr = cPtr; swigCPtr = cPtr;
} }
@ -1126,7 +1126,7 @@ SWIG_JAVABODY_METHODS(protected, protected, SWIGTYPE)
*/ */
%define SWIG_PROXY_CONSTRUCTOR(OWNERSHIP, WEAKREF, TYPENAME...) %define SWIG_PROXY_CONSTRUCTOR(OWNERSHIP, WEAKREF, TYPENAME...)
%typemap(javaconstruct,directorconnect="\n $moduleJNI.$javaclassname_director_connect(this, swigCPtr, swigCMemOwn, WEAKREF);") TYPENAME { %typemap(javaconstruct,directorconnect="\n $imclassname.$javaclassname_director_connect(this, swigCPtr, swigCMemOwn, WEAKREF);") TYPENAME {
this($imcall, OWNERSHIP);$directorconnect this($imcall, OWNERSHIP);$directorconnect
} }
%enddef %enddef