nerdcruft/libcruft-util
1
0
Fork 0
Code Issues Releases Activity

Use referencing iterator for array iteration

Browse Source
This commit is contained in:
Danny Robson 2012-04-13 11:29:45 +10:00
parent 8153d048c2
commit c80d1723bf
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
json.hpp
View File

@ -28,6 +28,7 @@
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include "iterator.hpp"
namespace json { namespace json {
class node; class node;
@ -107,9 +108,13 @@ namespace json {
/// Represents a JSON array, and contains its children. /// Represents a JSON array, and contains its children.
class array : public node { class array : public node {
protected:
typedef std::vector<std::unique_ptr<node>>::iterator pointer_array_iterator;
typedef std::vector<std::unique_ptr<node>>::const_iterator const_pointer_array_iterator;
public: public:
typedef std::vector<std::unique_ptr<node>>::iterator array_iterator; typedef referencing_iterator<pointer_array_iterator> iterator;
typedef std::vector<std::unique_ptr<node>>::const_iterator const_array_iterator; typedef referencing_iterator<const_pointer_array_iterator> const_iterator;
protected: protected:
std::vector<std::unique_ptr<node>> m_values; std::vector<std::unique_ptr<node>> m_values;
@ -130,8 +135,8 @@ namespace json {
virtual const node& operator [](unsigned int idx) const virtual const node& operator [](unsigned int idx) const
{ return *m_values[idx]; } { return *m_values[idx]; }
virtual const_array_iterator begin (void) const { return m_values.begin (); } virtual const_iterator begin (void) const { return const_iterator (m_values.begin ()); }
virtual const_array_iterator end (void) const { return m_values.end (); } virtual const_iterator end (void) const { return const_iterator (m_values.end ()); }
virtual void insert (std::unique_ptr<json::node> &&_value); virtual void insert (std::unique_ptr<json::node> &&_value);