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

scilab: simplify and fix li_std_sequence_container_typemaps test

Browse source
This commit is contained in:
Simon Marchetto 2014-03-10 15:22:19 +01:00
commit 7da356c8cc
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Examples/test-suite/li_std_sequence_container_typemaps.i
View file

@ -37,8 +37,9 @@ namespace std {
} }
template<> ClassAPtr binaryOperation(ClassAPtr x, ClassAPtr y) { template<> ClassAPtr binaryOperation(ClassAPtr x, ClassAPtr y) {
x->a += y->a; if (x)
return x; y->a += x->a;
return y;
} }
template<typename SeqCont> template<typename SeqCont>
@ -53,12 +54,12 @@ namespace std {
} }
static value_type val_container(const SeqCont container) { static value_type val_container(const SeqCont container) {
return std::accumulate(container.begin(), container.end(), container.front(), return std::accumulate(container.begin(), container.end(), value_type(),
binaryOperation<value_type>); binaryOperation<value_type>);
} }
static value_type ref_container(const SeqCont& container) { static value_type ref_container(const SeqCont& container) {
return std::accumulate(container.begin(), container.end(), container.front(), return std::accumulate(container.begin(), container.end(), value_type(),
binaryOperation<value_type>); binaryOperation<value_type>);
} }
}; };
@ -115,12 +116,10 @@ instantiate_containers_templates(int);
instantiate_containers_templates(double); instantiate_containers_templates(double);
instantiate_containers_templates(bool); instantiate_containers_templates(bool);
instantiate_containers_templates(string); instantiate_containers_templates(string);
instantiate_containers_templates(Color);
instantiate_containers_templates(ClassAPtr); instantiate_containers_templates(ClassAPtr);
instantiate_containers_functions(int); instantiate_containers_functions(int);
instantiate_containers_functions(double); instantiate_containers_functions(double);
instantiate_containers_functions(bool); instantiate_containers_functions(bool);
instantiate_containers_functions(string); instantiate_containers_functions(string);
instantiate_containers_functions(Color);
instantiate_containers_functions(ClassAPtr); instantiate_containers_functions(ClassAPtr);