diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-08-02 15:51:52 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-20 21:59:21 +0200 |
| commit | 373845dfd8acae0c941432c8cd615b77bcae0a2a (patch) | |
| tree | d8d88bdd6657a18f55456bfe2ac5dfff682e76aa /src/network | |
| parent | 291938aea6771a0ce4c11a164583a73c6eef026e (diff) | |
Add Q_DECL_NOTHROW to some qHash functions
The hashing functions for QDateTime and QHostAddress did not get the
noexcept keyword because they might allocate memory. QDateTime doesn't
do it now, but it could in the future. QHostAddress does allocate
memory today.
Change-Id: Ia5f80942944bfc2b8c405306c467bfd88ef0e48c
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/kernel/qhostaddress.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp index 3ca0f84c39..310315e636 100644 --- a/src/network/kernel/qhostaddress.cpp +++ b/src/network/kernel/qhostaddress.cpp @@ -1031,6 +1031,7 @@ QDebug operator<<(QDebug d, const QHostAddress &address) uint qHash(const QHostAddress &key, uint seed) { + // both lines might throw QT_ENSURE_PARSED(&key); return qHash(QByteArray::fromRawData(reinterpret_cast<const char *>(key.d->a6.c), 16), seed); } |