Multiple inheritance parameters as pointers testing

This commit is contained in:
William S Fulton 2016-02-06 13:19:26 +00:00
commit eb15ba1638
2 changed files with 13 additions and 12 deletions

View file

@ -80,17 +80,18 @@ public class multiple_inheritance_abstract_runme {
check(mhar.jabase1(d2)!=5, "jabase1() through Derived2 as parameter failed in multiple_inheritance_abstract"); check(mhar.jabase1(d2)!=5, "jabase1() through Derived2 as parameter failed in multiple_inheritance_abstract");
check(mhar.jabase1(d3)!=9, "jabase1() through Derived3 as parameter failed in multiple_inheritance_abstract"); check(mhar.jabase1(d3)!=9, "jabase1() through Derived3 as parameter failed in multiple_inheritance_abstract");
/* //Pointer parameters
//Test ABase1 as a parameter //Test ABase1 as a parameter
check(multiple_inheritance_abstract.InputABase1(d2)!=5, "InputABase1() through Derived2 as a parameter failed in multiple_inheritance_abstract"); check(multiple_inheritance_abstract.InputPtrABase1(d2)!=5, "InputPtrABase1() through Derived2 as a parameter failed in multiple_inheritance_abstract");
check(multiple_inheritance_abstract.InputABase1(d3)!=9, "InputABase1() through Derived3 as a parameter failed in multiple_inheritance_abstract"); check(multiple_inheritance_abstract.InputPtrABase1(d3)!=9, "InputPtrABase1() through Derived3 as a parameter failed in multiple_inheritance_abstract");
//Test CBase1 CBase2 as parameters //Test CBase1 CBase2 as parameters
check(multiple_inheritance_abstract.InputCBase1(d3)!=7, "InputCBase1(), Derived3 as a parameter failed in multiple_inheritance_abstract"); check(multiple_inheritance_abstract.InputPtrCBase1(d1)!=3, "InputPtrCBase1(), Derived1 as a parameter failed in multiple_inheritance_abstract");
check(multiple_inheritance_abstract.InputCBase1(d1)!=3, "InputCBase1(), Derived1 as a parameter failed in multiple_inheritance_abstract"); check(multiple_inheritance_abstract.InputPtrCBase1(d2)!=6, "InputPtrCBase1(), Derived2 as a parameter failed in multiple_inheritance_abstract");
check(multiple_inheritance_abstract.InputCBase1(d2)!=6, "InputCBase1(), Derived2 as a parameter failed in multiple_inheritance_abstract"); check(multiple_inheritance_abstract.InputPtrCBase1(d3)!=7, "InputPtrCBase1(), Derived3 as a parameter failed in multiple_inheritance_abstract");
check(multiple_inheritance_abstract.InputCBase2(d3)!=4, "InputCBase2(), Derived3 as a parameter failed in multiple_inheritance_abstract"); check(multiple_inheritance_abstract.InputPtrCBase2(d3)!=8, "InputPtrCBase2(), Derived3 as a parameter failed in multiple_inheritance_abstract");
check(multiple_inheritance_abstract.InputCBase2(d1)!=8, "InputCBase2(), Derived1 as a parameter failed in multiple_inheritance_abstract"); check(multiple_inheritance_abstract.InputPtrCBase2(d1)!=4, "InputPtrCBase2(), Derived1 as a parameter failed in multiple_inheritance_abstract");
*/ check(multiple_inheritance_abstract.InputPtrCBase1(cb1)!=1, "InputPtrCBase1(), CBase1 as a parameter failed in multiple_inheritance_abstract");
check(multiple_inheritance_abstract.InputPtrCBase2(cb2)!=2, "InputPtrCBase2(), CBase2 as a parameter failed in multiple_inheritance_abstract");
} }
} }

View file

@ -92,13 +92,13 @@ DECLARE_INTERFACE_RENAME(CBase2, CBase2, SWIGTYPE_CBase2)
int InputValueCBase2(CBase2 cb2) { int InputValueCBase2(CBase2 cb2) {
return cb2.cbase2(); return cb2.cbase2();
} }
int InputABase1(ABase1 *pab1) { int InputPtrABase1(ABase1 *pab1) {
return pab1->abase1(); return pab1->abase1();
} }
int InputCBase1(CBase1 *pcb1) { int InputPtrCBase1(CBase1 *pcb1) {
return pcb1->cbase1y(); return pcb1->cbase1y();
} }
int InputCBase2(CBase2 *pcb2) { int InputPtrCBase2(CBase2 *pcb2) {
return pcb2->cbase2(); return pcb2->cbase2();
} }