helly Mon Oct 3 11:43:41 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/spl spl_iterators.h
Log:
- Synch (to decrease number of diffs)
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.h?r1=1.18.2.3&r2=1.18.2.4&ty=u
Index: php-src/ext/spl/spl_iterators.h
diff -u php-src/ext/spl/spl_iterators.h:1.18.2.3
php-src/ext/spl/spl_iterators.h:1.18.2.4
--- php-src/ext/spl/spl_iterators.h:1.18.2.3 Sat Sep 24 19:48:58 2005
+++ php-src/ext/spl/spl_iterators.h Mon Oct 3 11:43:40 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.h,v 1.18.2.3 2005/09/24 23:48:58 helly Exp $ */
+/* $Id: spl_iterators.h,v 1.18.2.4 2005/10/03 15:43:40 helly Exp $ */
#ifndef SPL_ITERATORS_H
#define SPL_ITERATORS_H
@@ -64,12 +64,14 @@
enum {
/* public */
- CIT_CALL_TOSTRING = 1,
- CIT_CATCH_GET_CHILD = 2,
- CIT_PUBLIC = CIT_CALL_TOSTRING|CIT_CATCH_GET_CHILD,
+ CIT_CALL_TOSTRING = 0x00000001,
+ CIT_CATCH_GET_CHILD = 0x00000002,
+ CIT_TOSTRING_USE_KEY = 0x00000004,
+ CIT_TOSTRING_USE_CURRENT = 0x00000008,
+ CIT_PUBLIC = 0x0000FFFF,
/* private */
- CIT_VALID = 4,
- CIT_HAS_CHILDREN = 8
+ CIT_VALID = 0x00010000,
+ CIT_HAS_CHILDREN = 0x00020000
};
typedef struct _spl_dual_it_object {
@@ -95,7 +97,7 @@
long count;
} limit;
struct {
- int flags; /* CIT_VALID,
CIT_CALL_TOSTRING, CIT_CATCH_GET_CHILD */
+ int flags; /* CIT_* */
zval *zstr;
zval *zchildren;
} caching;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
