cvs: ZendEngine2 / zend_operators.h

andi Wed Jan 14 03:50:17 2004 EDT Modified files: /ZendEngine2 zend_operators.h Log: - Remove bogus macros Index: ZendEngine2/zend_operators.h diff -u ZendEngine2/zend_operators.h:1.84 ZendEngine2/zend_operators.h:1.85 --- ZendEngine2/zend_operators.h:1.84 Thu Jan 8 12:31:48 2004 +++ ZendEngine2/zend_operators.h Wed Jan 14 03:50:17 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_operators.h,v 1.84 2004/01/08 17:31:48 sniper Exp $ */ +/* $Id: zend_operators.h,v 1.85 2004/01/14 08:50:17 andi Exp $ */ #ifndef ZEND_OPERATORS_H #define ZEND_OPERATORS_H @@ -230,12 +230,6 @@ convert_to_##lower_type(*ppzv); \ } -#define convert_to_writable_ex_master(ppzv, lower_type, upper_type) \ - if ((*ppzv)->type!=IS_##upper_type) { \ - SEPARATE_ZVAL(ppzv); \ - convert_to_##lower_type(*ppzv); \ - } - #define convert_to_boolean_ex(ppzv) convert_to_ex_master(ppzv, boolean, BOOL) #define convert_to_long_ex(ppzv) convert_to_ex_master(ppzv, long, LONG) @@ -245,15 +239,6 @@ #define convert_to_object_ex(ppzv) convert_to_ex_master(ppzv, object, OBJECT) #define convert_to_null_ex(ppzv) convert_to_ex_master(ppzv, null, NULL) -#define convert_to_writable_boolean_ex(ppzv) convert_to_writable_ex_master(ppzv, boolean, BOOL) -#define convert_to_writable_long_ex(ppzv) convert_to_writable_ex_master(ppzv, long, LONG) -#define convert_to_writable_double_ex(ppzv) convert_to_writable_ex_master(ppzv, double, DOUBLE) -#define convert_to_writable_string_ex(ppzv) convert_to_writable_ex_master(ppzv, string, STRING) -#define convert_to_writable_array_ex(ppzv) convert_to_writable_ex_master(ppzv, array, ARRAY) -#define convert_to_writable_object_ex(ppzv) convert_to_writable_ex_master(ppzv, object, OBJECT) -#define convert_to_writable_null_ex(ppzv) convert_to_writable_ex_master(ppzv, null, NULL) - - #define convert_scalar_to_number_ex(ppzv) \ if ((*ppzv)->type!=IS_LONG && (*ppzv)->type!=IS_DOUBLE) { \ if (!(*ppzv)->is_ref) { \