diff --git a/SWIG/Examples/test-suite/abstract_virtual.i b/SWIG/Examples/test-suite/abstract_virtual.i index 177a24310..9b12ee052 100644 --- a/SWIG/Examples/test-suite/abstract_virtual.i +++ b/SWIG/Examples/test-suite/abstract_virtual.i @@ -1,7 +1,7 @@ %module(ruby_minherit="1") abstract_virtual -%warnfilter(813,833) D; /* C#, Java multiple inheritance */ -%warnfilter(813,833) E; /* C#, Java multiple inheritance */ +%warnfilter(813,833,870) D; /* C#, Java, Php4 multiple inheritance */ +%warnfilter(813,833,870) E; /* C#, Java, Php4 multiple inheritance */ %inline %{ struct A diff --git a/SWIG/Examples/test-suite/contract.i b/SWIG/Examples/test-suite/contract.i index 76dfe1d42..4e43aa916 100644 --- a/SWIG/Examples/test-suite/contract.i +++ b/SWIG/Examples/test-suite/contract.i @@ -1,6 +1,6 @@ %module contract -%warnfilter(802,813,833) C; /* C#, Java multiple inheritance */ +%warnfilter(802,813,833,870) C; /* Ruby, C#, Java, Php4 multiple inheritance */ #ifdef SWIGCSHARP %ignore B::bar; // otherwise get a warning: `C.bar' no suitable methods found to override diff --git a/SWIG/Examples/test-suite/default_constructor.i b/SWIG/Examples/test-suite/default_constructor.i index c8b141188..8930ba1fb 100644 --- a/SWIG/Examples/test-suite/default_constructor.i +++ b/SWIG/Examples/test-suite/default_constructor.i @@ -3,8 +3,8 @@ %module(ruby_minherit="1") default_constructor -%warnfilter(813,833) EB; /* C#, Java multiple inheritance */ -%warnfilter(813,833) AD; /* C#, Java multiple inheritance */ +%warnfilter(813,833,870) EB; /* C#, Java, Php4 multiple inheritance */ +%warnfilter(813,833,870) AD; /* C#, Java, Php4 multiple inheritance */ %warnfilter(510) F; /* friend function */ %inline %{ diff --git a/SWIG/Examples/test-suite/evil_diamond.i b/SWIG/Examples/test-suite/evil_diamond.i index ad38c9556..f99aa9e7e 100644 --- a/SWIG/Examples/test-suite/evil_diamond.i +++ b/SWIG/Examples/test-suite/evil_diamond.i @@ -3,7 +3,8 @@ %warnfilter(801) foo; // Ruby, wrong class name %warnfilter(801) bar; // Ruby, wrong class name %warnfilter(801) baz; // Ruby, wrong class name -%warnfilter(801,813,833) spam; // Ruby, wrong class name; C# & Java, multiple inheritance +%warnfilter(801) spam; // Ruby, wrong class name +%warnfilter(813,833,870) spam; // C# & Java, Php4 multiple inheritance %inline %{ diff --git a/SWIG/Examples/test-suite/evil_diamond_ns.i b/SWIG/Examples/test-suite/evil_diamond_ns.i index 6fb920f27..6e24008e4 100644 --- a/SWIG/Examples/test-suite/evil_diamond_ns.i +++ b/SWIG/Examples/test-suite/evil_diamond_ns.i @@ -3,7 +3,8 @@ %warnfilter(801) Blah::foo; // Ruby, wrong class name %warnfilter(801) Blah::bar; // Ruby, wrong class name %warnfilter(801) Blah::baz; // Ruby, wrong class name -%warnfilter(801,813,833) Blah::spam; // Ruby, wrong class name; C# & Java, multiple inheritance +%warnfilter(801) Blah::spam; // Ruby, wrong class name +%warnfilter(813,833,870) Blah::spam; // C# & Java, Php4 multiple inheritance %inline %{ namespace Blah { diff --git a/SWIG/Examples/test-suite/evil_diamond_prop.i b/SWIG/Examples/test-suite/evil_diamond_prop.i index ebb1abea5..5f0f96f90 100644 --- a/SWIG/Examples/test-suite/evil_diamond_prop.i +++ b/SWIG/Examples/test-suite/evil_diamond_prop.i @@ -3,7 +3,8 @@ %warnfilter(801) foo; // Ruby, wrong class name %warnfilter(801) bar; // Ruby, wrong class name %warnfilter(801) baz; // Ruby, wrong class name -%warnfilter(801,813,833) spam; // Ruby, wrong class name; C# & Java, multiple inheritance +%warnfilter(801) spam; // Ruby, wrong class name +%warnfilter(813,833,870) spam; // C# & Java, Php4 multiple inheritance %inline %{ diff --git a/SWIG/Examples/test-suite/pure_virtual.i b/SWIG/Examples/test-suite/pure_virtual.i index c9d0520dc..11562370e 100644 --- a/SWIG/Examples/test-suite/pure_virtual.i +++ b/SWIG/Examples/test-suite/pure_virtual.i @@ -7,7 +7,7 @@ %module(ruby_minherit="1") pure_virtual -%warnfilter(813,833) E; /* C#, Java multiple inheritance */ +%warnfilter(813,833,870) E; /* C#, Java, Php4 multiple inheritance */ %nodefault C; %nodefault E; diff --git a/SWIG/Examples/test-suite/template_inherit_abstract.i b/SWIG/Examples/test-suite/template_inherit_abstract.i index bafc81068..4382e6437 100644 --- a/SWIG/Examples/test-suite/template_inherit_abstract.i +++ b/SWIG/Examples/test-suite/template_inherit_abstract.i @@ -1,7 +1,7 @@ %module(ruby_minherit="1") template_inherit_abstract %warnfilter(801) oss::test; /* Ruby, wrong class name */ -%warnfilter(813,833) oss::Module; /* C# & Java, multiple inheritance */ +%warnfilter(813,833,870) oss::Module; /* C#, Java, Php4 multiple inheritance */ %inline %{ diff --git a/SWIG/Examples/test-suite/using_composition.i b/SWIG/Examples/test-suite/using_composition.i index 9056826bc..f48ffcce8 100644 --- a/SWIG/Examples/test-suite/using_composition.i +++ b/SWIG/Examples/test-suite/using_composition.i @@ -1,6 +1,6 @@ %module(ruby_minherit="1") using_composition -%warnfilter(813,833) FooBar; // C#, Java multiple inheritance +%warnfilter(813,833,870) FooBar; // C#, Java, Php4 multiple inheritance %inline %{ class Foo { diff --git a/SWIG/Examples/test-suite/using_extend.i b/SWIG/Examples/test-suite/using_extend.i index 388bca851..ebb211254 100644 --- a/SWIG/Examples/test-suite/using_extend.i +++ b/SWIG/Examples/test-suite/using_extend.i @@ -1,6 +1,6 @@ %module(ruby_minherit="1") using_extend -%warnfilter(813,833) FooBar; // C#, Java multiple inheritance +%warnfilter(813,833,870) FooBar; // C#, Java, Php4 multiple inheritance %extend Foo { int blah(int x, int y) { diff --git a/SWIG/Examples/test-suite/using_namespace.i b/SWIG/Examples/test-suite/using_namespace.i index da0c4d692..abeb555f4 100644 --- a/SWIG/Examples/test-suite/using_namespace.i +++ b/SWIG/Examples/test-suite/using_namespace.i @@ -3,7 +3,7 @@ %warnfilter(801) hi::hi0; /* Ruby, wrong class name */ %warnfilter(801) hi::hi1; /* Ruby, wrong class name */ -%warnfilter(813,833) Hi; // C#, Java multiple inheritance +%warnfilter(813,833,870) Hi; // C#, Java, Php4 multiple inheritance %inline %{ namespace hello