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

Merge remote-tracking branch 'origin/master' into gsoc2012-scilab

Browse source 
Conflicts:
	.gitignore
	.travis.yml
	configure.ac
This commit is contained in:
Simon Marchetto 2015-01-26 10:50:20 +01:00
commit adc4b788df
352 changed files with 8897 additions and 2812 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Examples/test-suite/nested_class.i
View file

@ -77,6 +77,9 @@ struct Outer {
struct {
Integer b;
};
#else
Integer a;
Integer b;
#endif
union {
@ -192,6 +195,9 @@ struct Outer {
public:
Integer yy;
};
#else
Integer xx;
Integer yy;
#endif
///////////////////////////////////////////