summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmiel Bruijntjes <emiel.bruijntjes@copernica.com>2014-04-01 15:04:52 +0200
committerEmiel Bruijntjes <emiel.bruijntjes@copernica.com>2014-04-01 15:04:52 +0200
commit4f32de6cc535bc19810801d51892c05b9e49f47b (patch)
tree0b81caaea23a5d5869ec71bbc47426358161454e
parent2e59a2955c79420cfd6de6c998cb94a1634fd5a4 (diff)
traverseiterator was not working on php 5.4 (mentioned in issue #62)
-rw-r--r--src/traverseiterator.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/traverseiterator.h b/src/traverseiterator.h
index 0dee5a7..84c50f0 100644
--- a/src/traverseiterator.h
+++ b/src/traverseiterator.h
@@ -177,7 +177,7 @@ private:
// is the iterator at a valid position?
if (_iter->funcs->valid(_iter TSRMLS_CC) == FAILURE) return invalidate(TSRMLS_C);
-#if PHP_VERSION_ID >= 50400
+#if PHP_VERSION_ID >= 50500
// create a value object
Value val;
@@ -194,7 +194,7 @@ private:
// the PHP engine (this is php 5.3 code)
char *str_key; unsigned int str_key_len; unsigned long int_key;
- // php 5.3 code, fetch the current key
+ // php 5.4 or php 5.3 code, fetch the current key
int type = _iter->funcs->get_current_key(_iter, &str_key, &str_key_len, &int_key TSRMLS_CC);
// what sort of key do we have?