summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmiel Bruijntjes <emiel.bruijntjes@copernica.com>2014-03-21 13:00:15 +0100
committerEmiel Bruijntjes <emiel.bruijntjes@copernica.com>2014-03-21 13:00:15 +0100
commit11bb11ac06e4438947e6a609d0f78a81af1c7d35 (patch)
tree6ae93cf46e953a908d3509c6080eaf3c79df4e31
parentf26214be1cfd3702fbe6463735ed533b125c7929 (diff)
fixed compile problem with php 5.5
-rw-r--r--include/value.h3
-rw-r--r--src/traverseiterator.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/include/value.h b/include/value.h
index 63914a9..f40b399 100644
--- a/include/value.h
+++ b/include/value.h
@@ -949,7 +949,8 @@ protected:
friend class ClassBase;
friend class Iterator;
friend class Extension;
- friend class ValueIterator;
+ friend class HashIterator;
+ friend class TraverseIterator;
};
/**
diff --git a/src/traverseiterator.h b/src/traverseiterator.h
index 3fe8f27..c883df2 100644
--- a/src/traverseiterator.h
+++ b/src/traverseiterator.h
@@ -165,7 +165,7 @@ private:
Value val;
// call the function to get the key
- _iter->funcs->get_current_key(_iter, _val.
+ _iter->funcs->get_current_key(_iter, val._val);
#else