RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-02-01 05:01:59 +01:00
Code Issues Projects Releases Wiki Activity

Fix iterator definitions for ImmutableSet and ImmutableMap.

Browse Source 
llvm-svn: 175097
This commit is contained in:
Ryan Govostes 2013-02-13 22:37:27 +00:00
parent 9cf905c167
commit bdb566bf9d
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/llvm/ADT/ImmutableMap.h
View File

@ -211,24 +211,24 @@ public:
friend class ImmutableMap;
public:
value_type_ref operator*() const { return itr->getValue(); }
value_type* operator->() const { return &itr->getValue(); }
typedef ImmutableMap<KeyT,ValT,ValInfo>::value_type value_type;
typedef ImmutableMap<KeyT,ValT,ValInfo>::value_type_ref reference;
typedef iterator::value_type *pointer;
typedef std::bidirectional_iterator_tag iterator_category;
iterator::reference operator*() const { return itr->getValue(); }
iterator::pointer operator->() const { return &itr->getValue(); }
key_type_ref getKey() const { return itr->getValue().first; }
data_type_ref getData() const { return itr->getValue().second; }
iterator& operator++() { ++itr; return *this; }
iterator operator++(int) { iterator tmp(*this); ++itr; return tmp; }
iterator& operator--() { --itr; return *this; }
iterator operator--(int) { iterator tmp(*this); --itr; return tmp; }
bool operator==(const iterator& RHS) const { return RHS.itr == itr; }
bool operator!=(const iterator& RHS) const { return RHS.itr != itr; }
typedef ImmutableMap<KeyT,ValT,ValInfo>::value_type value_type;
typedef value_type *pointer;
typedef value_type &reference;
typedef std::bidirectional_iterator_tag iterator_category;
};
iterator begin() const { return iterator(Root); }

28
include/llvm/ADT/ImmutableSet.h
View File

@ -1054,23 +1054,27 @@ public:
class iterator {
typename TreeTy::iterator itr;
iterator() {}
iterator(TreeTy* t) : itr(t) {}
friend class ImmutableSet<ValT,ValInfo>;
public:
iterator() {}
inline value_type_ref operator*() const { return itr->getValue(); }
inline iterator& operator++() { ++itr; return *this; }
inline iterator operator++(int) { iterator tmp(*this); ++itr; return tmp; }
inline iterator& operator--() { --itr; return *this; }
inline iterator operator--(int) { iterator tmp(*this); --itr; return tmp; }
inline bool operator==(const iterator& RHS) const { return RHS.itr == itr; }
inline bool operator!=(const iterator& RHS) const { return RHS.itr != itr; }
inline value_type *operator->() const { return &(operator*()); }
public:
typedef ImmutableSet<ValT,ValInfo>::value_type value_type;
typedef value_type *pointer;
typedef value_type &reference;
typedef ImmutableSet<ValT,ValInfo>::value_type_ref reference;
typedef iterator::value_type *pointer;
typedef std::bidirectional_iterator_tag iterator_category;
iterator::reference operator*() const { return itr->getValue(); }
iterator::pointer operator->() const { return &(operator*()); }
iterator& operator++() { ++itr; return *this; }
iterator operator++(int) { iterator tmp(*this); ++itr; return tmp; }
iterator& operator--() { --itr; return *this; }
iterator operator--(int) { iterator tmp(*this); --itr; return tmp; }
bool operator==(const iterator& RHS) const { return RHS.itr == itr; }
bool operator!=(const iterator& RHS) const { return RHS.itr != itr; }
};
iterator begin() const { return iterator(Root); }