jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix rname testcase when run under OpenJDK icedtea on Linux because libjvm.so also contains a class called Base. Also remove need for Go specific handling in this testcase.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12372 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2011-01-05 21:15:10 +00:00
commit cdc8d13ae6
2 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Examples/test-suite/java/rname_runme.java
View file

@ -30,7 +30,7 @@ public class rname_runme {
throw new RuntimeException("base.newname"); throw new RuntimeException("base.newname");
RenamedDerived derived = new RenamedDerived(); RenamedDerived derived = new RenamedDerived();
derived.func(base, base, base); derived.Xfunc(base, base, base);
if (!derived.newname(10.0).equals("Derived")) if (!derived.newname(10.0).equals("Derived"))
throw new RuntimeException("derived.newname"); throw new RuntimeException("derived.newname");
} }

19
Examples/test-suite/rname.i
View file

@ -15,19 +15,14 @@
%rename(foo_u) *::foo(unsigned); %rename(foo_u) *::foo(unsigned);
/* Rename classes in a class hierarchy */ /* Rename classes in a class hierarchy */
%rename (RenamedBase) Base; %rename (RenamedBase) Space::Base;
%rename (RenamedDerived) Derived; %rename (RenamedDerived) Space::Derived;
/* Rename base class method applies to derived classes too */# /* Rename base class method applies to derived classes too */#
%rename (newname) Base::oldname(double d) const; %rename (newname) Space::Base::oldname(double d) const;
/* Rename derived class method only */ /* Rename derived class method only */
#ifndef SWIGGO %rename (Xfunc) Space::Derived::fn(Base baseValue, Base* basePtr, Base& baseRef);
%rename (func) Derived::fn(Base baseValue, Base* basePtr, Base& baseRef);
#else
/* func is a keyword in Go. */
%rename (Xfunc) Derived::fn(Base baseValue, Base* basePtr, Base& baseRef);
#endif
%inline %{ %inline %{
class Bar { class Bar {
@ -43,20 +38,22 @@ char *foo(double) { return (char *) "foo-double"; }
char *foo(short) { return (char *) "foo-short"; } char *foo(short) { return (char *) "foo-short"; }
char *foo(unsigned) { return (char *) "foo-unsigned"; } char *foo(unsigned) { return (char *) "foo-unsigned"; }
namespace Space {
class Base { class Base {
public: public:
Base(){}; Base(){};
virtual ~Base(){}; virtual ~Base(){};
void fn(Base baseValue, Base* basePtr, Base& baseRef){} void fn(Base baseValue, Base* basePtr, Base& baseRef){}
virtual const char * oldname(double d) const { return (char*) "Base"; } virtual const char * oldname(double d) const { return "Base"; }
}; };
class Derived : public Base { class Derived : public Base {
public: public:
Derived(){} Derived(){}
~Derived(){} ~Derived(){}
void fn(Base baseValue, Base* basePtr, Base& baseRef){} void fn(Base baseValue, Base* basePtr, Base& baseRef){}
virtual const char * oldname(double d) const { return (char*) "Derived"; } virtual const char * oldname(double d) const { return "Derived"; }
}; };
}
%} %}