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

[Python] Fix generated code for IBM's C++ compiler on AIX (patch

Browse source 
from Goeran Uddeborg in SF#1928048).


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10387 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Olly Betts 2008-04-24 12:26:29 +00:00
commit 85f02c4ba4
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
CHANGES.current
View file

@ -2,9 +2,13 @@ Version 1.3.36 (in progress)
============================= =============================
04/24/2008: olly 04/24/2008: olly
Rename BSIZE in Examples/test-suite/arrays_scope.i to BBSIZE to avoid [Python] Fix generated code for IBM's C++ compiler on AIX (patch
a clash with BSIZE defined by headers on AIX with Perl (reported in from Goeran Uddeborg in SF#1928048).
SF#1928048).
04/24/2008: olly
Rename BSIZE in Examples/test-suite/arrays_scope.i to BBSIZE to
avoid a clash with BSIZE defined by headers on AIX with Perl
(reported in SF#1928048).
04/20/2008: wsfulton 04/20/2008: wsfulton
Add the ability to wrap all protected members when using directors. Add the ability to wrap all protected members when using directors.

6
Lib/python/pycontainer.swg
View file

@ -301,7 +301,7 @@ namespace swig
char msg[1024]; char msg[1024];
sprintf(msg, "in sequence element %d ", _index); sprintf(msg, "in sequence element %d ", _index);
if (!PyErr_Occurred()) { if (!PyErr_Occurred()) {
%type_error(swig::type_name<T>()); ::%type_error(swig::type_name<T>());
} }
SWIG_Python_AddErrorMsg(msg); SWIG_Python_AddErrorMsg(msg);
SWIG_Python_AddErrorMsg(e.what()); SWIG_Python_AddErrorMsg(e.what());
@ -704,8 +704,8 @@ namespace swig {
static int asptr(PyObject *obj, sequence **seq) { static int asptr(PyObject *obj, sequence **seq) {
if (obj == Py_None || SWIG_Python_GetSwigThis(obj)) { if (obj == Py_None || SWIG_Python_GetSwigThis(obj)) {
sequence *p; sequence *p;
if (SWIG_ConvertPtr(obj,(void**)&p, if (::SWIG_ConvertPtr(obj,(void**)&p,
swig::type_info<sequence>(),0) == SWIG_OK) { swig::type_info<sequence>(),0) == SWIG_OK) {
if (seq) *seq = p; if (seq) *seq = p;
return SWIG_OLDOBJ; return SWIG_OLDOBJ;
} }

2
Lib/python/pystdcommon.swg
View file

@ -111,7 +111,7 @@ namespace swig {
int res = asval(obj, &v); int res = asval(obj, &v);
if (!obj || !SWIG_IsOK(res)) { if (!obj || !SWIG_IsOK(res)) {
if (!PyErr_Occurred()) { if (!PyErr_Occurred()) {
%type_error(swig::type_name<Type>()); ::%type_error(swig::type_name<Type>());
} }
if (throw_error) throw std::invalid_argument("bad type"); if (throw_error) throw std::invalid_argument("bad type");
} }