path: root/src/corelib/tools/qmap.h
diff options
authorThiago Macieira <>2014-12-17 18:10:19 -0800
committerThiago Macieira <>2015-01-06 19:38:24 +0100
commitdd8b75d8fb2503aed9e29fabf3cfd3a33a0efb5a (patch)
treea787e3cd2ec841bde3b797397690bb150a6bc5bb /src/corelib/tools/qmap.h
parentccef8261d4d005a8666ef2c10b82860602f781b3 (diff)
Remove workarounds for RVCT compiler bugs
This does not try to remove support for RVCT. There has been no report of it working or failing to work, so the status continues to be unknown. In particular, the inline assembly code in atomic_armv[56].h remains in place. This commit only removes workarounds for compiler bugs or bogus warnings, assuming that anyone using this compiler has updated since Qt last tried to use it for Symbian in 2011. Note also how anonymous unions are now part of the language in C++11. Change-Id: Idc4fab092beb31239eb08b7e139bce2602adae81 Reviewed-by: Lars Knoll <>
Diffstat (limited to 'src/corelib/tools/qmap.h')
1 files changed, 0 insertions, 18 deletions
diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h
index ce550c540b..4b1fc65b22 100644
--- a/src/corelib/tools/qmap.h
+++ b/src/corelib/tools/qmap.h
@@ -1157,29 +1157,11 @@ public:
inline QMultiMap operator+(const QMultiMap &other) const
{ QMultiMap result = *this; result += other; return result; }
-#if !defined(Q_CC_RVCT)
- // RVCT compiler doesn't handle using-keyword right when used functions are overloaded in child class
using QMap<Key, T>::contains;
using QMap<Key, T>::remove;
using QMap<Key, T>::count;
using QMap<Key, T>::find;
using QMap<Key, T>::constFind;
- inline bool contains(const Key &key) const
- { return QMap<Key, T>::contains(key); }
- inline int remove(const Key &key)
- { return QMap<Key, T>::remove(key); }
- inline int count(const Key &key) const
- { return QMap<Key, T>::count(key); }
- inline int count() const
- { return QMap<Key, T>::count(); }
- inline typename QMap<Key, T>::iterator find(const Key &key)
- { return QMap<Key, T>::find(key); }
- inline typename QMap<Key, T>::const_iterator find(const Key &key) const
- { return QMap<Key, T>::find(key); }
- inline typename QMap<Key, T>::const_iterator constFind(const Key &key) const
- { return QMap<Key, T>::constFind(key); }
bool contains(const Key &key, const T &value) const;