diff --git a/Examples/test-suite/java/template_typedef_typedef_runme.java b/Examples/test-suite/java/template_typedef_typedef_runme.java index f5f368561..5a3af0099 100644 --- a/Examples/test-suite/java/template_typedef_typedef_runme.java +++ b/Examples/test-suite/java/template_typedef_typedef_runme.java @@ -12,13 +12,13 @@ public class template_typedef_typedef_runme { } public static void main(String argv[]) { - ObjectBase ob1 = new ObjectBase(); - ob1.getBlabla1(new ObjectBase()); + Object1Base ob1 = new Object1Base(); + ob1.getBlabla1(new Object1Base()); Object2Base ob2 = new Object2Base(); ob2.getBlabla2(new Object2Base()); Factory factory = new Factory(); - factory.getBlabla3(new ObjectBase()); + factory.getBlabla3(new Object1Base()); factory.getBlabla4(new Object2Base()); } } diff --git a/Examples/test-suite/template_typedef_typedef.i b/Examples/test-suite/template_typedef_typedef.i index 30077c484..ac96b2db8 100644 --- a/Examples/test-suite/template_typedef_typedef.i +++ b/Examples/test-suite/template_typedef_typedef.i @@ -1,7 +1,7 @@ %module template_typedef_typedef // Github issue #50 -// The Object2::getBlabla2 and Object::getBlabla1 functions were not resolving to the correct template types +// The Object2::getBlabla2 and Object1::getBlabla1 functions were not resolving to the correct template types %inline%{ @@ -20,7 +20,7 @@ namespace TT{ }; }; template - class Object:public T { + class Object1:public T { public: void getBlabla1(typename T::ABCD::CC1 c) { }; @@ -29,7 +29,7 @@ namespace TT{ class Factory { public: - typedef TT::Object CC1; + typedef TT::Object1 CC1; typedef TT::Object2 CC2; void getBlabla4(CC2 c) { }; @@ -38,6 +38,6 @@ class Factory { }; %} -%template(ObjectBase) TT::Object; +%template(Object1Base) TT::Object1; %template(Object2Base) TT::Object2;