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

Added a fourth argument (flags) to all calls to SWIG_ConvertPtr.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@7415 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Kevin Ruland 2005-09-07 02:06:22 +00:00
commit b4c945a488
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
SWIG/Lib/php4/globalvar.i
View file

@ -190,7 +190,7 @@
$&1_ltype _temp; $&1_ltype _temp;
zend_hash_find(&EG(symbol_table), "$1", strlen("$1")+1, (void**)&z_var); zend_hash_find(&EG(symbol_table), "$1", strlen("$1")+1, (void**)&z_var);
if (SWIG_ConvertPtr(*z_var, (void**)&_temp, $&1_descriptor) < 0) { if (SWIG_ConvertPtr(*z_var, (void**)&_temp, $&1_descriptor, 0) < 0) {
SWIG_PHP_Error(E_ERROR,"Type error in value of $symname. Expected $&1_descriptor"); SWIG_PHP_Error(E_ERROR,"Type error in value of $symname. Expected $&1_descriptor");
} }
@ -204,7 +204,7 @@
$1_ltype _temp; $1_ltype _temp;
zend_hash_find(&EG(symbol_table), "$1", strlen("$1")+1, (void**)&z_var); zend_hash_find(&EG(symbol_table), "$1", strlen("$1")+1, (void**)&z_var);
if (SWIG_ConvertPtr(*z_var, (void **)&_temp, $1_descriptor) < 0) { if (SWIG_ConvertPtr(*z_var, (void **)&_temp, $1_descriptor, 0) < 0) {
SWIG_PHP_Error(E_ERROR,"Type error in value of $symname. Expected $&1_descriptor"); SWIG_PHP_Error(E_ERROR,"Type error in value of $symname. Expected $&1_descriptor");
} }

2
SWIG/Lib/php4/typemaps.i
View file

@ -147,7 +147,7 @@ int_typemap(unsigned char);
{ {
/* If they pass NULL by reference, make it into a void* /* If they pass NULL by reference, make it into a void*
This bit should go in arginit if arginit support init-ing scripting args */ This bit should go in arginit if arginit support init-ing scripting args */
if(SWIG_ConvertPtr(*$input, (void **) &$1, $1_descriptor) < 0) { if(SWIG_ConvertPtr(*$input, (void **) &$1, $1_descriptor, 0) < 0) {
/* So... we didn't get a ref or ptr, but we'll accept NULL by reference */ /* So... we didn't get a ref or ptr, but we'll accept NULL by reference */
if ((*$input)->type==IS_NULL && PZVAL_IS_REF(*$input)) { if ((*$input)->type==IS_NULL && PZVAL_IS_REF(*$input)) {
#ifdef __cplusplus #ifdef __cplusplus