diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2016-03-03 19:45:00 +0000 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2016-03-03 19:45:00 +0000 |
| commit | 5d58de60d6f9471441318364c0ef7ee397f31a01 (patch) | |
| tree | b6e2dde0ac652dfc464d9869273dfd4756d2459d /Examples/test-suite/multiple_inheritance_nspace.i | |
| parent | 5cf20086a4ca8eb15252f7c6c98abede0cd6d4ef (diff) | |
| download | swig-5d58de60d6f9471441318364c0ef7ee397f31a01.tar.gz | |
interface feature test changes for the tests to pass for all languages
Diffstat (limited to 'Examples/test-suite/multiple_inheritance_nspace.i')
| -rw-r--r-- | Examples/test-suite/multiple_inheritance_nspace.i | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/Examples/test-suite/multiple_inheritance_nspace.i b/Examples/test-suite/multiple_inheritance_nspace.i index 0436e071f..4faef5749 100644 --- a/Examples/test-suite/multiple_inheritance_nspace.i +++ b/Examples/test-suite/multiple_inheritance_nspace.i @@ -1,10 +1,14 @@ // This is a copy of the multiple_inheritance_abstract test %module multiple_inheritance_nspace +%warnfilter(SWIGWARN_RUBY_MULTIPLE_INHERITANCE, + SWIGWARN_D_MULTIPLE_INHERITANCE, + SWIGWARN_PHP_MULTIPLE_INHERITANCE); /* languages not supporting multiple inheritance or %interface */ + // nspace feature only supported by these languages #if defined(SWIGJAVA) || defined(SWIGCSHARP) || defined(SWIGD) || defined(SWIGLUA) || defined(SWIGJAVASCRIPT) - %nspace; +#endif #if defined(SWIGJAVA) || defined(SWIGCSHARP) %include "swiginterface.i" @@ -13,6 +17,12 @@ %interface(Space::CBase2) #endif +#if defined(SWIGD) +// Missing multiple inheritance support results in incorrect use of override +%ignore CBase1; +%ignore CBase2; +#endif + #if defined(SWIGJAVA) SWIG_JAVABODY_PROXY(public, public, SWIGTYPE) #endif @@ -57,7 +67,7 @@ namespace Space { virtual int cbase2() { return 4; } - virtual CBase2 *clone() { + virtual CBase2 *cloneit() { return new Derived1(*this); } void derived1() { @@ -74,7 +84,7 @@ namespace Space { virtual int abase1() { return 5; } - virtual CBase1 *clone() { + virtual CBase1 *cloneit() { return new Derived2(*this); } void derived2() { @@ -93,7 +103,7 @@ namespace Space { } virtual void cbase1x() { } - virtual ABase1 *clone() { + virtual ABase1 *cloneit() { return new Derived3(*this); } void derived3() { @@ -326,4 +336,3 @@ namespace Space { %} -#endif |