fix arrays_global and add more vector tests
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@6146 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
e0ad008aac
commit
5fe3427682
3 changed files with 10 additions and 2 deletions
|
|
@ -8,11 +8,9 @@ BeginString_FIX44a
|
||||||
cvar.BeginString_FIX44b
|
cvar.BeginString_FIX44b
|
||||||
BeginString_FIX44c
|
BeginString_FIX44c
|
||||||
cvar.BeginString_FIX44d
|
cvar.BeginString_FIX44d
|
||||||
cvar.BeginString_FIX44d ="12"'\0'"45"
|
|
||||||
cvar.BeginString_FIX44d
|
cvar.BeginString_FIX44d
|
||||||
cvar.BeginString_FIX44b ="12"'\0'"45"
|
cvar.BeginString_FIX44b ="12"'\0'"45"
|
||||||
cvar.BeginString_FIX44b
|
cvar.BeginString_FIX44b
|
||||||
cvar.BeginString_FIX44d = BeginString_FIX44a
|
|
||||||
cvar.BeginString_FIX44d
|
cvar.BeginString_FIX44d
|
||||||
cvar.BeginString_FIX44e
|
cvar.BeginString_FIX44e
|
||||||
BeginString_FIX44f
|
BeginString_FIX44f
|
||||||
|
|
|
||||||
|
|
@ -73,6 +73,12 @@ struct B : public A {
|
||||||
|
|
||||||
int f(const int i) const { return i + val; }
|
int f(const int i) const { return i + val; }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
int vecAptr(const std::vector<A*>& v) {
|
||||||
|
return v[0]->f(1);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<short> halfs(const std::vector<short>& v) {
|
std::vector<short> halfs(const std::vector<short>& v) {
|
||||||
|
|
|
||||||
|
|
@ -27,9 +27,13 @@ if bv[0] != bv[2]:
|
||||||
|
|
||||||
b = B(5)
|
b = B(5)
|
||||||
va = VecA([b,None,b,b])
|
va = VecA([b,None,b,b])
|
||||||
|
|
||||||
if va[0].f(1) != 6:
|
if va[0].f(1) != 6:
|
||||||
raise RuntimeError,"bad std::vector<A*> mapping"
|
raise RuntimeError,"bad std::vector<A*> mapping"
|
||||||
|
|
||||||
|
if vecAptr(va) != 6:
|
||||||
|
raise RuntimeError,"bad std::vector<A*> mapping"
|
||||||
|
|
||||||
b.val = 7
|
b.val = 7
|
||||||
if va[3].f(1) != 8:
|
if va[3].f(1) != 8:
|
||||||
raise RuntimeError,"bad std::vector<A*> mapping"
|
raise RuntimeError,"bad std::vector<A*> mapping"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue