diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-12-17 18:10:19 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-01-06 19:38:24 +0100 |
| commit | dd8b75d8fb2503aed9e29fabf3cfd3a33a0efb5a (patch) | |
| tree | a787e3cd2ec841bde3b797397690bb150a6bc5bb /src/corelib/tools/qhash.h | |
| parent | ccef8261d4d005a8666ef2c10b82860602f781b3 (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 <lars.knoll@digia.com>
Diffstat (limited to 'src/corelib/tools/qhash.h')
| -rw-r--r-- | src/corelib/tools/qhash.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/corelib/tools/qhash.h b/src/corelib/tools/qhash.h index 771e81c8f4..325799d165 100644 --- a/src/corelib/tools/qhash.h +++ b/src/corelib/tools/qhash.h @@ -977,29 +977,11 @@ public: inline QMultiHash operator+(const QMultiHash &other) const { QMultiHash 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 QHash<Key, T>::contains; using QHash<Key, T>::remove; using QHash<Key, T>::count; using QHash<Key, T>::find; using QHash<Key, T>::constFind; -#else - inline bool contains(const Key &key) const - { return QHash<Key, T>::contains(key); } - inline int remove(const Key &key) - { return QHash<Key, T>::remove(key); } - inline int count(const Key &key) const - { return QHash<Key, T>::count(key); } - inline int count() const - { return QHash<Key, T>::count(); } - inline typename QHash<Key, T>::iterator find(const Key &key) - { return QHash<Key, T>::find(key); } - inline typename QHash<Key, T>::const_iterator find(const Key &key) const - { return QHash<Key, T>::find(key); } - inline typename QHash<Key, T>::const_iterator constFind(const Key &key) const - { return QHash<Key, T>::constFind(key); } -#endif bool contains(const Key &key, const T &value) const; |