gvsafronov/rapidjson
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GenericMemberIterator::Type -> GenericMemberIterator::Iterator

Browse Source 
Rename nested typedef to avoid confusion with JSON Type enum.
This commit is contained in:
Philipp A. Hartmann 2014-07-05 17:03:54 +02:00
parent 5174fe4f65
commit c63c40fa85
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
include/rapidjson/document.h
View File

@ -73,7 +73,7 @@ class GenericMemberIterator
public: public:
//! Iterator type itself //! Iterator type itself
typedef GenericMemberIterator Type; typedef GenericMemberIterator Iterator;
//! Constant iterator type //! Constant iterator type
typedef GenericMemberIterator<true,Encoding,Allocator> ConstType; typedef GenericMemberIterator<true,Encoding,Allocator> ConstType;
//! Non-constant iterator type //! Non-constant iterator type
@ -112,29 +112,29 @@ public:
//! @name stepping //! @name stepping
//@{ //@{
Type& operator++(){ ++ptr_; return *this; } Iterator& operator++(){ ++ptr_; return *this; }
Type& operator--(){ --ptr_; return *this; } Iterator& operator--(){ --ptr_; return *this; }
Type operator++(int){ Type old(*this); ++ptr_; return old; } Iterator operator++(int){ Iterator old(*this); ++ptr_; return old; }
Type operator--(int){ Type old(*this); --ptr_; return old; } Iterator operator--(int){ Iterator old(*this); --ptr_; return old; }
//@} //@}
//! @name increment/decrement //! @name increment/decrement
//@{ //@{
Type operator+(DifferenceType n) const { return Type(ptr_+n); } Iterator operator+(DifferenceType n) const { return Iterator(ptr_+n); }
Type operator-(DifferenceType n) const { return Type(ptr_-n); } Iterator operator-(DifferenceType n) const { return Iterator(ptr_-n); }
Type& operator+=(DifferenceType n) { ptr_+=n; return *this; } Iterator& operator+=(DifferenceType n) { ptr_+=n; return *this; }
Type& operator-=(DifferenceType n) { ptr_-=n; return *this; } Iterator& operator-=(DifferenceType n) { ptr_-=n; return *this; }
//@} //@}
//! @name relations //! @name relations
//@{ //@{
bool operator==(Type that) const { return ptr_ == that.ptr_; } bool operator==(Iterator that) const { return ptr_ == that.ptr_; }
bool operator!=(Type that) const { return ptr_ != that.ptr_; } bool operator!=(Iterator that) const { return ptr_ != that.ptr_; }
bool operator<=(Type that) const { return ptr_ <= that.ptr_; } bool operator<=(Iterator that) const { return ptr_ <= that.ptr_; }
bool operator>=(Type that) const { return ptr_ >= that.ptr_; } bool operator>=(Iterator that) const { return ptr_ >= that.ptr_; }
bool operator< (Type that) const { return ptr_ < that.ptr_; } bool operator< (Iterator that) const { return ptr_ < that.ptr_; }
bool operator> (Type that) const { return ptr_ > that.ptr_; } bool operator> (Iterator that) const { return ptr_ > that.ptr_; }
//@} //@}
//! @name dereference //! @name dereference
@ -145,7 +145,7 @@ public:
//@} //@}
//! Distance //! Distance
DifferenceType operator-(Type that) const { return ptr_-that.ptr_; } DifferenceType operator-(Iterator that) const { return ptr_-that.ptr_; }
private: private:
//! Internal constructor from plain pointer //! Internal constructor from plain pointer
@ -165,13 +165,13 @@ struct GenericMemberIterator;
template <typename Encoding, typename Allocator> template <typename Encoding, typename Allocator>
struct GenericMemberIterator<false,Encoding,Allocator> { struct GenericMemberIterator<false,Encoding,Allocator> {
//! use plain pointer as iterator type //! use plain pointer as iterator type
typedef GenericMember<Encoding,Allocator>* Type; typedef GenericMember<Encoding,Allocator>* Iterator;
}; };
//! const GenericMemberIterator //! const GenericMemberIterator
template <typename Encoding, typename Allocator> template <typename Encoding, typename Allocator>
struct GenericMemberIterator<true,Encoding,Allocator> { struct GenericMemberIterator<true,Encoding,Allocator> {
//! use plain const pointer as iterator type //! use plain const pointer as iterator type
typedef const GenericMember<Encoding,Allocator>* Type; typedef const GenericMember<Encoding,Allocator>* Iterator;
}; };
#endif // RAPIDJSON_NOMEMBERITERATORCLASS #endif // RAPIDJSON_NOMEMBERITERATORCLASS
@ -198,8 +198,8 @@ public:
typedef Encoding EncodingType; //!< Encoding type from template parameter. typedef Encoding EncodingType; //!< Encoding type from template parameter.
typedef Allocator AllocatorType; //!< Allocator type from template parameter. typedef Allocator AllocatorType; //!< Allocator type from template parameter.
typedef typename Encoding::Ch Ch; //!< Character type derived from Encoding. typedef typename Encoding::Ch Ch; //!< Character type derived from Encoding.
typedef typename GenericMemberIterator<false,Encoding,Allocator>::Type MemberIterator; //!< Member iterator for iterating in object. typedef typename GenericMemberIterator<false,Encoding,Allocator>::Iterator MemberIterator; //!< Member iterator for iterating in object.
typedef typename GenericMemberIterator<true,Encoding,Allocator>::Type ConstMemberIterator; //!< Constant member iterator for iterating in object. typedef typename GenericMemberIterator<true,Encoding,Allocator>::Iterator ConstMemberIterator; //!< Constant member iterator for iterating in object.
typedef GenericValue* ValueIterator; //!< Value iterator for iterating in array. typedef GenericValue* ValueIterator; //!< Value iterator for iterating in array.
typedef const GenericValue* ConstValueIterator; //!< Constant value iterator for iterating in array. typedef const GenericValue* ConstValueIterator; //!< Constant value iterator for iterating in array.