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

Also remove SWIGTYPE*& typemaps for C

Browse source 
They seem unnecessary too and look suspicious, notably the use of "static" in
the "out" typemap is almost certainly wrong.

As all the tests still pass without them, don't bother fixing these typemaps
but just remove them completely.
This commit is contained in:
Vadim Zeitlin 2016-09-15 01:46:28 +02:00
commit 93ca7451e6
1 changed files with 0 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Lib/c/c.swg
View file

@ -116,7 +116,6 @@ same_macro_all_primitive_types_but_void(cref_as_value,ctype);
%typemap(ctype) SWIGTYPE "$&resolved_type*" %typemap(ctype) SWIGTYPE "$&resolved_type*"
%typemap(ctype) SWIGTYPE * "$resolved_type*" %typemap(ctype) SWIGTYPE * "$resolved_type*"
%typemap(ctype) SWIGTYPE & "$*resolved_type*" %typemap(ctype) SWIGTYPE & "$*resolved_type*"
%typemap(ctype) SWIGTYPE *& "$resolved_type**"
%typemap(ctype) SWIGTYPE [ANY] "/*SWIGTYPE [ANY]*/ $1_ltype **" %typemap(ctype) SWIGTYPE [ANY] "/*SWIGTYPE [ANY]*/ $1_ltype **"
%typemap(ctype) SWIGTYPE * [ANY] "/*SWIGTYPE *[ANY] */ $1_ltype **" %typemap(ctype) SWIGTYPE * [ANY] "/*SWIGTYPE *[ANY] */ $1_ltype **"
%typemap(ctype) enum SWIGTYPE "int" %typemap(ctype) enum SWIGTYPE "int"
@ -198,14 +197,6 @@ same_action_all_primitive_types(in, "$1 = ($1_ltype) $input;", "$1 = &$input;")
$1 = ($1_ltype) 0; $1 = ($1_ltype) 0;
} }
%typemap(in) SWIGTYPE *& {
if ($input)
$1 = ($1_ltype) $input;
else
$1 = ($1_ltype) 0;
}
// Typemaps for assigning result values to a special return variable // Typemaps for assigning result values to a special return variable
same_action_all_primitive_types(out, "$result = $1;", "$result = *$1;") same_action_all_primitive_types(out, "$result = $1;", "$result = *$1;")
@ -221,11 +212,6 @@ same_action_all_primitive_types(out, "$result = $1;", "$result = *$1;")
*($&1_ltype) &$result = $1; *($&1_ltype) &$result = $1;
} }
%typemap(out) SWIGTYPE *& {
static SwigObj* _ptr = (SwigObj*) $1;
$result = &_ptr;
}
%typemap(out) SWIGTYPE { %typemap(out) SWIGTYPE {
$result = (SwigObj*) &$1; $result = (SwigObj*) &$1;
} }
@ -265,7 +251,6 @@ same_macro_all_primitive_types_but_void(cref_as_ptr,cppouttype);
%typemap(cppouttype) SWIGTYPE * "$1_ltype" %typemap(cppouttype) SWIGTYPE * "$1_ltype"
%typemap(cppouttype) const SWIGTYPE * "const $1_ltype" %typemap(cppouttype) const SWIGTYPE * "const $1_ltype"
%typemap(cppouttype) SWIGTYPE & "$1_ltype" %typemap(cppouttype) SWIGTYPE & "$1_ltype"
%typemap(cppouttype) SWIGTYPE *& "$1_ltype"
%typemap(cppouttype) SWIGTYPE [ANY] "$1_ltype" %typemap(cppouttype) SWIGTYPE [ANY] "$1_ltype"
%typemap(cppouttype) SWIGTYPE * [ANY] "/*SWIGTYPE *[ANY] */ $1_ltype" %typemap(cppouttype) SWIGTYPE * [ANY] "/*SWIGTYPE *[ANY] */ $1_ltype"
%typemap(cppouttype, retobj="1") enum SWIGTYPE "int" %typemap(cppouttype, retobj="1") enum SWIGTYPE "int"