Update of /cvsroot/binaryphp/binaryphp/functions/arrays
In directory sc8-pr-cvs1:/tmp/cvs-serv23964/functions/arrays
Modified Files:
array.cpp
Log Message:
the type should be the same on both sides of va_arg
Index: array.cpp
===================================================================
RCS file: /cvsroot/binaryphp/binaryphp/functions/arrays/array.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** array.cpp 31 Aug 2003 01:20:17 -0000 1.4
--- array.cpp 31 Aug 2003 02:16:03 -0000 1.5
***************
*** 9,13 ****
for(int i = 0; i < key; ++i)
{
! php_var *temp = (php_var *) va_arg(ap, void *);
php_var key2;
if(temp == NULL)
--- 9,13 ----
for(int i = 0; i < key; ++i)
{
! php_var *temp = (php_var *) va_arg(ap, php_var *);
php_var key2;
if(temp == NULL)
***************
*** 30,34 ****
else
key2 = *temp;
! php_var val = *((php_var *) va_arg(ap, void *));
arr.keys.push_back(key2);
arr.data.push_back(val);
--- 30,34 ----
else
key2 = *temp;
! php_var val = *((php_var *) va_arg(ap, php_var *));
arr.keys.push_back(key2);
arr.data.push_back(val);
|
