| Marcus Boerger 2005-03-10, 3:55 am |
| helly Wed Mar 9 21:32:01 2005 EDT
Modified files:
/ZendEngine2 zend_vm_execute.h
Log:
- #31562 2nd part
http://cvs.php.net/diff.php/ZendEng...18&r2=1.19&ty=u
Index: ZendEngine2/zend_vm_execute.h
diff -u ZendEngine2/zend_vm_execute.h:1.18 ZendEngine2/zend_vm_execute.h:1.19
--- ZendEngine2/zend_vm_execute.h:1.18 Thu Feb 24 03:52:10 2005
+++ ZendEngine2/zend_vm_execute.h Wed Mar 9 21:32:00 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_vm_execute.h,v 1.18 2005/02/24 08:52:10 dmitry Exp $ */
+/* $Id: zend_vm_execute.h,v 1.19 2005/03/10 02:32:00 helly Exp $ */
#define ZEND_VM_CONTINUE() return 0
@@ -511,7 +511,7 @@
if (IS_CONST == IS_UNUSED) {
- EX_T(opline->result.u.var).class_entry = zend_fetch_class(NULL, 0, opline->extended_value TSRMLS_CC);
+ EX_T(opline->result.u.var).class_entry = zend_fetch_class(NULL, ZEND_FETCH_CLASS_AUTO, opline->extended_value TSRMLS_CC);
ZEND_VM_NEXT_OPCODE();
}
@@ -709,7 +709,7 @@
if (IS_TMP_VAR == IS_UNUSED) {
- EX_T(opline->result.u.var).class_entry = zend_fetch_class(NULL, 0, opline->extended_value TSRMLS_CC);
+ EX_T(opline->result.u.var).class_entry = zend_fetch_class(NULL, ZEND_FETCH_CLASS_AUTO, opline->extended_value TSRMLS_CC);
ZEND_VM_NEXT_OPCODE();
}
@@ -864,7 +864,7 @@
if (IS_VAR == IS_UNUSED) {
- EX_T(opline->result.u.var).class_entry = zend_fetch_class(NULL, 0, opline->extended_value TSRMLS_CC);
+ EX_T(opline->result.u.var).class_entry = zend_fetch_class(NULL, ZEND_FETCH_CLASS_AUTO, opline->extended_value TSRMLS_CC);
ZEND_VM_NEXT_OPCODE();
}
@@ -1019,7 +1019,7 @@
if (IS_UNUSED == IS_UNUSED) {
- EX_T(opline->result.u.var).class_entry = zend_fetch_class(NULL, 0, opline->extended_value TSRMLS_CC);
+ EX_T(opline->result.u.var).class_entry = zend_fetch_class(NULL, ZEND_FETCH_CLASS_AUTO, opline->extended_value TSRMLS_CC);
ZEND_VM_NEXT_OPCODE();
}
@@ -1103,7 +1103,7 @@
if (IS_CV == IS_UNUSED) {
- EX_T(opline->result.u.var).class_entry = zend_fetch_class(NULL, 0, opline->extended_value TSRMLS_CC);
+ EX_T(opline->result.u.var).class_entry = zend_fetch_class(NULL, ZEND_FETCH_CLASS_AUTO, opline->extended_value TSRMLS_CC);
ZEND_VM_NEXT_OPCODE();
}
@@ -29206,7 +29206,7 @@
if (opline->op2.op_type == IS_UNUSED) {
- EX_T(opline->result.u.var).class_entry = zend_fetch_class(NULL, 0, opline->extended_value TSRMLS_CC);
+ EX_T(opline->result.u.var).class_entry = zend_fetch_class(NULL, ZEND_FETCH_CLASS_AUTO, opline->extended_value TSRMLS_CC);
ZEND_VM_NEXT_OPCODE();
}
|