1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure QTypedArrayData is just a shim over QArrayData

Browse Source 
Change-Id: I6f41ca054d0e0a0c4642f0b841b3b3df9559f818
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
This commit is contained in:
João Abecasis 2012-03-27 12:49:00 +02:00 committed by Qt by Nokia
parent 7c9e345551
commit 99e7ad660f
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/tools/qarraydata.h
View File

@ -140,18 +140,21 @@ struct QTypedArrayData
static QTypedArrayData *allocate(size_t capacity, static QTypedArrayData *allocate(size_t capacity,
AllocationOptions options = Default) Q_REQUIRED_RESULT AllocationOptions options = Default) Q_REQUIRED_RESULT
{ {
Q_STATIC_ASSERT(sizeof(QTypedArrayData) == sizeof(QArrayData));
return static_cast<QTypedArrayData *>(QArrayData::allocate(sizeof(T), return static_cast<QTypedArrayData *>(QArrayData::allocate(sizeof(T),
Q_ALIGNOF(AlignmentDummy), capacity, options)); Q_ALIGNOF(AlignmentDummy), capacity, options));
} }
static void deallocate(QArrayData *data) static void deallocate(QArrayData *data)
{ {
Q_STATIC_ASSERT(sizeof(QTypedArrayData) == sizeof(QArrayData));
QArrayData::deallocate(data, sizeof(T), Q_ALIGNOF(AlignmentDummy)); QArrayData::deallocate(data, sizeof(T), Q_ALIGNOF(AlignmentDummy));
} }
static QTypedArrayData *fromRawData(const T *data, size_t n, static QTypedArrayData *fromRawData(const T *data, size_t n,
AllocationOptions options = Default) AllocationOptions options = Default)
{ {
Q_STATIC_ASSERT(sizeof(QTypedArrayData) == sizeof(QArrayData));
QTypedArrayData *result = allocate(0, options | RawData); QTypedArrayData *result = allocate(0, options | RawData);
if (result) { if (result) {
Q_ASSERT(!result->ref.isShared()); // No shared empty, please! Q_ASSERT(!result->ref.isShared()); // No shared empty, please!
@ -165,6 +168,7 @@ struct QTypedArrayData
static QTypedArrayData *sharedNull() static QTypedArrayData *sharedNull()
{ {
Q_STATIC_ASSERT(sizeof(QTypedArrayData) == sizeof(QArrayData));
return static_cast<QTypedArrayData *>( return static_cast<QTypedArrayData *>(
const_cast<QArrayData *>(&QArrayData::shared_null)); const_cast<QArrayData *>(&QArrayData::shared_null));
} }