diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2015-01-08 15:08:22 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2015-01-10 08:43:15 +0100 |
| commit | 390b16aea85e64bc33ce91e37898f59ad8a994c7 (patch) | |
| tree | 0cefc9dd8f47cfca2af11e0337c26d22fc7af063 /src/corelib/tools/qarraydata.h | |
| parent | 2c2801860dde4d707af9ce291489bee1750955d1 (diff) | |
QtCore: mark some operations nothrow
This shotgun-surgery approach is motivated by trying to get a
clean(er) build for -Wnoexcept on GCC, so it is expected that
for any class touched here, there will be more operations that
can be marked nothrow. But they don't show up in conditional
noexcept clauses, yet, so they are deferred to some later
commit.
Change-Id: I0eb10d75a26c361fb22cf785399e83b434bdf233
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools/qarraydata.h')
| -rw-r--r-- | src/corelib/tools/qarraydata.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qarraydata.h b/src/corelib/tools/qarraydata.h index 2119b3d4ac..df44503a8e 100644 --- a/src/corelib/tools/qarraydata.h +++ b/src/corelib/tools/qarraydata.h @@ -113,7 +113,7 @@ struct Q_CORE_EXPORT QArrayData size_t alignment) Q_DECL_NOTHROW; static const QArrayData shared_null[2]; - static QArrayData *sharedNull() { return const_cast<QArrayData*>(shared_null); } + static QArrayData *sharedNull() Q_DECL_NOTHROW { return const_cast<QArrayData*>(shared_null); } }; Q_DECLARE_OPERATORS_FOR_FLAGS(QArrayData::AllocationOptions) @@ -237,7 +237,7 @@ struct QTypedArrayData return result; } - static QTypedArrayData *sharedNull() + static QTypedArrayData *sharedNull() Q_DECL_NOTHROW { Q_STATIC_ASSERT(sizeof(QTypedArrayData) == sizeof(QArrayData)); return static_cast<QTypedArrayData *>(QArrayData::sharedNull()); |