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

Fix some warnings with Clang

Browse Source 
The extra bool arguments weren't needed in the first place as they
specify the default, but were left behind when allocate parameters were
changed from bools to AllocationOptions.

Clang saves the day by pointing out the weird conversion going through
void ** (!?)

Change-Id: Ia0dafce06bf0ee62bd825a2db819c890343b6342
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
This commit is contained in:
João Abecasis 2012-01-24 18:05:07 +01:00 committed by Qt by Nokia
parent b59d831980
commit e32d417b51
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
View File

@ -737,7 +737,7 @@ void tst_QArrayData::typedData()
{
Deallocator keeper(sizeof(char),
Q_ALIGNOF(QTypedArrayData<char>::AlignmentDummy));
QArrayData *array = QTypedArrayData<char>::allocate(10, false);
QArrayData *array = QTypedArrayData<char>::allocate(10);
keeper.headers.append(array);
QVERIFY(array);
@ -757,7 +757,7 @@ void tst_QArrayData::typedData()
{
Deallocator keeper(sizeof(short),
Q_ALIGNOF(QTypedArrayData<short>::AlignmentDummy));
QArrayData *array = QTypedArrayData<short>::allocate(10, false);
QArrayData *array = QTypedArrayData<short>::allocate(10);
keeper.headers.append(array);
QVERIFY(array);
@ -777,7 +777,7 @@ void tst_QArrayData::typedData()
{
Deallocator keeper(sizeof(double),
Q_ALIGNOF(QTypedArrayData<double>::AlignmentDummy));
QArrayData *array = QTypedArrayData<double>::allocate(10, false);
QArrayData *array = QTypedArrayData<double>::allocate(10);
keeper.headers.append(array);
QVERIFY(array);