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

scilab: fix li_std_combinations test

Browse source
This commit is contained in:
Simon Marchetto 2014-10-13 11:27:12 +02:00
commit 772023efd9
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Examples/test-suite/li_std_combinations.i
View file

@ -9,15 +9,23 @@
%template(PairIntString) std::pair<int, std::string>; %template(PairIntString) std::pair<int, std::string>;
%template(VectorPairIntString) std::vector< std::pair<int, std::string> >; %template(VectorPairIntString) std::vector< std::pair<int, std::string> >;
%template(PairIntVectorString) std::pair< int, std::vector<std::string> >;
%template(VectorVectorString) std::vector< std::vector<std::string> >; %template(VectorVectorString) std::vector< std::vector<std::string> >;
#if not defined(SWIGSCILAB)
%template(PairIntVectorString) std::pair< int, std::vector<std::string> >;
%template(PairIntPairIntString) std::pair< int, std::pair<int, std::string> >; %template(PairIntPairIntString) std::pair< int, std::pair<int, std::string> >;
#else
%template(PairIntVecStr) std::pair< int, std::vector<std::string> >;
%template(PairIntPairIntStr) std::pair< int, std::pair<int, std::string> >;
#endif
#if defined(SWIGCSHARP) || defined(SWIGD) #if defined(SWIGCSHARP) || defined(SWIGD)
// Checks macro containing a type with a comma // Checks macro containing a type with a comma
SWIG_STD_VECTOR_ENHANCED(std::pair< double, std::string >) SWIG_STD_VECTOR_ENHANCED(std::pair< double, std::string >)
#endif #endif
%template(PairDoubleString) std::pair< double, std::string >; %template(PairDoubleString) std::pair< double, std::string >;
%template(VectorPairDoubleString) std::vector< std::pair<double, std::string> >; %template(VectorPairDoubleString) std::vector< std::pair<double, std::string> >;