From cf1cd5c771db918dc73609848780f1b51f1f47f4 Mon Sep 17 00:00:00 2001 From: Emiel Bruijntjes Date: Mon, 17 Mar 2014 09:23:09 +0100 Subject: fixed ValueIterator to compile on php 5.3 and php 5.4, fixed post increment operator for ValueIterator --- include/valueiterator.h | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/valueiterator.h b/include/valueiterator.h index 11c412e..037f061 100644 --- a/include/valueiterator.h +++ b/include/valueiterator.h @@ -35,22 +35,60 @@ public: */ ValueIterator(struct _hashtable *hashtable, bool first); + /** + * Copy constructor + * @param that + */ + ValueIterator(const ValueIterator &that); + /** * Destructor */ virtual ~ValueIterator() {} /** - * Increment position + * Increment position (pre-increment) * @return ValueIterator */ ValueIterator &operator++(); /** - * Decrement position + * Increment position (post-increment) + * @return ValueIterator + */ + ValueIterator operator++(int) + { + // make a copy + ValueIterator copy(*this); + + // increment current object + ++(*this); + + // and return the unchanged original + return copy; + } + + /** + * Decrement position (pre-decrement) * @return ValueIterator */ ValueIterator &operator--(); + + /** + * Increment position (post-decrement) + * @return ValueIterator + */ + ValueIterator operator--(int) + { + // make a copy + ValueIterator copy(*this); + + // decrement current object + --(*this); + + // and return the unchanged original + return copy; + } /** * Compare with other iterator -- cgit v1.2.3