andrei Fri Sep 8 17:19:42 2006 UTC
Modified files:
/ZendEngine2 zend_operators.h
Log:
convert_to_string_with_converter_ex()
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_operators.h?r1=1.112&r2=1.113&diff_format=u
Index: ZendEngine2/zend_operators.h
diff -u ZendEngine2/zend_operators.h:1.112 ZendEngine2/zend_operators.h:1.113
--- ZendEngine2/zend_operators.h:1.112 Tue Aug 8 10:53:06 2006
+++ ZendEngine2/zend_operators.h Fri Sep 8 17:19:42 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_operators.h,v 1.112 2006/08/08 10:53:06 tony2001 Exp $ */
+/* $Id: zend_operators.h,v 1.113 2006/09/08 17:19:42 andrei Exp $ */
#ifndef ZEND_OPERATORS_H
#define ZEND_OPERATORS_H
@@ -375,6 +375,12 @@
#define convert_to_null_ex(ppzv) convert_to_ex_master(ppzv, null, NULL)
#define convert_to_text_ex(ppzv) if (UG(unicode))
{convert_to_unicode_ex(ppzv);} else {convert_to_string_ex(ppzv);}
+#define convert_to_string_with_converter_ex(ppzv, conv) \
+ if (Z_TYPE_PP(ppzv) != IS_STRING) {
\
+ SEPARATE_ZVAL_IF_NOT_REF(ppzv);
\
+ convert_to_string_with_converter(*ppzv, conv); \
+ }
+
#define convert_scalar_to_number_ex(ppzv)
\
if (Z_TYPE_PP(ppzv)!=IS_LONG && Z_TYPE_PP(ppzv)!=IS_DOUBLE) {
\
if (!(*ppzv)->is_ref) {
\
--
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
|
