cvs: php-src(PHP_5_2) /ext/spl/examples dualiterator.inc
| From: | Marcus Boerger | Date: | Fri, 01 Dec 2006 09:29:16 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/spl/examples dualiterator.inc | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-41811@lists.php.net to get a copy of this message | ||
helly Fri Dec 1 09:29:16 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/spl/examples dualiterator.inc
Log:
- MFH: Fix handling of recursive inner iterators
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/examples/dualiterator.inc?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/spl/examples/dualiterator.inc
diff -u php-src/ext/spl/examples/dualiterator.inc:1.1.2.3
php-src/ext/spl/examples/dualiterator.inc:1.1.2.4
--- php-src/ext/spl/examples/dualiterator.inc:1.1.2.3 Fri Jul 21 21:55:43 2006
+++ php-src/ext/spl/examples/dualiterator.inc Fri Dec 1 09:29:15 2006
@@ -12,7 +12,7 @@
/** @ingroup Examples
* @brief Synchronous iteration over two iterators
* @author Marcus Boerger
- * @version 1.1
+ * @version 1.2
*/
class DualIterator implements Iterator
{
@@ -174,6 +174,7 @@
{
$it = new RecursiveDualIterator($lhs, $rhs,
self::CURRENT_0 | self::KEY_0);
+ $it = new RecursiveIteratorIterator($it);
}
else
{
@@ -187,7 +188,7 @@
if ($identical)
{
- foreach(new RecursiveIteratorIterator($it) as $n)
+ foreach($it as $n)
{
if (!$it->areIdentical())
{