summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEtienne Kneuss <colder@php.net>2013-03-16 18:20:06 +0100
committerEtienne Kneuss <colder@php.net>2013-03-16 18:20:06 +0100
commit5de1b08482cdf2385e263f68ce9ea4001f724ffd (patch)
tree9344e20a4f63f023d3d547d03cc418a15ecaf7e2
parent73c38eca5a7f3c68e1122aee001409dbd615c5a8 (diff)
parent62364e6e01092911fa11e6d28f9acc3ed9af07e8 (diff)
downloadphp-git-5de1b08482cdf2385e263f68ce9ea4001f724ffd.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: Remove spurious int cast in between two longs
-rw-r--r--ext/spl/spl_dllist.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/spl/spl_dllist.c b/ext/spl/spl_dllist.c
index a8417feada..215476a724 100644
--- a/ext/spl/spl_dllist.c
+++ b/ext/spl/spl_dllist.c
@@ -880,7 +880,7 @@ SPL_METHOD(SplDoublyLinkedList, offsetUnset)
}
intern = (spl_dllist_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
- index = (int)spl_offset_convert_to_long(zindex TSRMLS_CC);
+ index = spl_offset_convert_to_long(zindex TSRMLS_CC);
llist = intern->llist;
if (index < 0 || index >= intern->llist->count) {