com php-src: regenerated zend_vm_execute.h after merg e: Zend/zend_vm_execute.h
| From: | Anatol Belski | Date: | Tue, 17 Dec 2013 08:05:29 +0000 |
| Subject: | com php-src: regenerated zend_vm_execute.h after merg e: Zend/zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74470@lists.php.net to get a copy of this message | ||
Commit: 167fdaa0e7aea1ea9729c5dfe229411b3de12eb2
Author: Anatol Belski <ab@php.net> Tue, 17 Dec 2013 09:05:29 +0100
Parents: 3e901323413b18e46f075027053023d7cdfeb7bf
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=167fdaa0e7aea1ea9729c5dfe229411b3de12eb2
Log:
regenerated zend_vm_execute.h after merge
Changed paths:
M Zend/zend_vm_execute.h
Diff:
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index c5e095a..3ca3adc 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -15625,11 +15625,7 @@ static int ZEND_FASTCALL
ZEND_FETCH_CONSTANT_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE
}
ZVAL_COPY_VALUE(&EX_T(opline->result.var).tmp_var, *value);
zval_copy_ctor(&EX_T(opline->result.var).tmp_var);
-<<<<<<< HEAD
- } else if (Z_STRSIZE_P(opline->op2.zv) == sizeof("class")-1 &&
strcmp(Z_STRVAL_P(opline->op2.zv), "class") == 0) {
-=======
- } else if (Z_STRLEN_P(opline->op2.zv) == sizeof("class")-1 &&
memcmp(Z_STRVAL_P(opline->op2.zv), "class", sizeof("class") - 1) == 0) {
->>>>>>> origin/master
+ } else if (Z_STRSIZE_P(opline->op2.zv) == sizeof("class")-1 &&
memcmp(Z_STRVAL_P(opline->op2.zv), "class", sizeof("class") - 1) == 0) {
/* "class" is assigned as a case-sensitive keyword from zend_do_resolve_class_name */
ZVAL_STRINGL(&EX_T(opline->result.var).tmp_var, ce->name, ce->name_length, 1);
} else {
@@ -25145,11 +25141,7 @@ static int ZEND_FASTCALL
ZEND_FETCH_CONSTANT_SPEC_UNUSED_CONST_HANDLER(ZEND_OPC
}
ZVAL_COPY_VALUE(&EX_T(opline->result.var).tmp_var, *value);
zval_copy_ctor(&EX_T(opline->result.var).tmp_var);
-<<<<<<< HEAD
- } else if (Z_STRSIZE_P(opline->op2.zv) == sizeof("class")-1 &&
strcmp(Z_STRVAL_P(opline->op2.zv), "class") == 0) {
-=======
- } else if (Z_STRLEN_P(opline->op2.zv) == sizeof("class")-1 &&
memcmp(Z_STRVAL_P(opline->op2.zv), "class", sizeof("class") - 1) == 0) {
->>>>>>> origin/master
+ } else if (Z_STRSIZE_P(opline->op2.zv) == sizeof("class")-1 &&
memcmp(Z_STRVAL_P(opline->op2.zv), "class", sizeof("class") - 1) == 0) {
/* "class" is assigned as a case-sensitive keyword from zend_do_resolve_class_name */
ZVAL_STRINGL(&EX_T(opline->result.var).tmp_var, ce->name, ce->name_length, 1);
} else {