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/qstringmatcher.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/qstringmatcher.h')
| -rw-r--r-- | src/corelib/tools/qstringmatcher.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/corelib/tools/qstringmatcher.h b/src/corelib/tools/qstringmatcher.h index 00e5fc1587..d416831434 100644 --- a/src/corelib/tools/qstringmatcher.h +++ b/src/corelib/tools/qstringmatcher.h @@ -66,11 +66,6 @@ private: QStringMatcherPrivate *d_ptr; QString q_pattern; Qt::CaseSensitivity q_cs; -#ifdef Q_CC_RVCT -// explicitly allow anonymous unions for RVCT to prevent compiler warnings -# pragma push -# pragma anon_unions -#endif struct Data { uchar q_skiptable[256]; const QChar *uc; @@ -80,9 +75,6 @@ private: uint q_data[256]; Data p; }; -#ifdef Q_CC_RVCT -# pragma pop -#endif }; QT_END_NAMESPACE |