Ignore:
Timestamp:
Aug 2, 2010, 9:27:30 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/corelib/tools/qmap.h

    r651 r769  
    214214    public:
    215215        typedef std::bidirectional_iterator_tag iterator_category;
    216         typedef ptrdiff_t difference_type;
     216        typedef difference_type;
    217217        typedef T value_type;
    218218        typedef T *pointer;
     
    282282    public:
    283283        typedef std::bidirectional_iterator_tag iterator_category;
    284         typedef ptrdiff_t difference_type;
     284        typedef difference_type;
    285285        typedef T value_type;
    286286        typedef const T *pointer;
     
    385385    typedef Key key_type;
    386386    typedef T mapped_type;
    387     typedef ptrdiff_t difference_type;
     387    typedef difference_type;
    388388    typedef int size_type;
    389389    inline bool empty() const { return isEmpty(); }
     
    954954
    955955    inline QMultiMap &operator+=(const QMultiMap &other)
    956     { unite(other); return *this; }
     956    { unite(other); return *this; }
    957957    inline QMultiMap operator+(const QMultiMap &other) const
    958958    { QMultiMap result = *this; result += other; return result; }
     
    10291029    while (i != end && !qMapLessThanKey<Key>(key, i.key())) {
    10301030        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);
    10371032            ++n;
    10381033        } else {
Note: See TracChangeset for help on using the changeset viewer.