j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed #43 (adding friendship to allow iterator change)

Browse source
This commit is contained in:
Niels 2015-03-22 19:18:21 +01:00
parent f2957dc3bf
commit bb2671df11
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/json.hpp
View file

@ -2040,6 +2040,9 @@ class basic_json
/// a random access iterator for the basic_json class /// a random access iterator for the basic_json class
class iterator : public std::iterator<std::random_access_iterator_tag, basic_json> class iterator : public std::iterator<std::random_access_iterator_tag, basic_json>
{ {
// allow basic_json class to access m_it
friend class basic_json;
public: public:
/// the type of the values when the iterator is dereferenced /// the type of the values when the iterator is dereferenced
using value_type = basic_json::value_type; using value_type = basic_json::value_type;
@ -2529,6 +2532,9 @@ class basic_json
/// a const random access iterator for the basic_json class /// a const random access iterator for the basic_json class
class const_iterator : public std::iterator<std::random_access_iterator_tag, const basic_json> class const_iterator : public std::iterator<std::random_access_iterator_tag, const basic_json>
{ {
// allow basic_json class to access m_it
friend class basic_json;
public: public:
/// the type of the values when the iterator is dereferenced /// the type of the values when the iterator is dereferenced
using value_type = basic_json::value_type; using value_type = basic_json::value_type;

6
src/json.hpp.re2c
View file

@ -2040,6 +2040,9 @@ class basic_json
/// a random access iterator for the basic_json class /// a random access iterator for the basic_json class
class iterator : public std::iterator<std::random_access_iterator_tag, basic_json> class iterator : public std::iterator<std::random_access_iterator_tag, basic_json>
{ {
// allow basic_json class to access m_it
friend class basic_json;
public: public:
/// the type of the values when the iterator is dereferenced /// the type of the values when the iterator is dereferenced
using value_type = basic_json::value_type; using value_type = basic_json::value_type;
@ -2529,6 +2532,9 @@ class basic_json
/// a const random access iterator for the basic_json class /// a const random access iterator for the basic_json class
class const_iterator : public std::iterator<std::random_access_iterator_tag, const basic_json> class const_iterator : public std::iterator<std::random_access_iterator_tag, const basic_json>
{ {
// allow basic_json class to access m_it
friend class basic_json;
public: public:
/// the type of the values when the iterator is dereferenced /// the type of the values when the iterator is dereferenced
using value_type = basic_json::value_type; using value_type = basic_json::value_type;