| Antony Dovgal 2006-08-08, 7:56 am |
| tony2001 Tue Aug 8 10:10:27 2006 UTC
Modified files:
/ZendEngine2 zend_vm_execute.h zend_vm_def.h
Log:
%s -> %v
ce names are in Unicode
http://cvs.php.net/viewvc.cgi/ZendE...1&diff_format=u
Index: ZendEngine2/zend_vm_execute.h
diff -u ZendEngine2/zend_vm_execute.h:1.140 ZendEngine2/zend_vm_execute.h:1.141
--- ZendEngine2/zend_vm_execute.h:1.140 Tue Aug 8 00:36:19 2006
+++ ZendEngine2/zend_vm_execute.h Tue Aug 8 10:10:26 2006
@@ -681,7 +681,7 @@
zend_error_noreturn(E_ERROR, "Can not call constructor");
}
if (Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
- zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name);
+ zend_error(E_COMPILE_ERROR, "Cannot call private %v::__construct()", ce->name);
}
EX(fbc) = ce->constructor;
}
@@ -902,7 +902,7 @@
zend_error_noreturn(E_ERROR, "Can not call constructor");
}
if (Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
- zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name);
+ zend_error(E_COMPILE_ERROR, "Cannot call private %v::__construct()", ce->name);
}
EX(fbc) = ce->constructor;
}
@@ -1038,7 +1038,7 @@
zend_error_noreturn(E_ERROR, "Can not call constructor");
}
if (Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
- zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name);
+ zend_error(E_COMPILE_ERROR, "Cannot call private %v::__construct()", ce->name);
}
EX(fbc) = ce->constructor;
}
@@ -1173,7 +1173,7 @@
zend_error_noreturn(E_ERROR, "Can not call constructor");
}
if (Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
- zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name);
+ zend_error(E_COMPILE_ERROR, "Cannot call private %v::__construct()", ce->name);
}
EX(fbc) = ce->constructor;
}
@@ -1266,7 +1266,7 @@
zend_error_noreturn(E_ERROR, "Can not call constructor");
}
if (Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
- zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name);
+ zend_error(E_COMPILE_ERROR, "Cannot call private %v::__construct()", ce->name);
}
EX(fbc) = ce->constructor;
}
http://cvs.php.net/viewvc.cgi/ZendE...7&diff_format=u
Index: ZendEngine2/zend_vm_def.h
diff -u ZendEngine2/zend_vm_def.h:1.136 ZendEngine2/zend_vm_def.h:1.137
--- ZendEngine2/zend_vm_def.h:1.136 Tue Aug 8 00:36:19 2006
+++ ZendEngine2/zend_vm_def.h Tue Aug 8 10:10:26 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_vm_def.h,v 1.136 2006/08/08 00:36:19 helly Exp $ */
+/* $Id: zend_vm_def.h,v 1.137 2006/08/08 10:10:26 tony2001 Exp $ */
/* If you change this file, please regenerate the zend_vm_execute.h and
* zend_vm_opcodes.h files by running:
@@ -1790,7 +1790,7 @@
zend_error_noreturn(E_ERROR, "Can not call constructor");
}
if (Z_OBJCE_P(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
- zend_error(E_COMPILE_ERROR, "Cannot call private %s::__construct()", ce->name);
+ zend_error(E_COMPILE_ERROR, "Cannot call private %v::__construct()", ce->name);
}
EX(fbc) = ce->constructor;
}
|