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

Better Scilab workaround for testcase

Browse source
This commit is contained in:
William S Fulton 2014-06-23 18:33:40 +01:00
commit a40ab6a7d2
1 changed files with 14 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Examples/test-suite/li_attribute_template.i
View file

@ -6,13 +6,6 @@
%include <attribute.i> %include <attribute.i>
%include <std_string.i> %include <std_string.i>
// Swig Scilab uses gettext which defines a _d macro
#if defined(SWIGSCILAB)
%{
#undef _d
%}
#endif
%inline %inline
{ {
class Foo { class Foo {
@ -34,38 +27,38 @@
struct C struct C
{ {
C(int a, int b, int c) : C(int a, int b, int c) :
_a(a), _b(b), _c(c), _d(a), _e(b), a(a), b(b), c(c), d(a), _e(b),
_f(a,b), _g(b,c) _f(a,b), _g(b,c)
{ {
/* /*
_f.first = _a; _f.first = a;
_f.second = _b; _f.second = b;
_g.first = _b; _g.first = b;
_g.second = _c; _g.second = c;
*/ */
} }
int get_value() const int get_value() const
{ {
return _a; return a;
} }
void set_value(int aa) void set_value(int aa)
{ {
_a = aa; a = aa;
} }
/* only one ref method */ /* only one ref method */
int& get_ref() int& get_ref()
{ {
return _b; return b;
} }
Foo get_class_value() const { return _d; } Foo get_class_value() const { return d; }
void set_class_value( Foo foo) { _d = foo; } void set_class_value( Foo foo) { d = foo; }
const Foo& get_class_ref() const { return _e; } const Foo& get_class_ref() const { return _e; }
void set_class_ref( const Foo& foo ) { _e = foo; } void set_class_ref( const Foo& foo ) { _e = foo; }
@ -80,10 +73,10 @@
void set_string(std::string other) { str = other; } void set_string(std::string other) { str = other; }
private: private:
int _a; int a;
int _b; int b;
int _c; int c;
Foo _d; Foo d;
Foo _e; Foo _e;
pair<T1,T2> _f; pair<T1,T2> _f;
pair<T1,T2> _g; pair<T1,T2> _g;