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/network/kernel/qnetworkinterface.cpp | |
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/network/kernel/qnetworkinterface.cpp')
-rw-r--r-- | src/network/kernel/qnetworkinterface.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/network/kernel/qnetworkinterface.cpp b/src/network/kernel/qnetworkinterface.cpp index b21bcee585..633d2ee9a8 100644 --- a/src/network/kernel/qnetworkinterface.cpp +++ b/src/network/kernel/qnetworkinterface.cpp @@ -615,13 +615,8 @@ QDebug operator<<(QDebug debug, const QNetworkInterface &networkInterface) << ", hardware address = " << networkInterface.hardwareAddress() << ", flags = "; flagsDebug(debug, networkInterface.flags()); -#if defined(Q_CC_RVCT) - // RVCT gets confused with << networkInterface.addressEntries(), reason unknown. - debug.nospace() << ")\n"; -#else debug.nospace() << ", entries = " << networkInterface.addressEntries() << ")\n"; -#endif return debug.space(); } #endif |