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

Fix std::vector of const pointers

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11704 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2009-10-20 18:22:16 +00:00
commit 132376bade
5 changed files with 67 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Examples/test-suite/li_std_vector_extra.i
View file

@ -125,15 +125,16 @@ std::vector<std::string> vecStr(std::vector<std::string> v) {
%inline %{
int *makeIntPtr(int v) { return new int(v); }
const short *makeConstShortPtr(int v) { return new short(v); }
double *makeDoublePtr(double v) { return new double(v); }
int extractInt(int *p) { return *p; }
short extractConstShort(const short *p) { return *p; }
%}
%template(pyvector) std::vector<swig::SwigPtr_PyObject>;
namespace std {
%template(ConstShortVector) vector<const short *>;
// %template(ConstIntVector) vector<const int *>; // interferes with vector<int *>... see new testcase li_std_vector_ptr
%template(ConstShortPtrVector) vector<const short *>;
}
%inline %{

1
Examples/test-suite/li_std_vector_ptr.i
View file

@ -1,3 +1,4 @@
// Bug 2359417
%module li_std_vector_ptr
%include "std_vector.i"

20
Examples/test-suite/python/li_std_vector_extra_runme.py
View file

@ -154,3 +154,23 @@ if extractInt(vi[0]) != 11:
if extractInt(vi[1]) != 22:
raise RuntimeError
# vector const pointer checks
csp = makeConstShortPtr(111)
error = 0
try:
vcs = ConstShortPtrVector((csp, dp)) # check vector<const unsigned short *> does not accept double * element
error = 1
except:
pass
if error:
raise RuntimeError
vcs = ConstShortPtrVector((csp, makeConstShortPtr(222)))
if extractConstShort(vcs[0]) != 111:
raise RuntimeError
if extractConstShort(vcs[1]) != 222:
raise RuntimeError