diff --git a/Examples/test-suite/cpp11_lambda_functions.i b/Examples/test-suite/cpp11_lambda_functions.i index 3d7d76d60..0096eef11 100644 --- a/Examples/test-suite/cpp11_lambda_functions.i +++ b/Examples/test-suite/cpp11_lambda_functions.i @@ -56,7 +56,7 @@ auto lambda4 = [](int x, int y) { return x+y; }; auto lambda5 = []() { return thing; }; #endif -void fn() { +void fn1() { int stuff = 0; auto lambdaxxxx = [=,&stuff]() { return thing; }; } diff --git a/Examples/test-suite/java/rname_runme.java b/Examples/test-suite/java/rname_runme.java index dac0a1ecf..4af6581c2 100644 --- a/Examples/test-suite/java/rname_runme.java +++ b/Examples/test-suite/java/rname_runme.java @@ -25,7 +25,7 @@ public class rname_runme { bar.foo_u((long)10); RenamedBase base = new RenamedBase(); - base.fn(base, base, base); + base.fn1(base, base, base); if (!base.newname(10.0).equals("Base")) throw new RuntimeException("base.newname"); diff --git a/Examples/test-suite/rname.i b/Examples/test-suite/rname.i index 09d6e3e3b..b7cf5d22b 100644 --- a/Examples/test-suite/rname.i +++ b/Examples/test-suite/rname.i @@ -22,7 +22,7 @@ %rename (newname) Space::Base::oldname(double d) const; /* Rename derived class method only */ -%rename (Xfunc) Space::Derived::fn(Base baseValue, Base* basePtr, Base& baseRef); +%rename (Xfunc) Space::Derived::fn1(Base baseValue, Base* basePtr, Base& baseRef); %inline %{ class Bar { @@ -43,14 +43,14 @@ class Base { public: Base(){}; virtual ~Base(){}; - void fn(Base baseValue, Base* basePtr, Base& baseRef){} + void fn1(Base baseValue, Base* basePtr, Base& baseRef){} virtual const char * oldname(double d) const { return "Base"; } }; class Derived : public Base { public: Derived(){} ~Derived(){} - void fn(Base baseValue, Base* basePtr, Base& baseRef){} + void fn1(Base baseValue, Base* basePtr, Base& baseRef){} virtual const char * oldname(double d) const { return "Derived"; } }; }