From: <vm...@us...> - 2009-07-06 21:42:25
|
Revision: 11374 http://swig.svn.sourceforge.net/swig/?rev=11374&view=rev Author: vmiklos Date: 2009-07-06 21:42:17 +0000 (Mon, 06 Jul 2009) Log Message: ----------- PHP: fixes for the bugs triggered by the director_enum testcase Modified Paths: -------------- branches/gsoc2009-vmiklos/Lib/php/utils.i branches/gsoc2009-vmiklos/Source/Modules/php.cxx Modified: branches/gsoc2009-vmiklos/Lib/php/utils.i =================================================================== --- branches/gsoc2009-vmiklos/Lib/php/utils.i 2009-07-06 17:53:59 UTC (rev 11373) +++ branches/gsoc2009-vmiklos/Lib/php/utils.i 2009-07-06 21:42:17 UTC (rev 11374) @@ -39,7 +39,7 @@ %} %typemap(directorout) TYPE, const TYPE & %{ - CONVERT_IN($result,TYPE,$input); + CONVERT_IN($result,$1_ltype,$input); %} %enddef Modified: branches/gsoc2009-vmiklos/Source/Modules/php.cxx =================================================================== --- branches/gsoc2009-vmiklos/Source/Modules/php.cxx 2009-07-06 17:53:59 UTC (rev 11373) +++ branches/gsoc2009-vmiklos/Source/Modules/php.cxx 2009-07-06 21:42:17 UTC (rev 11374) @@ -2199,7 +2199,7 @@ director_prot_ctor_code = NewString(""); Printf(director_ctor_code, "if ( arg0->type == IS_NULL ) { /* not subclassed */\n"); Printf(director_prot_ctor_code, "if ( arg0->type == IS_NULL ) { /* not subclassed */\n"); - Printf(director_ctor_code, " result = (%s *)new %s(%s);\n", ctype, sname, args); + Printf(director_ctor_code, " result = (%s *)new %s(%s);\n", ctype, name, args); Printf(director_prot_ctor_code, " SWIG_PHP_Error(E_ERROR, \"accessing abstract class or protected constructor\");\n", name, name, args); if (i) { Insert(args, 0, ", "); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |