The great merge

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@4141 626c5289-ae23-0410-ae9c-e8d60b6d4f22

Examples/test-suite/evil_diamond_prop.i

@@ -0,0 +1,36 @@
+%module evil_diamond_prop
+
+%warnfilter(801) foo;		// Ruby, wrong class name
+%warnfilter(801) bar;		// Ruby, wrong class name
+%warnfilter(801) baz;		// Ruby, wrong class name
+%warnfilter(801,802,813) spam;	// Ruby, wrong class name; Ruby & Java, multiple inheritance
+
+%inline %{
+
+class foo { 
+  public:
+    int _foo;
+    foo() : _foo(1) {}
+};
+
+class bar : public foo {
+  public:
+    int _bar;
+    bar() : _bar(2) {}
+};
+
+class baz : public foo {
+  public:
+    int _baz;
+    baz() : _baz(3) {}
+};
+
+class spam : public bar, public baz {
+  public:
+    int _spam;
+    spam() : _spam(4) {}
+};
+
+foo *test(foo *f) { return f; }
+%}
+