diff options
| author | David Nadlinger <code@klickverbot.at> | 2011-01-29 21:32:36 +0000 |
|---|---|---|
| committer | David Nadlinger <code@klickverbot.at> | 2011-01-29 21:32:36 +0000 |
| commit | 828fac25cb9ff62e0742490ec89c82565ce32f55 (patch) | |
| tree | 96c15edc264a24ff5b407ec6b9ebbbc1d020148c /Lib/d/typemaps.i | |
| parent | de53ede68136bcb49c96525d0ef7e34bfef5c500 (diff) | |
| download | swig-828fac25cb9ff62e0742490ec89c82565ce32f55.tar.gz | |
[D] Don't break function return types in typemaps.i.
This fixes the new "li_typemaps_apply" testcase as done for C# in r12400.
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12409 626c5289-ae23-0410-ae9c-e8d60b6d4f22
Diffstat (limited to 'Lib/d/typemaps.i')
| -rw-r--r-- | Lib/d/typemaps.i | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Lib/d/typemaps.i b/Lib/d/typemaps.i index 6206c6027..21cd848af 100644 --- a/Lib/d/typemaps.i +++ b/Lib/d/typemaps.i @@ -54,9 +54,9 @@ In D you could then use it like this: */ %define INPUT_TYPEMAP(TYPE, CTYPE, DTYPE) -%typemap(ctype) TYPE *INPUT, TYPE &INPUT "CTYPE" -%typemap(imtype) TYPE *INPUT, TYPE &INPUT "DTYPE" -%typemap(dtype) TYPE *INPUT, TYPE &INPUT "DTYPE" +%typemap(ctype, out="void *") TYPE *INPUT, TYPE &INPUT "CTYPE" +%typemap(imtype, out="void*") TYPE *INPUT, TYPE &INPUT "DTYPE" +%typemap(dtype, out="DTYPE*") TYPE *INPUT, TYPE &INPUT "DTYPE" %typemap(din) TYPE *INPUT, TYPE &INPUT "$dinput" %typemap(ddirectorin) TYPE *INPUT, TYPE &INPUT "$winput" %typemap(ddirectorout) TYPE *INPUT, TYPE &INPUT "$dcall" @@ -149,9 +149,9 @@ value returned in the second output parameter. In D you would use it like this: */ %define OUTPUT_TYPEMAP(TYPE, CTYPE, DTYPE, TYPECHECKPRECEDENCE) -%typemap(ctype) TYPE *OUTPUT, TYPE &OUTPUT "CTYPE *" -%typemap(imtype) TYPE *OUTPUT, TYPE &OUTPUT "out DTYPE" -%typemap(dtype) TYPE *OUTPUT, TYPE &OUTPUT "out DTYPE" +%typemap(ctype, out="void *") TYPE *OUTPUT, TYPE &OUTPUT "CTYPE *" +%typemap(imtype, out="void*") TYPE *OUTPUT, TYPE &OUTPUT "out DTYPE" +%typemap(dtype, out="DTYPE*") TYPE *OUTPUT, TYPE &OUTPUT "out DTYPE" %typemap(din) TYPE *OUTPUT, TYPE &OUTPUT "$dinput" %typemap(ddirectorin) TYPE *OUTPUT, TYPE &OUTPUT "$winput" %typemap(ddirectorout) TYPE *OUTPUT, TYPE &OUTPUT "$dcall" @@ -254,9 +254,9 @@ of the function return value. */ %define INOUT_TYPEMAP(TYPE, CTYPE, DTYPE, TYPECHECKPRECEDENCE) -%typemap(ctype) TYPE *INOUT, TYPE &INOUT "CTYPE *" -%typemap(imtype) TYPE *INOUT, TYPE &INOUT "ref DTYPE" -%typemap(dtype) TYPE *INOUT, TYPE &INOUT "ref DTYPE" +%typemap(ctype, out="void *") TYPE *INOUT, TYPE &INOUT "CTYPE *" +%typemap(imtype, out="void*") TYPE *INOUT, TYPE &INOUT "ref DTYPE" +%typemap(dtype, out="DTYPE*") TYPE *INOUT, TYPE &INOUT "ref DTYPE" %typemap(din) TYPE *INOUT, TYPE &INOUT "$dinput" %typemap(ddirectorin) TYPE *INOUT, TYPE &INOUT "$winput" %typemap(ddirectorout) TYPE *INOUT, TYPE &INOUT "$dcall" |