helly Mon Mar 6 10:09:14 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/spl spl_iterators.c
Log:
- There is no %v in 5.1 (found by Tony)
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.24&r2=1.73.2.25&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.73.2.24
php-src/ext/spl/spl_iterators.c:1.73.2.25
--- php-src/ext/spl/spl_iterators.c:1.73.2.24 Mon Mar 6 09:50:44 2006
+++ php-src/ext/spl/spl_iterators.c Mon Mar 6 10:09:13 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.73.2.24 2006/03/06 09:50:44 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.73.2.25 2006/03/06 10:09:13 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -817,7 +817,7 @@
#define SPL_CHECK_CTOR(intern, classname) \
if (intern->dit_type == DIT_Unknown) { \
- zend_throw_exception_ex(spl_ce_BadMethodCallException, 0
TSRMLS_CC, "Classes derived from %v must call %v::__construct()", \
+ zend_throw_exception_ex(spl_ce_BadMethodCallException, 0
TSRMLS_CC, "Classes derived from %v must call %s::__construct()", \
(spl_ce_##classname)->name,
(spl_ce_##classname)->name); \
return; \
}
@@ -836,7 +836,7 @@
intern = (spl_dual_it_object*)zend_object_store_get_object(getThis()
TSRMLS_CC);
if (intern->dit_type != DIT_Unknown) {
- zend_throw_exception_ex(spl_ce_BadMethodCallException, 0
TSRMLS_CC, "%v::getIterator() must be called exactly once per instance",
ce_base->name);
+ zend_throw_exception_ex(spl_ce_BadMethodCallException, 0
TSRMLS_CC, "%s::getIterator() must be called exactly once per instance",
ce_base->name);
return NULL;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
