From e32d417b5129171be09a32bb3a65dca6f7464d8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Tue, 24 Jan 2012 18:05:07 +0100 Subject: [PATCH] Fix some warnings with Clang 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 --- tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp index 55aa2e5e752..46985c1e3bd 100644 --- a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp +++ b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp @@ -737,7 +737,7 @@ void tst_QArrayData::typedData() { Deallocator keeper(sizeof(char), Q_ALIGNOF(QTypedArrayData::AlignmentDummy)); - QArrayData *array = QTypedArrayData::allocate(10, false); + QArrayData *array = QTypedArrayData::allocate(10); keeper.headers.append(array); QVERIFY(array); @@ -757,7 +757,7 @@ void tst_QArrayData::typedData() { Deallocator keeper(sizeof(short), Q_ALIGNOF(QTypedArrayData::AlignmentDummy)); - QArrayData *array = QTypedArrayData::allocate(10, false); + QArrayData *array = QTypedArrayData::allocate(10); keeper.headers.append(array); QVERIFY(array); @@ -777,7 +777,7 @@ void tst_QArrayData::typedData() { Deallocator keeper(sizeof(double), Q_ALIGNOF(QTypedArrayData::AlignmentDummy)); - QArrayData *array = QTypedArrayData::allocate(10, false); + QArrayData *array = QTypedArrayData::allocate(10); keeper.headers.append(array); QVERIFY(array);