XS-MLVP
/
swig
mirror of https://github.com/swig/swig
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Run typemap_template_typedef testcase 

Should have been added in aa2932f409
This commit is contained in:
William S Fulton 2017-10-04 08:16:10 +01:00
parent 7c1b60f340
commit 1a0ce21547
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Examples/test-suite/common.mk
View File

@ -507,6 +507,7 @@ CPP_TEST_CASES += \
typemap_numinputs \ typemap_numinputs \
typemap_template \ typemap_template \
typemap_template_parm_typedef \ typemap_template_parm_typedef \
typemap_template_typedef \
typemap_out_optimal \ typemap_out_optimal \
typemap_qualifier_strip \ typemap_qualifier_strip \
typemap_variables \ typemap_variables \

18
Examples/test-suite/typemap_template_typedef.i
View File

@ -9,14 +9,14 @@
%apply int TMAP77 { XXX<int>::Long cc } %apply int TMAP77 { XXX<int>::Long cc }
%inline %{ %inline %{
typedef int Integer; typedef int MyInteger;
template<typename T> struct XXX { template<typename T> struct XXX {
#ifdef SWIG #ifdef SWIG
// In swig-3.0.12 'Long aa' was actually stored as 'long aa' in typemap table instead of 'XXX<int>::Long aa' // In swig-3.0.12 'Long aa' was actually stored as 'long aa' in typemap table instead of 'XXX<int>::Long aa'
%apply int TMAP55 { Long aa } %apply int TMAP55 { Long aa }
%apply int TMAP66 { XXX<int>::Long bb } %apply int TMAP66 { XXX<int>::Long bb }
%apply int TMAP88 { XXX<Integer>::Long dd } %apply int TMAP88 { XXX<MyInteger>::Long dd }
#endif #endif
typedef long Long; typedef long Long;
long aa1(long aa) { return aa; } long aa1(long aa) { return aa; }
@ -30,7 +30,7 @@ template<typename T> struct XXX {
#ifdef SWIG #ifdef SWIG
%clear Long aa; %clear Long aa;
%clear XXX<int>::Long bb; %clear XXX<int>::Long bb;
%clear XXX<Integer>::Long dd; %clear XXX<MyInteger>::Long dd;
#endif #endif
long aa3(Long aa) { return aa; } long aa3(Long aa) { return aa; }
long bb3(Long bb) { return bb; } long bb3(Long bb) { return bb; }
@ -39,7 +39,7 @@ template<typename T> struct XXX {
}; };
%} %}
%template(XXXInt) XXX<Integer>; %template(XXXInt) XXX<MyInteger>;
%clear XXX<int>::Long cc; %clear XXX<int>::Long cc;
@ -50,17 +50,17 @@ template<typename T> struct XXX {
long bb2(long bb) { return bb; } long bb2(long bb) { return bb; }
long cc1(XXX<int>::Long cc) { return cc; } long cc1(XXX<int>::Long cc) { return cc; }
long cc2(long cc) { return cc; } long cc2(long cc) { return cc; }
long dd1(XXX<Integer>::Long dd) { return dd; } long dd1(XXX<MyInteger>::Long dd) { return dd; }
long dd2(long dd) { return dd; } long dd2(long dd) { return dd; }
%} %}
%inline %{ %inline %{
typedef Integer INTEGER; typedef MyInteger MY_INTEGER;
template<typename T1, typename T2 = INTEGER> struct YYY { template<typename T1, typename T2 = MY_INTEGER> struct YYY {
void meff(T1 t1, T2 t2) {} void meff(T1 t1, T2 t2) {}
}; };
%} %}
%template(YYYIntInt) YYY<INTEGER>; %template(YYYIntInt) YYY<MY_INTEGER>;
%inline %{ %inline %{
void whyohwhy(YYY<INTEGER> yy) {} void whyohwhy(YYY<MY_INTEGER> yy) {}
%} %}