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

Merge branch 'master' into gsoc2017-php7-classes-via-c-api

Browse source
This commit is contained in:
Olly Betts 2021-03-31 04:53:40 +13:00
commit 904f5a65d8
10 changed files with 100 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Examples/test-suite/cpp11_lambda_functions.i
View file

@ -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; };
}

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

@ -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");

1
Examples/test-suite/php/director_overload_runme.php
View file

@ -1,4 +1,3 @@
<?php
require "tests.php";

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

@ -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"; }
};
}