Changeset 769 for trunk/src/corelib/tools/qmap.h
- Timestamp:
- Aug 2, 2010, 9:27:30 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.6.3 (added) merged: 768 /branches/vendor/nokia/qt/current merged: 767 /branches/vendor/nokia/qt/4.6.2 removed
- Property svn:mergeinfo changed
-
trunk/src/corelib/tools/qmap.h
r651 r769 214 214 public: 215 215 typedef std::bidirectional_iterator_tag iterator_category; 216 typedef ptrdiff_tdifference_type;216 typedef difference_type; 217 217 typedef T value_type; 218 218 typedef T *pointer; … … 282 282 public: 283 283 typedef std::bidirectional_iterator_tag iterator_category; 284 typedef ptrdiff_tdifference_type;284 typedef difference_type; 285 285 typedef T value_type; 286 286 typedef const T *pointer; … … 385 385 typedef Key key_type; 386 386 typedef T mapped_type; 387 typedef ptrdiff_tdifference_type;387 typedef difference_type; 388 388 typedef int size_type; 389 389 inline bool empty() const { return isEmpty(); } … … 954 954 955 955 inline QMultiMap &operator+=(const QMultiMap &other) 956 { unite(other); return *this; }956 { unite(other); return *this; } 957 957 inline QMultiMap operator+(const QMultiMap &other) const 958 958 { QMultiMap result = *this; result += other; return result; } … … 1029 1029 while (i != end && !qMapLessThanKey<Key>(key, i.key())) { 1030 1030 if (i.value() == value) { 1031 #if defined(Q_CC_RVCT) 1032 // RVCT has problems with scoping, apparently. 1033 i = QMap<Key, T>::erase(i); 1034 #else 1035 i = erase(i); 1036 #endif 1031 i = this->erase(i); 1037 1032 ++n; 1038 1033 } else {
Note:
See TracChangeset
for help on using the changeset viewer.