summaryrefslogtreecommitdiff
path: root/Lib/csharp/csharp.swg
diff options
context:
space:
mode:
authorWilliam S Fulton <wsf@fultondesigns.co.uk>2007-07-18 21:07:48 +0000
committerWilliam S Fulton <wsf@fultondesigns.co.uk>2007-07-18 21:07:48 +0000
commita4eb259f31b92af02e92314b539964e45acb7863 (patch)
tree091e229562d776e401a234b26cf4e0fc37c71586 /Lib/csharp/csharp.swg
parentedd82d41f24469424818f949511bcbf4bfc2ae78 (diff)
downloadswig-a4eb259f31b92af02e92314b539964e45acb7863.tar.gz
member pointer fixes
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@9868 626c5289-ae23-0410-ae9c-e8d60b6d4f22
Diffstat (limited to 'Lib/csharp/csharp.swg')
-rw-r--r--Lib/csharp/csharp.swg8
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/csharp/csharp.swg b/Lib/csharp/csharp.swg
index a3d3fe4db..8b47b637e 100644
--- a/Lib/csharp/csharp.swg
+++ b/Lib/csharp/csharp.swg
@@ -340,15 +340,15 @@
%typemap(csdirectorout) SWIGTYPE "$&csclassname.getCPtr($cscall).Handle"
/* Generic pointers and references */
-%typemap(in) SWIGTYPE * %{ $1 = ($1_ltype)$input; %}
-%typemap(in) SWIGTYPE (CLASS::*) %{ $1 = *($&1_ltype)&$input; %}
+%typemap(in) SWIGTYPE *, SWIGTYPE (CLASS::*) %{ $1 = ($1_ltype)$input; %}
%typemap(in, canthrow=1) SWIGTYPE & %{ $1 = ($1_ltype)$input;
if(!$1) {
SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "$1_type type is null", 0);
return $null;
} %}
-%typemap(out) SWIGTYPE *, SWIGTYPE & %{ $result = (void *)$1; %}
-%typemap(out) SWIGTYPE (CLASS::*) %{ $result = (void *)&$1; %}
+%typemap(out) SWIGTYPE *, SWIGTYPE (CLASS::*) %{ $result = (void *)$1; %}
+%typemap(out) SWIGTYPE & %{ $result = (void *)$1; %}
+
%typemap(directorout, warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) SWIGTYPE *, SWIGTYPE (CLASS::*)
%{ $result = ($1_ltype)$input; %}
%typemap(directorin) SWIGTYPE *, SWIGTYPE (CLASS::*)