add the std iterator typedefs to iterator and const_iterator

This commit is contained in:
Kirk Shoop
2015-01-09 07:33:28 -08:00
parent 661a44d156
commit 3486a5d9bb
2 changed files with 35 additions and 35 deletions

View File

@@ -324,7 +324,7 @@ class json
public:
/// an iterator
class iterator
class iterator : public std::iterator<std::forward_iterator_tag, json>
{
friend class json;
friend class json::const_iterator;
@@ -356,7 +356,7 @@ class json
};
/// a const iterator
class const_iterator
class const_iterator : public std::iterator<std::forward_iterator_tag, const json>
{
friend class json;
@@ -364,7 +364,7 @@ class json
const_iterator() = default;
const_iterator(const json*);
const_iterator(const const_iterator&);
const_iterator(const iterator&);
const_iterator(const json::iterator&);
~const_iterator();
const_iterator& operator=(const_iterator);