From d78fe5f8d361c203e43908ddc0bd64f667c83204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Tue, 27 Mar 2012 12:27:54 +0200 Subject: Make QArrayData::shared_null zero terminated. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is expected by QByteArray and QString Change-Id: Ib668b144bdc0d2c793018c8f8d794f249eaf935c Reviewed-by: João Abecasis --- tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/auto/corelib') diff --git a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp index 9bfbac0017..4bd04f9bc3 100644 --- a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp +++ b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp @@ -50,9 +50,9 @@ struct SharedNullVerifier { SharedNullVerifier() { - Q_ASSERT(QArrayData::shared_null.ref.isStatic()); - Q_ASSERT(QArrayData::shared_null.ref.isShared()); - Q_ASSERT(QArrayData::shared_null.ref.isSharable()); + Q_ASSERT(QArrayData::shared_null[0].ref.isStatic()); + Q_ASSERT(QArrayData::shared_null[0].ref.isShared()); + Q_ASSERT(QArrayData::shared_null[0].ref.isSharable()); } }; @@ -159,7 +159,7 @@ void tst_QArrayData::referenceCounting() void tst_QArrayData::sharedNullEmpty() { - QArrayData *null = const_cast(&QArrayData::shared_null); + QArrayData *null = const_cast(QArrayData::shared_null); QArrayData *empty = QArrayData::allocate(1, Q_ALIGNOF(QArrayData), 0); QVERIFY(null->ref.isStatic()); -- cgit v1.2.3