Changes in src/Common/VectorMap.h [6b0b624:fc1a3e2]
- File:
-
- 1 edited
-
src/Common/VectorMap.h (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
src/Common/VectorMap.h
r6b0b624 rfc1a3e2 36 36 typedef const value_type* pointer; 37 37 typedef const const_value_type* const_pointer; 38 39 class iterator : public std::iterator< std::random_access_iterator_tag, 40 value_type, 41 difference_type, 42 pointer, 43 reference > { 44 friend class VectorMap; 45 friend class const_iterator; 46 38 39 class iterator : public std::iterator< 40 std::random_access_iterator_tag, 41 value_type, difference_type, pointer, reference > { 42 friend class VectorMap; 43 friend class const_iterator; 44 47 45 value_type data; 48 46 … … 99 97 return data.first == o.data.first && &data.second == &o.data.second; 100 98 } 101 99 102 100 bool operator!= (const iterator& that) const { return !(*this == that); } 103 101 … … 111 109 }; 112 110 113 class const_iterator : public std::iterator< std::bidirectional_iterator_tag, 114 const_value_type, 115 difference_type, 116 const_pointer, 117 const_reference > { 118 friend class VectorMap; 111 class const_iterator : public std::iterator< 112 std::bidirectional_iterator_tag, 113 const_value_type, difference_type, const_pointer, const_reference > { 114 friend class VectorMap; 119 115 const_value_type data; 120 116 … … 181 177 return data.first == o.data.first && &data.second == &o.data.second; 182 178 } 183 179 184 180 bool operator!= (const const_iterator& that) const { return !(*this == that); } 185 181 … … 233 229 234 230 template<typename T> 235 typename VectorMap<T>::iterator operator+ (typename VectorMap<T>::difference_type i, 236 const typename VectorMap<T>::iterator& it) { 231 typename VectorMap<T>::iterator operator+( 232 typename VectorMap<T>::difference_type i, 233 const typename VectorMap<T>::iterator& it) { 237 234 return it + i; 238 235 } 239 236 240 237 template<typename T> 241 typename VectorMap<T>::const_iterator operator+ (typename VectorMap<T>::difference_type i, 242 const typename VectorMap<T>::const_iterator& it) { 238 typename VectorMap<T>::const_iterator operator+( 239 typename VectorMap<T>::difference_type i, 240 const typename VectorMap<T>::const_iterator& it) { 243 241 return it + i; 244 242 }
Note:
See TracChangeset
for help on using the changeset viewer.