diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-05-18 15:17:26 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-05-18 15:17:26 (GMT) |
| commit | 8cdc4d5be0ce935cc58618b5aef4a078b7706edf (patch) | |
| tree | fdd24e4acdcf78322de469062e441bbd0dd91f0d /src/corelib | |
| parent | a860dfbd20ac99492bb30c646b672e72283bb810 (diff) | |
| parent | f5322311fa5f93e995d4c9dc35c778b11413abf5 (diff) | |
| download | Qt-8cdc4d5be0ce935cc58618b5aef4a078b7706edf.zip Qt-8cdc4d5be0ce935cc58618b5aef4a078b7706edf.tar.gz Qt-8cdc4d5be0ce935cc58618b5aef4a078b7706edf.tar.bz2 | |
Merged branch 'master' of git://gitorious.org/~dfaure/qt/dfaures-clone.git
David Faure (1):
Fix compilation with strict iterators
Merge-request: http://qt.gitorious.org/qt/qt/merge_requests/437
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qmap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h index 5f13e5a..32c8d17 100644 --- a/src/corelib/tools/qmap.h +++ b/src/corelib/tools/qmap.h @@ -990,7 +990,7 @@ Q_INLINE_TEMPLATE int QMultiMap<Key, T>::remove(const Key &key, const T &value) { int n = 0; typename QMap<Key, T>::iterator i(find(key)); - typename QMap<Key, T>::const_iterator end(QMap<Key, T>::constEnd()); + typename QMap<Key, T>::iterator end(QMap<Key, T>::end()); while (i != end && !qMapLessThanKey<Key>(key, i.key())) { if (i.value() == value) { i = erase(i); |