diff options
author | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2014-03-17 09:23:09 +0100 |
---|---|---|
committer | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2014-03-17 09:23:09 +0100 |
commit | cf1cd5c771db918dc73609848780f1b51f1f47f4 (patch) | |
tree | 887c92bd7d62d3f1db4a790766200b26e57e0116 /src/valueiterator.cpp | |
parent | 87bc164a5100b980ff75b5304623938f85eb2c0e (diff) |
fixed ValueIterator to compile on php 5.3 and php 5.4, fixed post increment operator for ValueIterator
Diffstat (limited to 'src/valueiterator.cpp')
-rw-r--r-- | src/valueiterator.cpp | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/src/valueiterator.cpp b/src/valueiterator.cpp index a40ff81..08520d5 100644 --- a/src/valueiterator.cpp +++ b/src/valueiterator.cpp @@ -91,13 +91,36 @@ ValueIterator &ValueIterator::read() { // zval to read the current key in Value key; - + +#if PHP_VERSION_ID >= 50500 + // read in the current key zend_hash_get_current_key_zval_ex(_table, key._val, &_position); // if the key is set to NULL, it means that the object is not at a valid position if (key.isNull()) return invalidate(); +#else + + // php 5.3 and php 5.4 need a different implementation because the function + // zend_hash_get_current_key_zval_ex is missing in php 5.3, declare variables + // we need for storing the key in + char *string_key; + unsigned int str_len; + unsigned long num_key; + + // get the current key + int type = zend_hash_get_current_key_ex(_table, &string_key, &str_len, &num_key, 0, &_position); + + // if key is not found, the iterator is at an invalid position + if (type == HASH_KEY_NON_EXISTANT) return invalidate(); + + // numeric keys are the easiest ones + if (type == HASH_KEY_NON_EXISTANT) key = (int64_t)num_key; + else key = string_key; + +#endif + // iterator is at a valid position, go fetch the data // this is the variable we need for fetching the data zval **value; |