diff options
| author | SVN Migration <svn@php.net> | 2008-12-03 20:30:45 +0000 |
|---|---|---|
| committer | SVN Migration <svn@php.net> | 2008-12-03 20:30:45 +0000 |
| commit | 2876046398950e59c3b3c460e67e6fec7ff2ba3c (patch) | |
| tree | 33b2b8b4b859960a6446ad19d0ada1c55f9cfcda /ext/spl/spl_heap.c | |
| parent | 3fb86b0b9e79e6a3312b694f30ee627e2e1b325c (diff) | |
| download | php-git-php-5.3.0alpha2.tar.gz | |
This commit was manufactured by cvs2svn to create tag 'php_5_3_0alpha2'.php-5.3.0alpha2
Diffstat (limited to 'ext/spl/spl_heap.c')
| -rw-r--r-- | ext/spl/spl_heap.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ext/spl/spl_heap.c b/ext/spl/spl_heap.c index f073597af1..3b210954f6 100644 --- a/ext/spl/spl_heap.c +++ b/ext/spl/spl_heap.c @@ -970,8 +970,8 @@ static void spl_heap_it_move_forward(zend_object_iterator *iter TSRMLS_DC) /* {{ SPL_METHOD(SplHeap, key) { spl_heap_object *intern = (spl_heap_object*)zend_object_store_get_object(getThis() TSRMLS_CC); - - RETURN_LONG(intern->heap->count - 1); + + RETURN_LONG(intern->heap->count); } /* }}} */ @@ -1110,20 +1110,24 @@ zend_object_iterator *spl_pqueue_get_iterator(zend_class_entry *ce, zval *object } /* }}} */ +static ZEND_BEGIN_ARG_INFO(arginfo_heap_insert, 0) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_heap_compare, 0) ZEND_ARG_INFO(0, a) ZEND_ARG_INFO(0, b) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_pqueue_insert, 0) ZEND_ARG_INFO(0, value) ZEND_ARG_INFO(0, priority) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_pqueue_setflags, 0) ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO() |